summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-03-08 23:38:12 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2013-03-08 23:38:12 +0000
commit93ecd5606eaf2e1db2b844f39bb04d77fa53cf8d (patch)
tree8edcc8c6825e74a95e917ad20bf814df9e107031 /src
parent78c756120db2e5e174925a92c0a0bba3ff70860c (diff)
sna: Only shrink the maximum GPU size to fit into cache
That is be very careful that we do not enlarge it past the aperture size on early gen. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
-rw-r--r--src/sna/kgem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 6933b475..d469e512 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1121,7 +1121,7 @@ void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, unsigned gen)
kgem->max_object_size = 3 * (kgem->aperture_high >> 12) << 10;
kgem->max_gpu_size = kgem->max_object_size;
- if (!kgem->has_llc)
+ if (!kgem->has_llc && kgem->max_gpu_size > MAX_CACHE_SIZE)
kgem->max_gpu_size = MAX_CACHE_SIZE;
totalram = total_ram_size();