aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2011-11-19 05:57:52 -0500
committerBen Skeggs <bskeggs@redhat.com>2011-12-21 04:01:46 -0500
commit4e03b4af6dd3cff445fc0455805b43b101647bfc (patch)
tree8ef57180b317b6a37b13031dd1151d455a49c99e /drivers/gpu/drm/nouveau/nouveau_drv.h
parent045da4e55581d9b4de135bbdbdd1b7fa98dc18a9 (diff)
drm/nouveau: Fix pushbufs over the 4GB mark.
Signed-off-by: Francisco Jerez <currojerez@riseup.net> Tested-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 0af525820347..38134a9c7578 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -232,6 +232,7 @@ struct nouveau_channel {
232 /* mapping of the regs controlling the fifo */ 232 /* mapping of the regs controlling the fifo */
233 void __iomem *user; 233 void __iomem *user;
234 uint32_t user_get; 234 uint32_t user_get;
235 uint32_t user_get_hi;
235 uint32_t user_put; 236 uint32_t user_put;
236 237
237 /* Fencing */ 238 /* Fencing */
@@ -249,7 +250,7 @@ struct nouveau_channel {
249 struct nouveau_gpuobj *pushbuf; 250 struct nouveau_gpuobj *pushbuf;
250 struct nouveau_bo *pushbuf_bo; 251 struct nouveau_bo *pushbuf_bo;
251 struct nouveau_vma pushbuf_vma; 252 struct nouveau_vma pushbuf_vma;
252 uint32_t pushbuf_base; 253 uint64_t pushbuf_base;
253 254
254 /* Notifier memory */ 255 /* Notifier memory */
255 struct nouveau_bo *notifier_bo; 256 struct nouveau_bo *notifier_bo;