diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-12-02 15:40:16 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-12-02 15:40:16 +1000 |
| commit | d87c0e3d9f42cd3582498eac2d7409cc0361c0cb (patch) | |
| tree | 545ab7e4d45008af6dc61b9c6ae5bc8ea85c433b /drivers/gpu/drm/nouveau/core/engine/device/nvc0.c | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a (diff) | |
| parent | 226d63a1addea8cbe8fc671978e62dc84927b046 (diff) | |
| download | linux-d87c0e3d9f42cd3582498eac2d7409cc0361c0cb.tar.gz | |
Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
Just a couple of fixes for the fallout from the fence rework.
* 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau/gf116: remove copy1 engine
drm/nouveau: prevent stale fence->channel pointers, and protect with rcu
drm/nouveau/fifo/g84-: ack non-stall interrupt before handling it
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/engine/device/nvc0.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/device/nvc0.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c index cd05677ad4b7..72a40f95d048 100644 --- a/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c +++ b/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c @@ -218,7 +218,6 @@ nvc0_identify(struct nouveau_device *device) device->oclass[NVDEV_ENGINE_BSP ] = &nvc0_bsp_oclass; device->oclass[NVDEV_ENGINE_PPP ] = &nvc0_ppp_oclass; device->oclass[NVDEV_ENGINE_COPY0 ] = &nvc0_copy0_oclass; - device->oclass[NVDEV_ENGINE_COPY1 ] = &nvc0_copy1_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass; device->oclass[NVDEV_ENGINE_PERFMON] = &nvc0_perfmon_oclass; break; |