drm/i915/display: switch the rest of the connectors to struct drm_edid

Convert the remaining uses of struct edid based drm_get_edid(),
drm_connector_update_edid_property() and drm_add_edid_modes() calls to
the struct drm_edid based drm_edid_read_ddc(),
drm_edid_connector_update() and drm_edid_connector_add_modes().

Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b1b53bb9004adaa402e061f7df2caf0eb4723a43.1685437501.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
index 257afac..00ea71b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_connector.c
+++ b/drivers/gpu/drm/i915/display/intel_connector.c
@@ -176,15 +176,15 @@ enum pipe intel_connector_get_pipe(struct intel_connector *connector)
 /**
  * intel_connector_update_modes - update connector from edid
  * @connector: DRM connector device to use
- * @edid: previously read EDID information
+ * @drm_edid: previously read EDID information
  */
 int intel_connector_update_modes(struct drm_connector *connector,
-                               struct edid *edid)
+                                const struct drm_edid *drm_edid)
 {
        int ret;
 
-       drm_connector_update_edid_property(connector, edid);
-       ret = drm_add_edid_modes(connector, edid);
+       drm_edid_connector_update(connector, drm_edid);
+       ret = drm_edid_connector_add_modes(connector);
 
        return ret;
 }
@@ -199,15 +199,15 @@ int intel_connector_update_modes(struct drm_connector *connector,
 int intel_ddc_get_modes(struct drm_connector *connector,
                        struct i2c_adapter *adapter)
 {
-       struct edid *edid;
+       const struct drm_edid *drm_edid;
        int ret;
 
-       edid = drm_get_edid(connector, adapter);
-       if (!edid)
+       drm_edid = drm_edid_read_ddc(connector, adapter);
+       if (!drm_edid)
                return 0;
 
-       ret = intel_connector_update_modes(connector, edid);
-       kfree(edid);
+       ret = intel_connector_update_modes(connector, drm_edid);
+       drm_edid_free(drm_edid);
 
        return ret;
 }

diff --git a/drivers/gpu/drm/i915/display/intel_connector.h b/drivers/gpu/drm/i915/display/intel_connector.h
index 9d2bc26..aaf7281 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_connector.h
+++ b/drivers/gpu/drm/i915/display/intel_connector.h
@@ -9,7 +9,7 @@
 #include <linux/types.h>
 
 struct drm_connector;
-struct edid;
+struct drm_edid;
 struct i2c_adapter;
 struct intel_connector;
 struct intel_encoder;
@@ -25,7 +25,7 @@ void intel_connector_attach_encoder(struct intel_connector *connector,
 bool intel_connector_get_hw_state(struct intel_connector *connector);
 enum pipe intel_connector_get_pipe(struct intel_connector *connector);
 int intel_connector_update_modes(struct drm_connector *connector,
-                                struct edid *edid);
+                                const struct drm_edid *drm_edid);
 int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);
 void intel_attach_force_audio_property(struct drm_connector *connector);
 void intel_attach_broadcast_rgb_property(struct drm_connector *connector);

diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index 673c036..ab7cd5e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -609,37 +609,38 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)
        return ret;
 }
 
