Commit 2efbda72 authored Jul 06, 2017 by Imre Deak Committed by Daniel Vetter Jul 27, 2017

drm/i915/gen9+: Remove redundant power well state assert during enabling

We check already for power wells that are unexpectedly on (or forced on)
during power well disabling. Those checks also account for other
power well requesters like KVMR or DEBUG. As such this check is
redundant, let's remove it to simplify things.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1499352040-8819-9-git-send-email-imre.deak@intel.com

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent b5565a2e

drivers/gpu/drm/i915/intel_runtime_pm.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -852,13 +852,8 @@ static void skl_set_power_well(struct drm_i915_private *dev_priv,
		skl_power_well_pre_disable(dev_priv, power_well);

		if (enable) {
		if (!enable_requested) {
		WARN((tmp & state_mask) &&
		!I915_READ(HSW_PWR_WELL_BIOS),
		"Invalid for power well status to be enabled, unless done by the BIOS, \
		when request is to disable!\n");
		if (!enable_requested)
		I915_WRITE(HSW_PWR_WELL_DRIVER, tmp \| req_mask);
		}

		if (!is_enabled) {
		DRM_DEBUG_KMS("Enabling %s\n", power_well->name);