xf86-video-intel: src/sna/kgem.c

[Chris Wilson]

 src/sna/kgem.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 93ecd5606eaf2e1db2b844f39bb04d77fa53cf8d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Mar 8 23:38:12 2013 +0000

    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 at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 6933b47..d469e51 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();