diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 10:09:24 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 12:17:44 +1000 |
| commit | eccf7e8ad28e64401519e49f56abc7c799f809b5 (patch) | |
| tree | bb899e91abe12135b0c8877e9d418e071dfc4544 /drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c | |
| parent | 5ce3bf3c72436c49fbd9a5b71d7d278665f4bf55 (diff) | |
| download | op-kernel-dev-eccf7e8ad28e64401519e49f56abc7c799f809b5.zip op-kernel-dev-eccf7e8ad28e64401519e49f56abc7c799f809b5.tar.gz | |
drm/nouveau/msvld: separate from bsp
Switch to NVIDIA's name for the device.
The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver. This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).
Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c index 4150b0d..df07c04 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c @@ -189,6 +189,9 @@ nv50_fb_intr(struct nouveau_subdev *subdev) const struct nouveau_enum *orig_en = en; while (en->name && en->value == st0 && en->data2) { engine = nouveau_engine(subdev, en->data2); + /*XXX: clean this up */ + if (!engine && en->data2 == NVDEV_ENGINE_BSP) + engine = nouveau_engine(subdev, NVDEV_ENGINE_MSVLD); if (engine) { engctx = nouveau_engctx_get(engine, chan); if (engctx) |
