AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-02 06:06:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'drm-intel-fixes' into drm-intel-next

Browse Source
This commit is contained in:
Chris Wilson 2010-12-14 11:34:51 +00:00
commit 9097eef024
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/char/agp/intel-gtt.c
View File

@ -1135,12 +1135,19 @@ static void i9xx_chipset_flush(void)
writel(1, intel_private.i9xx_flush_page); writel(1, intel_private.i9xx_flush_page);
} }
static void i965_write_entry(dma_addr_t addr, unsigned int entry, static void i965_write_entry(dma_addr_t addr,
unsigned int entry,
unsigned int flags) unsigned int flags)
{ {
u32 pte_flags;
pte_flags = I810_PTE_VALID;
if (flags == AGP_USER_CACHED_MEMORY)
pte_flags |= I830_PTE_SYSTEM_CACHED;
/* Shift high bits down */ /* Shift high bits down */
addr |= (addr >> 28) & 0xf0; addr |= (addr >> 28) & 0xf0;
writel(addr | I810_PTE_VALID, intel_private.gtt + entry); writel(addr | pte_flags, intel_private.gtt + entry);
} }
static bool gen6_check_flags(unsigned int flags) static bool gen6_check_flags(unsigned int flags)