diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2014-11-17 19:51:19 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2014-12-02 00:44:04 -0500 |
commit | ddbb55ab04db3edbc2d0910c5060c025a9ae4425 (patch) | |
tree | b480e174e494e39076ea597bf4d2412efa7a87d5 | |
parent | 34acf100dd20b42e8dcc89b79e5ebb450035ef09 (diff) |
drm/nouveau/core: allow vbios parsing without knowing chipset type
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/device/base.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/device/base.c b/drivers/gpu/drm/nouveau/core/engine/device/base.c index 9262f27904c8..137e0b0faeae 100644 --- a/drivers/gpu/drm/nouveau/core/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/core/engine/device/base.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <nvif/unpack.h> | 29 | #include <nvif/unpack.h> |
30 | #include <nvif/class.h> | 30 | #include <nvif/class.h> |
31 | 31 | ||
32 | #include <subdev/bios.h> | ||
32 | #include <subdev/fb.h> | 33 | #include <subdev/fb.h> |
33 | #include <subdev/instmem.h> | 34 | #include <subdev/instmem.h> |
34 | 35 | ||
@@ -432,6 +433,10 @@ nouveau_devobj_ctor(struct nouveau_object *parent, | |||
432 | } | 433 | } |
433 | 434 | ||
434 | nv_debug(device, "crystal freq: %dKHz\n", device->crystal); | 435 | nv_debug(device, "crystal freq: %dKHz\n", device->crystal); |
436 | } else | ||
437 | if ( (args->v0.disable & NV_DEVICE_V0_DISABLE_IDENTIFY)) { | ||
438 | device->cname = "NULL"; | ||
439 | device->oclass[NVDEV_SUBDEV_VBIOS] = &nouveau_bios_oclass; | ||
435 | } | 440 | } |
436 | 441 | ||
437 | if (!(args->v0.disable & NV_DEVICE_V0_DISABLE_MMIO) && | 442 | if (!(args->v0.disable & NV_DEVICE_V0_DISABLE_MMIO) && |