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

Commit be1c1fe2 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Hold pc8 lock around toggling pc8.gpu_idle 



We need to hold the pc8 lock around toggling the value of gpu_idle.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1d37b689

drivers/gpu/drm/i915/intel_display.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -6585,18 +6585,22 @@ static void hsw_update_package_c8(struct drm_device *dev) 




static void hsw_package_c8_gpu_idle(struct drm_i915_private *dev_priv)

static void hsw_package_c8_gpu_idle(struct drm_i915_private *dev_priv)

{

{

	mutex_lock(&dev_priv->pc8.lock);

	if (!dev_priv->pc8.gpu_idle) {

	if (!dev_priv->pc8.gpu_idle) {

		dev_priv->pc8.gpu_idle = true;

		dev_priv->pc8.gpu_idle = true;

		hsw_enable_package_c8(dev_priv);

		__hsw_enable_package_c8(dev_priv);

	}

	}

	mutex_unlock(&dev_priv->pc8.lock);

}

}





static void hsw_package_c8_gpu_busy(struct drm_i915_private *dev_priv)

static void hsw_package_c8_gpu_busy(struct drm_i915_private *dev_priv)

{

{

	mutex_lock(&dev_priv->pc8.lock);

	if (dev_priv->pc8.gpu_idle) {

	if (dev_priv->pc8.gpu_idle) {

		dev_priv->pc8.gpu_idle = false;

		dev_priv->pc8.gpu_idle = false;

		hsw_disable_package_c8(dev_priv);

		__hsw_disable_package_c8(dev_priv);

	}

	}

	mutex_unlock(&dev_priv->pc8.lock);

}

}





#define for_each_power_domain(domain, mask)				\

#define for_each_power_domain(domain, mask)				\