浏览代码

drm/i915/crt: Ensure the HW is powered during HW state readout

The assumption when adding the intel_display_power_is_enabled() checks
was that if it returns success the power can't be turned off afterwards
during the HW access, which is guaranteed by modeset locks. This isn't
always true, so make sure we hold a dedicated reference for the time of
the access.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93439
CC: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1455296121-4742-7-git-send-email-imre.deak@intel.com
Imre Deak 9 年之前
父节点
当前提交
1c8fdda1ea
共有 1 个文件被更改,包括 10 次插入3 次删除
  1. 10 3
      drivers/gpu/drm/i915/intel_crt.c

+ 10 - 3
drivers/gpu/drm/i915/intel_crt.c

@@ -71,22 +71,29 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,
 	struct intel_crt *crt = intel_encoder_to_crt(encoder);
 	struct intel_crt *crt = intel_encoder_to_crt(encoder);
 	enum intel_display_power_domain power_domain;
 	enum intel_display_power_domain power_domain;
 	u32 tmp;
 	u32 tmp;
+	bool ret;
 
 
 	power_domain = intel_display_port_power_domain(encoder);
 	power_domain = intel_display_port_power_domain(encoder);
-	if (!intel_display_power_is_enabled(dev_priv, power_domain))
+	if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
 		return false;
 		return false;
 
 
+	ret = false;
+
 	tmp = I915_READ(crt->adpa_reg);
 	tmp = I915_READ(crt->adpa_reg);
 
 
 	if (!(tmp & ADPA_DAC_ENABLE))
 	if (!(tmp & ADPA_DAC_ENABLE))
-		return false;
+		goto out;
 
 
 	if (HAS_PCH_CPT(dev))
 	if (HAS_PCH_CPT(dev))
 		*pipe = PORT_TO_PIPE_CPT(tmp);
 		*pipe = PORT_TO_PIPE_CPT(tmp);
 	else
 	else
 		*pipe = PORT_TO_PIPE(tmp);
 		*pipe = PORT_TO_PIPE(tmp);
 
 
-	return true;
+	ret = true;
+out:
+	intel_display_power_put(dev_priv, power_domain);
+
+	return ret;
 }
 }
 
 
 static unsigned int intel_crt_get_flags(struct intel_encoder *encoder)
 static unsigned int intel_crt_get_flags(struct intel_encoder *encoder)