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 <David.Woodhouse@xxxxxxxxx>
> Signed-off-by: Ben Widawsky <ben@xxxxxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
