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

Commit dc1d0136 authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: move getting struct_mutex lower in the callstack during GPU reset 



Getting struct_mutex around the whole intel_enable_gt_powersave()
function is not necessary, since it's only needed for the ILK path
therein.

This will make intel_enable_gt_powersave() useable on the RPM resume
path for >=GEN6 (added in an upcoming patch to reset the RPS state
during RPM resume), where we can't (and need not) get this mutex.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d46c0517

drivers/gpu/drm/i915/i915_drv.c

+1 −4
Original line number Diff line number Diff line
@@ -781,11 +781,8 @@ int i915_reset(struct drm_device *dev) 
		 * reset and the re-install of drm irq. Skip for ironlake per

		 * previous concerns that it doesn't respond well to some forms

		 * of re-init after reset. */

		if (INTEL_INFO(dev)->gen > 5) {

			mutex_lock(&dev->struct_mutex);

		if (INTEL_INFO(dev)->gen > 5)

			intel_enable_gt_powersave(dev);

			mutex_unlock(&dev->struct_mutex);

		}



		intel_hpd_init(dev);

	} else {

drivers/gpu/drm/i915/intel_pm.c

+2 −0
Original line number Diff line number Diff line
@@ -4556,9 +4556,11 @@ void intel_enable_gt_powersave(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;



	if (IS_IRONLAKE_M(dev)) {

		mutex_lock(&dev->struct_mutex);

		ironlake_enable_drps(dev);

		ironlake_enable_rc6(dev);

		intel_init_emon(dev);

		mutex_unlock(&dev->struct_mutex);

	} else if (IS_GEN6(dev) || IS_GEN7(dev)) {

		/*

		 * PCU communication is slow and this doesn't need to be