From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915/bdw: Fix GEN8 GTT size calculation Date: Fri, 14 Mar 2014 19:40:30 +0100 Message-ID: <20140314184030.GC30571@phenom.ffwll.local> References: <1394816286-31200-1-git-send-email-benjamin.widawsky@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com [74.125.83.53]) by gabe.freedesktop.org (Postfix) with ESMTP id 19E9CFB252 for ; Fri, 14 Mar 2014 11:40:34 -0700 (PDT) Received: by mail-ee0-f53.google.com with SMTP id b57so1066132eek.40 for ; Fri, 14 Mar 2014 11:40:34 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1394816286-31200-1-git-send-email-benjamin.widawsky@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Ben Widawsky Cc: Intel GFX , Ben Widawsky , David Woodhouse List-Id: intel-gfx@lists.freedesktop.org On Fri, Mar 14, 2014 at 09:58:06AM -0700, Ben Widawsky wrote: > The preliminary HW support check is no longer needed, and the > calculation is simplified while here. > > Reported-by: David Woodhouse > Signed-off-by: Ben Widawsky > --- > drivers/gpu/drm/i915/i915_gem_gtt.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index 40a2b36..694112a 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -1250,14 +1250,7 @@ static inline unsigned int gen8_get_total_gtt_size(u16 bdw_gmch_ctl) > { > bdw_gmch_ctl >>= BDW_GMCH_GGMS_SHIFT; > bdw_gmch_ctl &= BDW_GMCH_GGMS_MASK; > - if (bdw_gmch_ctl) > - bdw_gmch_ctl = 1 << bdw_gmch_ctl; > - if (bdw_gmch_ctl > 4) { > - WARN_ON(!i915_preliminary_hw_support); > - return 4<<20; > - } > - > - return bdw_gmch_ctl << 20; > + return 1 << (bdw_gmch_ctl + 20); I don't have this in my tree, and it seems to never have existed in upstream ... /me is confused Cheers, Daniel > } > > static inline size_t gen6_get_stolen_size(u16 snb_gmch_ctl) > -- > 1.9.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch