From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 14/25] agp/intel: always use uncached mappings on VLV Date: Wed, 21 Mar 2012 22:23:15 +0100 Message-ID: <20120321212315.GJ9913@phenom.ffwll.local> References: <1332359326-15051-1-git-send-email-jbarnes@virtuousgeek.org> <1332359326-15051-15-git-send-email-jbarnes@virtuousgeek.org> <20120321210918.GG9913@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by gabe.freedesktop.org (Postfix) with ESMTP id 03947A0C22 for ; Wed, 21 Mar 2012 14:22:31 -0700 (PDT) Received: by wgbds1 with SMTP id ds1so2976wgb.0 for ; Wed, 21 Mar 2012 14:22:31 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20120321210918.GG9913@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org 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 > > --- > > 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@ffwll.ch Mobile: +41 (0)79 365 57 48