diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 12:50:04 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 12:17:48 +1000 |
| commit | 37a5d028913f7ac614cd79b1e7adaff19c59d2f1 (patch) | |
| tree | ab8ad2f6cc72c9c9cd7af3ccee773b9eae313fb1 /drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c | |
| parent | drm/nouveau/msenc: rename from venc (no binary change) (diff) | |
| download | linux-dev-37a5d028913f7ac614cd79b1e7adaff19c59d2f1.tar.xz linux-dev-37a5d028913f7ac614cd79b1e7adaff19c59d2f1.zip | |
drm/nouveau/mspdec: separate from vp
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 | 2 |
1 files changed, 2 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 384d7eee830a..962273e3e008 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c @@ -194,6 +194,8 @@ nv50_fb_intr(struct nouveau_subdev *subdev) engine = nouveau_engine(subdev, NVDEV_ENGINE_MSVLD); if (!engine && en->data2 == NVDEV_ENGINE_CIPHER) engine = nouveau_engine(subdev, NVDEV_ENGINE_SEC); + if (!engine && en->data2 == NVDEV_ENGINE_VP) + engine = nouveau_engine(subdev, NVDEV_ENGINE_MSPDEC); if (engine) { engctx = nouveau_engctx_get(engine, chan); if (engctx) |