drm/i915: hdmi: add CEC notifier to intel_hdmi

superna9999 · Lee Jones · commit 9c229127aee2 · 2018-07-13T08:44:22.000+01:00
This patchs adds the cec_notifier feature to the intel_hdmi part
of the i915 DRM driver. It uses the HDMI DRM connector name to differentiate
between each HDMI ports.
The changes will allow the i915 HDMI code to notify EDID and HPD changes
to an eventual CEC adapter.

Signed-off-by: Neil Armstrong &lt;narmstrong@baylibre.com&gt;
Reviewed-by: Hans Verkuil &lt;hans.verkuil@cisco.com&gt;
Reviewed-by: Ville Syrjälä &lt;ville.syrjala@linux.intel.com&gt;
Acked-by: Rodrigo Vivi &lt;rodrigo.vivi@intel.com&gt;
Signed-off-by: Lee Jones &lt;lee.jones@linaro.org&gt;
diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
@@ -23,6 +23,7 @@ config DRM_I915
 	select SYNC_FILE
 	select IOSF_MBI
 	select CRC32
+	select CEC_CORE if CEC_NOTIFIER
 	help
 	  Choose this option if you have a system that has "Intel Graphics
 	  Media Accelerator" or "HD Graphics" integrated graphics,
diff --git a/drivers/gpu/drm/i915/intel_display.h b/drivers/gpu/drm/i915/intel_display.h
@@ -126,6 +126,30 @@ enum port {
 
 #define port_name(p) ((p) + 'A')
 
+/*
+ * Ports identifier referenced from other drivers.
+ * Expected to remain stable over time
+ */
+static inline const char *port_identifier(enum port port)
+{
+	switch (port) {
+	case PORT_A:
+		return "Port A";
+	case PORT_B:
+		return "Port B";
+	case PORT_C:
+		return "Port C";
+	case PORT_D:
+		return "Port D";
+	case PORT_E:
+		return "Port E";
+	case PORT_F:
+		return "Port F";
+	default:
+		return "<invalid>";
+	}
+}
+
 enum dpio_channel {
 	DPIO_CH0,
 	DPIO_CH1
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
@@ -39,6 +39,7 @@
 #include <drm/drm_dp_mst_helper.h>
 #include <drm/drm_rect.h>
 #include <drm/drm_atomic.h>
+#include <media/cec-notifier.h>
 
 /**
  * __wait_for - magic wait macro
@@ -1017,6 +1018,7 @@ struct intel_hdmi {
 	bool has_audio;
 	bool rgb_quant_range_selectable;
 	struct intel_connector *attached_connector;
+	struct cec_notifier *cec_notifier;
 };
 
 struct intel_dp_mst_encoder;
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1868,6 +1868,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;
 }
 
@@ -1876,6 +1878,7 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 {
 	enum drm_connector_status status;
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
+	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
 
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
 		      connector->base.id, connector->name);
@@ -1891,6 +1894,9 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
 	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;
 }
 
@@ -2031,6 +2037,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);
@@ -2350,6 +2358,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,

Original file line number	Diff line number	Diff line change
`@@ -1868,6 +1868,8 @@ intel_hdmi_set_edid(struct drm_connector *connector)`
`1868`	`1868`	`connected = true;`
`1869`	`1869`	`}`
`1870`	`1870`
	`1871`	`+ cec_notifier_set_phys_addr_from_edid(intel_hdmi->cec_notifier, edid);`
	`1872`	`+`
`1871`	`1873`	`return connected;`
`1872`	`1874`	`}`
`1873`	`1875`
`@@ -1876,6 +1878,7 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)`
`1876`	`1878`	`{`
`1877`	`1879`	`enum drm_connector_status status;`
`1878`	`1880`	`struct drm_i915_private *dev_priv = to_i915(connector->dev);`
	`1881`	`+ struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);`
`1879`	`1882`
`1880`	`1883`	`DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",`
`1881`	`1884`	`connector->base.id, connector->name);`
`@@ -1891,6 +1894,9 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)`
`1891`	`1894`
`1892`	`1895`	`intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);`
`1893`	`1896`
	`1897`	`+ if (status != connector_status_connected)`
	`1898`	`+ cec_notifier_phys_addr_invalidate(intel_hdmi->cec_notifier);`
	`1899`	`+`
`1894`	`1900`	`return status;`
`1895`	`1901`	`}`
`1896`	`1902`
`@@ -2031,6 +2037,8 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder,`
`2031`	`2037`
`2032`	`2038`	`static void intel_hdmi_destroy(struct drm_connector *connector)`
`2033`	`2039`	`{`
	`2040`	`+ if (intel_attached_hdmi(connector)->cec_notifier)`
	`2041`	`+ cec_notifier_put(intel_attached_hdmi(connector)->cec_notifier);`
`2034`	`2042`	`kfree(to_intel_connector(connector)->detect_edid);`
`2035`	`2043`	`drm_connector_cleanup(connector);`
`2036`	`2044`	`kfree(connector);`
`@@ -2350,6 +2358,11 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,`
`2350`	`2358`	`u32 temp = I915_READ(PEG_BAND_GAP_DATA);`
`2351`	`2359`	`I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) \| 0xd);`
`2352`	`2360`	`}`
	`2361`	`+`
	`2362`	`+ intel_hdmi->cec_notifier = cec_notifier_get_conn(dev->dev,`
	`2363`	`+ port_identifier(port));`
	`2364`	`+ if (!intel_hdmi->cec_notifier)`
	`2365`	`+ DRM_DEBUG_KMS("CEC notifier get failed\n");`
`2353`	`2366`	`}`
`2354`	`2367`
`2355`	`2368`	`void intel_hdmi_init(struct drm_i915_private *dev_priv,`