aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/agp/intel-gtt.c
diff options
context:
space:
mode:
authorZhenyu Wang <zhenyuw@linux.intel.com>2010-11-02 05:30:47 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-11-02 06:05:47 -0400
commit897ef192514a6b0fc10a0ce3fe7e7aa0de09bc52 (patch)
treebfa709ceb59f7afaebfa64e057a782e0f99d59a4 /drivers/char/agp/intel-gtt.c
parentd110852513148a7ec44fad4e036455aeb816d713 (diff)
agp/intel: restore cache behavior on sandybridge
This restores cache behavior for default AGP_USER_MEMORY as uncached, and leave default AGP_USER_CACHED_MEMORY as LLC only. I've seen different cache behavior on one sandybridge desktop CPU vs. another mobile CPU. Until we figure out how to detect the real cache config, restore back to the original behavior now. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/char/agp/intel-gtt.c')
-rw-r--r--drivers/char/agp/intel-gtt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index c51efe6f2c7f..fc1637c32cb1 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -1288,7 +1288,7 @@ static void gen6_write_entry(dma_addr_t addr, unsigned int entry,
1288 unsigned int gfdt = flags & AGP_USER_CACHED_MEMORY_GFDT; 1288 unsigned int gfdt = flags & AGP_USER_CACHED_MEMORY_GFDT;
1289 u32 pte_flags; 1289 u32 pte_flags;
1290 1290
1291 if (type_mask == AGP_USER_UNCACHED_MEMORY) 1291 if (type_mask == AGP_USER_MEMORY)
1292 pte_flags = GEN6_PTE_UNCACHED | I810_PTE_VALID; 1292 pte_flags = GEN6_PTE_UNCACHED | I810_PTE_VALID;
1293 else if (type_mask == AGP_USER_CACHED_MEMORY_LLC_MLC) { 1293 else if (type_mask == AGP_USER_CACHED_MEMORY_LLC_MLC) {
1294 pte_flags = GEN6_PTE_LLC_MLC | I810_PTE_VALID; 1294 pte_flags = GEN6_PTE_LLC_MLC | I810_PTE_VALID;