-static struct edid *intel_crt_get_edid(struct drm_connector *connector,
-                               struct i2c_adapter *i2c)
+static const struct drm_edid *intel_crt_get_edid(struct drm_connector *connector,
+                                                struct i2c_adapter *i2c)
 {
-       struct edid *edid;
+       const struct drm_edid *drm_edid;
 
-       edid = drm_get_edid(connector, i2c);
+       drm_edid = drm_edid_read_ddc(connector, i2c);
 
-       if (!edid && !intel_gmbus_is_forced_bit(i2c)) {
+       if (!drm_edid && !intel_gmbus_is_forced_bit(i2c)) {
                drm_dbg_kms(connector->dev,
                            "CRT GMBUS EDID read failed, retry using GPIO bit-banging\n");
                intel_gmbus_force_bit(i2c, true);
-               edid = drm_get_edid(connector, i2c);
+               drm_edid = drm_edid_read_ddc(connector, i2c);
                intel_gmbus_force_bit(i2c, false);
        }
 
-       return edid;
+       return drm_edid;
 }
 
 /* local version of intel_ddc_get_modes() to use intel_crt_get_edid() */
 static int intel_crt_ddc_get_modes(struct drm_connector *connector,
                                struct i2c_adapter *adapter)
 {
-       struct edid *edid;
+       const struct drm_edid *drm_edid;
        int ret;
 
-       edid = intel_crt_get_edid(connector, adapter);
-       if (!edid)
+       drm_edid = intel_crt_get_edid(connector, adapter);
+       if (!drm_edid)
                return 0;
 
-       ret = intel_connector_update_modes(connector, edid);
-       kfree(edid);
+       ret = intel_connector_update_modes(connector, drm_edid);
+
+       drm_edid_free(drm_edid);
 
        return ret;
 }
@@ -648,14 +649,15 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)
 {
        struct intel_crt *crt = intel_attached_crt(to_intel_connector(connector));
        struct drm_i915_private *dev_priv = to_i915(crt->base.base.dev);
-       struct edid *edid;
+       const struct drm_edid *drm_edid;
        struct i2c_adapter *i2c;
        bool ret = false;
 
        i2c = intel_gmbus_get_adapter(dev_priv, dev_priv->display.vbt.crt_ddc_pin);
-       edid = intel_crt_get_edid(connector, i2c);
+       drm_edid = intel_crt_get_edid(connector, i2c);
 
-       if (edid) {
+       if (drm_edid) {
+               const struct edid *edid = drm_edid_raw(drm_edid);
                bool is_digital = edid->input & DRM_EDID_INPUT_DIGITAL;
 
                /*
@@ -676,7 +678,7 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)
                            "CRT not detected via DDC:0x50 [no valid EDID found]\n");
        }
 
-       kfree(edid);
+       drm_edid_free(drm_edid);
 
        return ret;
 }

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 1d483a8..e3f176a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -836,15 +836,17 @@ static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector)
 {
        struct intel_connector *intel_connector = to_intel_connector(connector);
        struct intel_dp *intel_dp = intel_connector->mst_port;
-       struct edid *edid;
+       const struct drm_edid *drm_edid;
        int ret;
 
        if (drm_connector_is_unregistered(connector))
                return intel_connector_update_modes(connector, NULL);
 
-       edid = drm_dp_mst_get_edid(connector, &intel_dp->mst_mgr, intel_connector->port);
-       ret = intel_connector_update_modes(connector, edid);
-       kfree(edid);
+       drm_edid = drm_dp_mst_edid_read(connector, &intel_dp->mst_mgr, intel_connector->port);
+
+       ret = intel_connector_update_modes(connector, drm_edid);
+
+       drm_edid_free(drm_edid);
 
        return ret;
 }

diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 2d1b19f..21f9212 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2036,22 +2036,23 @@ intel_sdvo_multifunc_encoder(struct intel_sdvo *intel_sdvo)
        return hweight16(intel_sdvo->caps.output_flags) > 1;
 }
 
-static struct edid *
+static const struct drm_edid *
 intel_sdvo_get_edid(struct drm_connector *connector)
 {
        struct intel_sdvo *sdvo = intel_attached_sdvo(to_intel_connector(connector));
-       return drm_get_edid(connector, &sdvo->ddc);
+       return drm_edid_read_ddc(connector, &sdvo->ddc);
 }
 
 /* Mac mini hack -- use the same DDC as the analog connector */
-static struct edid *
+static const struct drm_edid *
 intel_sdvo_get_analog_edid(struct drm_connector *connector)
 {
-       struct drm_i915_private *dev_priv = to_i915(connector->dev);
+       struct drm_i915_private *i915 = to_i915(connector->dev);
+       struct i2c_adapter *i2c;
 
-       return drm_get_edid(connector,
-                           intel_gmbus_get_adapter(dev_priv,
-                                                   dev_priv->display.vbt.crt_ddc_pin));
+       i2c = intel_gmbus_get_adapter(i915, i915->display.vbt.crt_ddc_pin);
+
+       return drm_edid_read_ddc(connector, i2c);
 }
 
 static enum drm_connector_status
@@ -2059,11 +2060,11 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector)
 {
        struct intel_sdvo *intel_sdvo = intel_attached_sdvo(to_intel_connector(connector));
        enum drm_connector_status status;
-       struct edid *edid;
+       const struct drm_edid *drm_edid;
 
-       edid = intel_sdvo_get_edid(connector);
+       drm_edid = intel_sdvo_get_edid(connector);
 
-       if (edid == NULL && intel_sdvo_multifunc_encoder(intel_sdvo)) {
+       if (!drm_edid && intel_sdvo_multifunc_encoder(intel_sdvo)) {
                u8 ddc, saved_ddc = intel_sdvo->ddc_bus;
 
                /*
@@ -2072,15 +2073,15 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector)
                 */
                for (ddc = intel_sdvo->ddc_bus >> 1; ddc > 1; ddc >>= 1) {
                        intel_sdvo->ddc_bus = ddc;
-                       edid = intel_sdvo_get_edid(connector);
-                       if (edid)
+                       drm_edid = intel_sdvo_get_edid(connector);
+                       if (drm_edid)
                                break;
                }
                /*
                 * If we found the EDID on the other bus,
                 * assume that is the correct DDC bus.
                 */
-               if (edid == NULL)
+               if (!drm_edid)
                        intel_sdvo->ddc_bus = saved_ddc;
        }
 
@@ -2088,17 +2089,19 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector)
         * When there is no edid and no monitor is connected with VGA
         * port, try to use the CRT ddc to read the EDID for DVI-connector.
         */
-       if (edid == NULL)
-               edid = intel_sdvo_get_analog_edid(connector);
+       if (!drm_edid)
+               drm_edid = intel_sdvo_get_analog_edid(connector);
 
        status = connector_status_unknown;
-       if (edid != NULL) {
+       if (drm_edid) {
+               const struct edid *edid = drm_edid_raw(drm_edid);
+
                /* DDC bus is shared, match EDID to connector type */
                if (edid->input & DRM_EDID_INPUT_DIGITAL)
                        status = connector_status_connected;
                else
                        status = connector_status_disconnected;
-               kfree(edid);
+               drm_edid_free(drm_edid);
        }
 
        return status;
@@ -2106,8 +2109,9 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector)
 
 static bool
 intel_sdvo_connector_matches_edid(struct intel_sdvo_connector *sdvo,
-                                 struct edid *edid)
+                                 const struct drm_edid *drm_edid)
 {
+       const struct edid *edid = drm_edid_raw(drm_edid);
        bool monitor_is_digital = !!(edid->input & DRM_EDID_INPUT_DIGITAL);
        bool connector_is_digital = !!IS_DIGITAL(sdvo);
 
@@ -2150,22 +2154,23 @@ intel_sdvo_detect(struct drm_connector *connector, bool force)
        else if (IS_TMDS(intel_sdvo_connector))
                ret = intel_sdvo_tmds_sink_detect(connector);
        else {
-               struct edid *edid;
+               const struct drm_edid *drm_edid;
 
                /* if we have an edid check it matches the connection */
-               edid = intel_sdvo_get_edid(connector);
-               if (edid == NULL)
-                       edid = intel_sdvo_get_analog_edid(connector);
-               if (edid != NULL) {
+               drm_edid = intel_sdvo_get_edid(connector);
+               if (!drm_edid)
+                       drm_edid = intel_sdvo_get_analog_edid(connector);
+               if (drm_edid) {
                        if (intel_sdvo_connector_matches_edid(intel_sdvo_connector,
-                                                             edid))
+                                                             drm_edid))
                                ret = connector_status_connected;
                        else
                                ret = connector_status_disconnected;
 
-                       kfree(edid);
-               } else
+                       drm_edid_free(drm_edid);
+               } else {
                        ret = connector_status_connected;
+               }
        }
 
        return ret;
@@ -2174,13 +2179,13 @@ intel_sdvo_detect(struct drm_connector *connector, bool force)
 static int intel_sdvo_get_ddc_modes(struct drm_connector *connector)
 {
        int num_modes = 0;
-       struct edid *edid;
+       const struct drm_edid *drm_edid;
 
        DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
                      connector->base.id, connector->name);
 
        /* set the bus switch and get the modes */
-       edid = intel_sdvo_get_edid(connector);
+       drm_edid = intel_sdvo_get_edid(connector);
 
        /*
         * Mac mini hack.  On this device, the DVI-I connector shares one DDC
@@ -2188,17 +2193,17 @@ static int intel_sdvo_get_ddc_modes(struct drm_connector *connector)
         * DDC fails, check to see if the analog output is disconnected, in
         * which case we'll look there for the digital DDC data.
         */
-       if (!edid)
-               edid = intel_sdvo_get_analog_edid(connector);
+       if (!drm_edid)
+               drm_edid = intel_sdvo_get_analog_edid(connector);
 
-       if (!edid)
+       if (!drm_edid)
                return 0;
 
        if (intel_sdvo_connector_matches_edid(to_intel_sdvo_connector(connector),
-                                             edid))
-               num_modes += intel_connector_update_modes(connector, edid);
+                                             drm_edid))
+               num_modes += intel_connector_update_modes(connector, drm_edid);
 
-       kfree(edid);
+       drm_edid_free(drm_edid);
 
        return num_modes;
 }