Merge tag 'drm-intel-next-2018-09-06-2' of git://anongit.freedesktop.org/drm/drm...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / intel_hdmi.c

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 02faa2cf4a85c2336cda44b08efe8cfe2ce33c18..a2dab0b6bde6a6a1034b8dcc76c27e03b1004f27 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1903,6 +1903,8 @@ intel_hdmi_set_edid(struct drm_connector *connector)
                connected = true;
        }
 
+       cec_notifier_set_phys_addr_from_edid(intel_hdmi->cec_notifier, edid);
+
        return connected;
 }
 
@@ -1931,6 +1933,9 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 out:
        intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);
 
+       if (status != connector_status_connected)
+               cec_notifier_phys_addr_invalidate(intel_hdmi->cec_notifier);
+
        return status;
 }
 
@@ -2071,6 +2076,8 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder,
 
 static void intel_hdmi_destroy(struct drm_connector *connector)
 {
+       if (intel_attached_hdmi(connector)->cec_notifier)
+               cec_notifier_put(intel_attached_hdmi(connector)->cec_notifier);
        kfree(to_intel_connector(connector)->detect_edid);
        drm_connector_cleanup(connector);
        kfree(connector);
@@ -2391,6 +2398,11 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
                u32 temp = I915_READ(PEG_BAND_GAP_DATA);
                I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd);
        }
+
+       intel_hdmi->cec_notifier = cec_notifier_get_conn(dev->dev,
+                                                        port_identifier(port));
+       if (!intel_hdmi->cec_notifier)
+               DRM_DEBUG_KMS("CEC notifier get failed\n");
 }
 
 void intel_hdmi_init(struct drm_i915_private *dev_priv,