public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH 1/2] drm/i915: take a power domain ref only when needed during HDMI detect
@ 2015-11-19 18:55 Imre Deak
  2015-11-19 18:55 ` [PATCH 2/2] drm/i915: take a power domain reference while checking the HDMI live status Imre Deak
  2015-11-19 20:51 ` [PATCH 1/2] drm/i915: take a power domain ref only when needed during HDMI detect Chris Wilson
  0 siblings, 2 replies; 14+ messages in thread
From: Imre Deak @ 2015-11-19 18:55 UTC (permalink / raw)
  To: intel-gfx

Suggested by Ville.

Signed-off-by: Imre Deak <imre.deak@intel.com>
---
 drivers/gpu/drm/i915/intel_hdmi.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index fd86cef..17ced03 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1351,14 +1351,15 @@ intel_hdmi_set_edid(struct drm_connector *connector, bool force)
 	struct edid *edid = NULL;
 	bool connected = false;
 
-	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
+	if (force) {
+		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.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2015-11-24 14:23 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-19 18:55 [PATCH 1/2] drm/i915: take a power domain ref only when needed during HDMI detect Imre Deak
2015-11-19 18:55 ` [PATCH 2/2] drm/i915: take a power domain reference while checking the HDMI live status Imre Deak
2015-11-19 19:08   ` Ville Syrjälä
2015-11-19 19:13     ` Imre Deak
2015-11-19 19:17       ` Ville Syrjälä
2015-11-20  9:54         ` Imre Deak
2015-11-20 10:12           ` Imre Deak
2015-11-20 11:13             ` Jani Nikula
2015-11-24 14:23               ` Imre Deak
2015-11-19 20:51 ` [PATCH 1/2] drm/i915: take a power domain ref only when needed during HDMI detect Chris Wilson
2015-11-19 21:01   ` Imre Deak
2015-11-19 21:38     ` Chris Wilson
2015-11-19 21:50       ` Imre Deak
2015-11-19 22:24         ` Imre Deak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox