[1/2] drm: move a detected edid member to drm_connector from intel_connector

Commit Message

Gwan-gyeong Mun March 1, 2019, 10:01 a.m. UTC

In order to use a detected edid on drm helper functions, it moves
a detected edid member to drm_connector structure from intel_connector
structure.

v2: Rebased.

Signed-off-by: Gwan-gyeong Mun <[e-mail]>
---
 drivers/gpu/drm/i915/intel_connector.c |  2 +-
 drivers/gpu/drm/i915/intel_dp.c        | 17 ++++++++---------
 drivers/gpu/drm/i915/intel_drv.h       |  1 -
 drivers/gpu/drm/i915/intel_hdmi.c      |  8 ++++----
 include/drm/drm_connector.h            |  7 +++++++
 5 files changed, 20 insertions(+), 15 deletions(-)

Patch

diff --git a/drivers/gpu/drm/i915/intel_connector.c b/drivers/gpu/drm/i915/intel_connector.c
index 848dd9e728d8..175cdbcbdc4e 100644
--- a/drivers/gpu/drm/i915/intel_connector.c
+++ b/drivers/gpu/drm/i915/intel_connector.c
@@ -86,7 +86,7 @@  void intel_connector_destroy(struct drm_connector *connector)
 {
 	struct intel_connector *intel_connector = to_intel_connector(connector);
 
-	kfree(intel_connector->detect_edid);
+	kfree(intel_connector->base.detect_edid);
 
 	intel_hdcp_cleanup(intel_connector);
 
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index e1a051c0fbfe..bc493656e183 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4479,7 +4479,7 @@  static u8 intel_dp_autotest_edid(struct intel_dp *intel_dp)
 	struct intel_connector *intel_connector = intel_dp->attached_connector;
 	struct drm_connector *connector = &intel_connector->base;
 
-	if (intel_connector->detect_edid == NULL ||
+	if (connector->detect_edid == NULL ||
 	    connector->edid_corrupt ||
 	    intel_dp->aux.i2c_defer_count > 6) {
 		/* Check EDID read for NACKs, DEFERs and corruption
@@ -4496,12 +4496,12 @@  static u8 intel_dp_autotest_edid(struct intel_dp *intel_dp)
 				      intel_dp->aux.i2c_defer_count);
 		intel_dp->compliance.test_data.edid = INTEL_DP_RESOLUTION_FAILSAFE;
 	} else {
-		struct edid *block = intel_connector->detect_edid;
+		struct edid *block = connector->detect_edid;
 
 		/* We have to write the checksum
 		 * of the last block read
 		 */
-		block += intel_connector->detect_edid->extensions;
+		block += connector->detect_edid->extensions;
 
 		if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TEST_EDID_CHECKSUM,
 				       block->checksum) <= 0)
@@ -5355,7 +5355,7 @@  intel_dp_set_edid(struct intel_dp *intel_dp)
 
 	intel_dp_unset_edid(intel_dp);
 	edid = intel_dp_get_edid(intel_dp);
-	intel_connector->detect_edid = edid;
+	intel_connector->base.detect_edid = edid;
 
 	intel_dp->has_audio = drm_detect_monitor_audio(edid);
 	drm_dp_cec_set_edid(&intel_dp->aux, edid);
@@ -5367,8 +5367,8 @@  intel_dp_unset_edid(struct intel_dp *intel_dp)
 	struct intel_connector *intel_connector = intel_dp->attached_connector;
 
 	drm_dp_cec_unset_edid(&intel_dp->aux);
-	kfree(intel_connector->detect_edid);
-	intel_connector->detect_edid = NULL;
+	kfree(intel_connector->base.detect_edid);
+	intel_connector->base.detect_edid = NULL;
 
 	intel_dp->has_audio = false;
 }
@@ -5471,8 +5471,7 @@  intel_dp_detect(struct drm_connector *connector,
 	intel_dp->aux.i2c_defer_count = 0;
 
 	intel_dp_set_edid(intel_dp);
-	if (intel_dp_is_edp(intel_dp) ||
-	    to_intel_connector(connector)->detect_edid)
+	if (intel_dp_is_edp(intel_dp) || connector->detect_edid)
 		status = connector_status_connected;
 
 	intel_dp_check_service_irq(intel_dp);
@@ -5515,7 +5514,7 @@  static int intel_dp_get_modes(struct drm_connector *connector)
 	struct intel_connector *intel_connector = to_intel_connector(connector);
 	struct edid *edid;
 
-	edid = intel_connector->detect_edid;
+	edid = connector->detect_edid;
 	if (edid) {
 		int ret = intel_connector_update_modes(connector, edid);
 		if (ret)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 5412373e2f98..6f641980a877 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -503,7 +503,6 @@  struct intel_connector {
 
 	/* Cached EDID for eDP and LVDS. May hold ERR_PTR for invalid EDID. */
 	struct edid *edid;
-	struct edid *detect_edid;
 
 	/* since POLL and HPD connectors may use the same HPD line keep the native
 	   state of connector->polled in case hotplug storm detection changes it */
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index cd422a7b4da0..82fd4b535c45 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -2395,8 +2395,8 @@  intel_hdmi_unset_edid(struct drm_connector *connector)
 	intel_hdmi->dp_dual_mode.type = DRM_DP_DUAL_MODE_NONE;
 	intel_hdmi->dp_dual_mode.max_tmds_clock = 0;
 
-	kfree(to_intel_connector(connector)->detect_edid);
-	to_intel_connector(connector)->detect_edid = NULL;
+	kfree(connector->detect_edid);
+	connector->detect_edid = NULL;
 }
 
 static void
@@ -2473,7 +2473,7 @@  intel_hdmi_set_edid(struct drm_connector *connector)
 
 	intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS, wakeref);
 
-	to_intel_connector(connector)->detect_edid = edid;
+	connector->detect_edid = edid;
 	if (edid && edid->input & DRM_EDID_INPUT_DIGITAL) {
 		intel_hdmi->has_audio = drm_detect_monitor_audio(edid);
 		intel_hdmi->has_hdmi_sink = drm_detect_hdmi_monitor(edid);
@@ -2536,7 +2536,7 @@  static int intel_hdmi_get_modes(struct drm_connector *connector)
 {
 	struct edid *edid;
 
-	edid = to_intel_connector(connector)->detect_edid;
+	edid = connector->detect_edid;
 	if (edid == NULL)
 		return 0;
 
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index c8061992d6cb..f1b4e39227e3 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -1140,6 +1140,13 @@  struct drm_connector {
 	 */
 	bool edid_corrupt;
 
+	/**
+	 * @detect_edid: indicates a cached EDID for a detection cycle
+	 * As we may query the edid multiple times following a detect, record
+	 * the EDID found during output discovery and reuse it.
+	 */
+	struct edid *detect_edid;
+
 	/** @debugfs_entry: debugfs directory for this connector */
 	struct dentry *debugfs_entry;