[linux-yocto] [PATCH 1/2] Revert "UPSTREAM: drm/i915: take a power domain ref only when needed during HDMI detect"

[Jukka Laitinen]

This reverts commit ae66935690ab7d41ba555bcbce0bd84812add3ee.

The reverted commit depends on another, which was reverted in
cbadb9d9de33 "Revert "drm/i915: Check live status before reading edid"
This one needs to be reverted as well in order for the i915 to compile.
---
 drivers/gpu/drm/i915/intel_hdmi.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 8a0da9c..9c545c0 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1361,15 +1361,14 @@ intel_hdmi_set_edid(struct drm_connector *connector)
 	struct edid *edid;
 	bool connected = false;
 
-	if (force) {
-		intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
+	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
+	if (force)
 		edid = drm_get_edid(connector,
 				    intel_gmbus_get_adapter(dev_priv,
 				    intel_hdmi->ddc_bus));
 
-		intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);
-	}
+	intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);
 
 	to_intel_connector(connector)->detect_edid = edid;
 	if (edid && edid->input & DRM_EDID_INPUT_DIGITAL) {
-- 
2.7.4