[Intel-gfx] [PATCH 14/25] agp/intel: always use uncached mappings on VLV

[Daniel Vetter]

On Wed, Mar 21, 2012 at 10:09:18PM +0100, Daniel Vetter wrote:
> On Wed, Mar 21, 2012 at 12:48:35PM -0700, Jesse Barnes wrote:
> > Until the snoopable ones are debugged.
> > 
> > Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
> > ---
> >  drivers/char/agp/intel-gtt.c |    3 +--
> >  1 files changed, 1 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
> > index 8d5bef3..25911a1 100644
> > --- a/drivers/char/agp/intel-gtt.c
> > +++ b/drivers/char/agp/intel-gtt.c
> > @@ -1186,8 +1186,7 @@ static void valleyview_write_entry(dma_addr_t addr, unsigned int entry,
> >  	unsigned int gfdt = flags & AGP_USER_CACHED_MEMORY_GFDT;
> >  	u32 pte_flags;
> >  
> > -	if (type_mask == AGP_USER_MEMORY)
> > -		pte_flags = GEN6_PTE_UNCACHED | I810_PTE_VALID;
> > +	pte_flags = GEN6_PTE_UNCACHED | I810_PTE_VALID;
> 
> Squash this with the previous one. Even for the snb we'll never see
> AGP_USER_MEMORY because only the ums driver ever used this. Before gem.
> And I think even then you need to dig out pretty old userspace to actually
> see it.

Scrap the AGP_USER_MEMORY comment, Chris corrected me on irc that I'm
talking nonsense. I've confused this with the old code from i81x, too many
nightmares from reading that stuff ;-) 'The squash with previous' still
holds.
-Daniel
-- 
Daniel Vetter
Mail: daniel at ffwll.ch
Mobile: +41 (0)79 365 57 48