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

Commit 69172f21 authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915: take a power domain ref only when needed during HDMI detect 



Suggested by Ville.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1447959301-1263-1-git-send-email-imre.deak@intel.com
parent 366e39b4

drivers/gpu/drm/i915/intel_hdmi.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -1351,14 +1351,15 @@ intel_hdmi_set_edid(struct drm_connector *connector, bool force) 
	struct edid *edid = NULL;

	struct edid *edid = NULL;

	bool connected = false;

	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,

		edid = drm_get_edid(connector,

				    intel_gmbus_get_adapter(dev_priv,

				    intel_gmbus_get_adapter(dev_priv,

				    intel_hdmi->ddc_bus));

				    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;

	to_intel_connector(connector)->detect_edid = edid;

	if (edid && edid->input & DRM_EDID_INPUT_DIGITAL) {

	if (edid && edid->input & DRM_EDID_INPUT_DIGITAL) {