|
@@ -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;
|
|
|
|
|
|
- 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,
|
|
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) {
|