aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/agp/intel-gtt.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 326ca2ef06b5..356f73e0d17e 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -1135,12 +1135,19 @@ static void i9xx_chipset_flush(void)
1135 writel(1, intel_private.i9xx_flush_page); 1135 writel(1, intel_private.i9xx_flush_page);
1136} 1136}
1137 1137
1138static void i965_write_entry(dma_addr_t addr, unsigned int entry, 1138static void i965_write_entry(dma_addr_t addr,
1139 unsigned int entry,
1139 unsigned int flags) 1140 unsigned int flags)
1140{ 1141{
1142 u32 pte_flags;
1143
1144 pte_flags = I810_PTE_VALID;
1145 if (flags == AGP_USER_CACHED_MEMORY)
1146 pte_flags |= I830_PTE_SYSTEM_CACHED;
1147
1141 /* Shift high bits down */ 1148 /* Shift high bits down */
1142 addr |= (addr >> 28) & 0xf0; 1149 addr |= (addr >> 28) & 0xf0;
1143 writel(addr | I810_PTE_VALID, intel_private.gtt + entry); 1150 writel(addr | pte_flags, intel_private.gtt + entry);
1144} 1151}
1145 1152
1146static bool gen6_check_flags(unsigned int flags) 1153static bool gen6_check_flags(unsigned int flags)