From b9997c9893a45e4713b9b3d375ad7a71d4fb27c4 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Thu, 4 Nov 2010 18:41:50 +0100 Subject: [PATCH] --- yaml --- r: 228731 b: refs/heads/master c: b47cf66f315a258c458ed4345c443dba396fb787 h: refs/heads/master i: 228729: dfd078122a79a208ceeb26b1f835d7218a549a96 228727: 0b2ed7c5e280ea1d5dd4ae5aee084763485b935f v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/intel-gtt.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 873d70f7dfb8..8346cf1f5ccc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e384eafc1c2f4f10155fe25324afe51129ec3e6a +refs/heads/master: b47cf66f315a258c458ed4345c443dba396fb787 diff --git a/trunk/drivers/char/agp/intel-gtt.c b/trunk/drivers/char/agp/intel-gtt.c index d2733e526a68..8a30a16c5706 100644 --- a/trunk/drivers/char/agp/intel-gtt.c +++ b/trunk/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); }