Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43b27290 authored by Zhang, Xiong Y's avatar Zhang, Xiong Y Committed by Daniel Vetter
Browse files

drm/i915: correct the calculation of first_pd_entry_in_global_pt 



When ppgtt is enabled, dev_priv->gtt.total has excluded the gtt space
occupied by ppgtt table in i915_gem_init_global_gtt() function. So the
calculation of first_pd_entry_in_global_pt doesn't need to subtract
I915_PPGTT_PD_ENTRIES again. Or else PPGTT directory table will be
destroyed by global gtt allocation.

This regression has been introduced in

commit a54c0c27
Author: Ben Widawsky <ben@bwidawsk.net>
Date:   Thu Jan 24 14:45:00 2013 -0800

    drm/i915: remove intel_gtt structure

The breakage is pretty subtile since the old gtt_total_entries
included the pde range, whereas the new on did not.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarXiong <Zhang&lt;xiong.y.zhang@intel.com>
[danvet: Add regression citation and cc: stable. Thanks to Chris for
correcting my wrong guess about which commit broke things.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 988b36e5

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −2
Original line number Diff line number Diff line
@@ -233,8 +233,7 @@ static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt) 
	/* ppgtt PDEs reside in the global gtt pagetable, which has 512*1024

	 * entries. For aliasing ppgtt support we just steal them at the end for

	 * now. */

	first_pd_entry_in_global_pt =

		gtt_total_entries(dev_priv->gtt) - I915_PPGTT_PD_ENTRIES;

       first_pd_entry_in_global_pt = gtt_total_entries(dev_priv->gtt);



	ppgtt->num_pd_entries = I915_PPGTT_PD_ENTRIES;

	ppgtt->enable = gen6_ppgtt_enable;