Commit f7930e64 authored by Jani Nikula's avatar Jani Nikula

drm/bridge: switch to drm_bridge_edid_read()

Prefer using the struct drm_edid based functions.
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/704941568475e6e0e40d99a595a67e887949a30f.1706038510.git.jani.nikula@intel.com
parent d807ad80
...@@ -239,27 +239,27 @@ static int drm_bridge_connector_get_modes_edid(struct drm_connector *connector, ...@@ -239,27 +239,27 @@ static int drm_bridge_connector_get_modes_edid(struct drm_connector *connector,
struct drm_bridge *bridge) struct drm_bridge *bridge)
{ {
enum drm_connector_status status; enum drm_connector_status status;
struct edid *edid; const struct drm_edid *drm_edid;
int n; int n;
status = drm_bridge_connector_detect(connector, false); status = drm_bridge_connector_detect(connector, false);
if (status != connector_status_connected) if (status != connector_status_connected)
goto no_edid; goto no_edid;
edid = drm_bridge_get_edid(bridge, connector); drm_edid = drm_bridge_edid_read(bridge, connector);
if (!drm_edid_is_valid(edid)) { if (!drm_edid_valid(drm_edid)) {
kfree(edid); drm_edid_free(drm_edid);
goto no_edid; goto no_edid;
} }
drm_connector_update_edid_property(connector, edid); drm_edid_connector_update(connector, drm_edid);
n = drm_add_edid_modes(connector, edid); n = drm_edid_connector_add_modes(connector);
kfree(edid); drm_edid_free(drm_edid);
return n; return n;
no_edid: no_edid:
drm_connector_update_edid_property(connector, NULL); drm_edid_connector_update(connector, NULL);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment