diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-11-21 22:43:55 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-11-28 18:58:05 -0500 |
commit | 4946980099c617ba7612f97f77cba7ece5b7f820 (patch) | |
tree | 79a781ea1317fa560929290e4fd1c709acfae733 /drivers/gpu/drm/nouveau/nouveau_drm.c | |
parent | 43598875b35fdd3f699954078b7df24b5647a27a (diff) |
drm/nve0: allow specification of channel engine type in abi16 call
Previously, if either vram/gart handles were specified as ~0, the ioctl
call would fail. In order to hack engine selection into the ioctl for
kepler, we now define (fb_ctxdma_handle == ~0) to mean "engine mask is
in tt_ctxdma_handle".
This approach also allows new userspace to detect lack of support for
non-PGRAPH channels on older kernels.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index f62dbd2733bf..919186c4651b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c | |||
@@ -148,7 +148,7 @@ nouveau_accel_init(struct nouveau_drm *drm) | |||
148 | NV_ERROR(drm, "failed to create ce channel, %d\n", ret); | 148 | NV_ERROR(drm, "failed to create ce channel, %d\n", ret); |
149 | 149 | ||
150 | arg0 = NVE0_CHANNEL_IND_ENGINE_GR; | 150 | arg0 = NVE0_CHANNEL_IND_ENGINE_GR; |
151 | arg1 = 0; | 151 | arg1 = 1; |
152 | } else { | 152 | } else { |
153 | arg0 = NvDmaFB; | 153 | arg0 = NvDmaFB; |
154 | arg1 = NvDmaTT; | 154 | arg1 = NvDmaTT; |