summaryrefslogtreecommitdiffstats
path: root/drivers/char/agp
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-11-04 18:41:50 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-11-23 21:14:41 +0100
commitb47cf66f315a258c458ed4345c443dba396fb787 (patch)
tree1b602d3c6711e5e04922ce2d348003ff4c323cdf /drivers/char/agp
parentMerge branch 'drm-intel-fixes' into drm-intel-next (diff)
downloadlinux-b47cf66f315a258c458ed4345c443dba396fb787.tar.xz
linux-b47cf66f315a258c458ed4345c443dba396fb787.zip
intel-gtt: drop dcache support for i830 and later
i830_check_flags already disallows it, so no need to implement it in the write_entry function. Seems to be a remnant from i810 support. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/char/agp')
-rw-r--r--drivers/char/agp/intel-gtt.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index d2733e526a68..8a30a16c5706 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -896,14 +896,8 @@ static void i830_write_entry(dma_addr_t addr, unsigned int entry,
{
u32 pte_flags = I810_PTE_VALID;
- switch (flags) {
- case AGP_DCACHE_MEMORY:
- pte_flags |= I810_PTE_LOCAL;
- break;
- case AGP_USER_CACHED_MEMORY:
+ if (flags == AGP_USER_CACHED_MEMORY)
pte_flags |= I830_PTE_SYSTEM_CACHED;
- break;
- }
writel(addr | pte_flags, intel_private.gtt + entry);
}