aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_abi16.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2014-08-09 14:10:25 -0400
committerBen Skeggs <bskeggs@redhat.com>2014-08-09 15:28:04 -0400
commitbbf8906b2cad17cf9530b06db7509d0e39b02d16 (patch)
tree8b0ac662278cd6ea528c619d4ebd932f67a29fe3 /drivers/gpu/drm/nouveau/nouveau_abi16.c
parenta532da976f17234375d3b34633ff5d48f71f62bc (diff)
drm/nouveau/fifo: audit and version fifo channel classes
The full object interfaces are about to be exposed to userspace, so we need to check for any security-related issues and version the structs to make it easier to handle any changes we may need in the future. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_abi16.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_abi16.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index 0325db93a7d5..43dfc3e83409 100644
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -257,13 +257,13 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
257 /* hack to allow channel engine type specification on kepler */ 257 /* hack to allow channel engine type specification on kepler */
258 if (device->info.family >= NV_DEVICE_INFO_V0_KEPLER) { 258 if (device->info.family >= NV_DEVICE_INFO_V0_KEPLER) {
259 if (init->fb_ctxdma_handle != ~0) 259 if (init->fb_ctxdma_handle != ~0)
260 init->fb_ctxdma_handle = NVE0_CHANNEL_IND_ENGINE_GR; 260 init->fb_ctxdma_handle = KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_GR;
261 else 261 else
262 init->fb_ctxdma_handle = init->tt_ctxdma_handle; 262 init->fb_ctxdma_handle = init->tt_ctxdma_handle;
263 263
264 /* allow flips to be executed if this is a graphics channel */ 264 /* allow flips to be executed if this is a graphics channel */
265 init->tt_ctxdma_handle = 0; 265 init->tt_ctxdma_handle = 0;
266 if (init->fb_ctxdma_handle == NVE0_CHANNEL_IND_ENGINE_GR) 266 if (init->fb_ctxdma_handle == KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_GR)
267 init->tt_ctxdma_handle = 1; 267 init->tt_ctxdma_handle = 1;
268 } 268 }
269 269