From c41b494c47f8e514e69cb8c2f2ace41d5fa17c94 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 23 Nov 2012 12:40:30 +1000 Subject: nouveau: expose channel engine selection on kepler chipsets v2: Take Maarten Lankhorst's suggestion of nesting the struct to prevent sizeof() issues due to padding on older revisions. Signed-off-by: Ben Skeggs Signed-off-by: Maarten Lankhorst --- nouveau/abi16.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'nouveau/abi16.c') diff --git a/nouveau/abi16.c b/nouveau/abi16.c index a67fbc12..f34175e0 100644 --- a/nouveau/abi16.c +++ b/nouveau/abi16.c @@ -24,9 +24,11 @@ #include #include +#include #include "private.h" + int abi16_chan_nv04(struct nouveau_object *obj) { @@ -69,6 +71,32 @@ abi16_chan_nvc0(struct nouveau_object *obj) return 0; } +int +abi16_chan_nve0(struct nouveau_object *obj) +{ + struct nouveau_device *dev = (struct nouveau_device *)obj->parent; + struct drm_nouveau_channel_alloc req = {}; + struct nve0_fifo *nve0 = obj->data; + int ret; + + if (obj->length > offsetof(struct nve0_fifo, engine)) { + req.fb_ctxdma_handle = 0xffffffff; + req.tt_ctxdma_handle = nve0->engine; + } + + ret = drmCommandWriteRead(dev->fd, DRM_NOUVEAU_CHANNEL_ALLOC, + &req, sizeof(req)); + if (ret) + return ret; + + nve0->base.channel = req.channel; + nve0->base.pushbuf = req.pushbuf_domains; + nve0->notify = req.notifier_handle; + nve0->base.object->handle = req.channel; + nve0->base.object->length = sizeof(*nve0); + return 0; +} + int abi16_engobj(struct nouveau_object *obj) { -- cgit v1.2.3