Merge branch 'sh/alphaproject' into sh-latest

2 files changed, 15 insertions, 4 deletions

diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
index 010e3defd6c3..c195bfeade11 100644
--- a/drivers/char/agp/intel-agp.h
+++ b/drivers/char/agp/intel-agp.h
@@ -94,6 +94,8 @@
 #define G4x_GMCH_SIZE_VT_1_5M   (0xa << 8)
 #define G4x_GMCH_SIZE_VT_2M     (0xc << 8)
 
+#define GFX_FLSH_CNTL           0x2170 /* 915+ */
+
 #define I810_DRAM_CTL           0x3000
 #define I810_DRAM_ROW_0         0x00000001
 #define I810_DRAM_ROW_0_SDRAM   0x00000001
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 356f73e0d17e..e921b693412b 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -688,14 +688,14 @@ static int intel_gtt_init(void)
 
         intel_private.base.stolen_size = intel_gtt_stolen_size();
 
+        intel_private.base.needs_dmar = USE_PCI_DMA_API && INTEL_GTT_GEN > 2;
+
         ret = intel_gtt_setup_scratch_page();
         if (ret != 0) {
                 intel_gtt_cleanup();
                 return ret;
         }
 
-        intel_private.base.needs_dmar = USE_PCI_DMA_API && INTEL_GTT_GEN > 2;
-
         return 0;
 }
 
@@ -814,6 +814,12 @@ static bool intel_enable_gtt(void)
                 }
         }
 
+        /* On the resume path we may be adjusting the PGTBL value, so
+         * be paranoid and flush all chipset write buffers...
+         */
+        if (INTEL_GTT_GEN >= 3)
+                writel(0, intel_private.registers+GFX_FLSH_CNTL);
+
         reg = intel_private.registers+I810_PGETBL_CTL;
         writel(intel_private.PGETBL_save, reg);
         if (HAS_PGTBL_EN && (readl(reg) & I810_PGETBL_ENABLED) == 0) {
@@ -823,6 +829,9 @@ static bool intel_enable_gtt(void)
                 return false;
         }
 
+        if (INTEL_GTT_GEN >= 3)
+                writel(0, intel_private.registers+GFX_FLSH_CNTL);
+
         return true;
 }
 
@@ -991,14 +1000,14 @@ static int intel_fake_agp_remove_entries(struct agp_memory *mem,
         if (mem->page_count == 0)
                 return 0;
 
+        intel_gtt_clear_range(pg_start, mem->page_count);
+
         if (intel_private.base.needs_dmar) {
                 intel_gtt_unmap_memory(mem->sg_list, mem->num_sg);
                 mem->sg_list = NULL;
                 mem->num_sg = 0;
         }
 
-        intel_gtt_clear_range(pg_start, mem->page_count);
-
         return 0;
 }