projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
76befb8
)
drm/nv50: fix vram ptes on IGPs to point at stolen system memory
author
Ben Skeggs
<bskeggs@redhat.com>
Fri, 19 Feb 2010 22:10:11 +0000
(08:10 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Tue, 23 Feb 2010 03:50:24 +0000
(13:50 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_mem.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_mem.c
b/drivers/gpu/drm/nouveau/nouveau_mem.c
index
134fedb
..
2dc09db
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_mem.c
@@
-291,7
+291,13
@@
nv50_mem_vm_bind_linear(struct drm_device *dev, uint64_t virt, uint32_t size,
virt = ((virt - dev_priv->vm_vram_base) >> 16) << 1;
size = (size >> 16) << 1;
- phys |= ((uint64_t)flags << 32) | 1;
+
+ phys |= ((uint64_t)flags << 32);
+ phys |= 1;
+ if (dev_priv->vram_sys_base) {
+ phys += dev_priv->vram_sys_base;
+ phys |= 0x30;
+ }
dev_priv->engine.instmem.prepare_access(dev, true);
while (size) {