Commit d1a5af98 authored by Jani Nikula's avatar Jani Nikula

drm/bridge: tc358767: switch to ->edid_read callback

Prefer using the struct drm_edid based callback and 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/978100cf8915b580ce66d34d27ed48858d9c161a.1706038510.git.jani.nikula@intel.com
parent 867a3ad8
...@@ -1651,19 +1651,19 @@ static void tc_bridge_mode_set(struct drm_bridge *bridge, ...@@ -1651,19 +1651,19 @@ static void tc_bridge_mode_set(struct drm_bridge *bridge,
drm_mode_copy(&tc->mode, mode); drm_mode_copy(&tc->mode, mode);
} }
static struct edid *tc_get_edid(struct drm_bridge *bridge, static const struct drm_edid *tc_edid_read(struct drm_bridge *bridge,
struct drm_connector *connector) struct drm_connector *connector)
{ {
struct tc_data *tc = bridge_to_tc(bridge); struct tc_data *tc = bridge_to_tc(bridge);
return drm_get_edid(connector, &tc->aux.ddc); return drm_edid_read_ddc(connector, &tc->aux.ddc);
} }
static int tc_connector_get_modes(struct drm_connector *connector) static int tc_connector_get_modes(struct drm_connector *connector)
{ {
struct tc_data *tc = connector_to_tc(connector); struct tc_data *tc = connector_to_tc(connector);
int num_modes; int num_modes;
struct edid *edid; const struct drm_edid *drm_edid;
int ret; int ret;
ret = tc_get_display_props(tc); ret = tc_get_display_props(tc);
...@@ -1678,10 +1678,10 @@ static int tc_connector_get_modes(struct drm_connector *connector) ...@@ -1678,10 +1678,10 @@ static int tc_connector_get_modes(struct drm_connector *connector)
return num_modes; return num_modes;
} }
edid = tc_get_edid(&tc->bridge, connector); drm_edid = tc_edid_read(&tc->bridge, connector);
drm_connector_update_edid_property(connector, edid); drm_edid_connector_update(connector, drm_edid);
num_modes = drm_add_edid_modes(connector, edid); num_modes = drm_edid_connector_add_modes(connector);
kfree(edid); drm_edid_free(drm_edid);
return num_modes; return num_modes;
} }
...@@ -1850,7 +1850,7 @@ static const struct drm_bridge_funcs tc_edp_bridge_funcs = { ...@@ -1850,7 +1850,7 @@ static const struct drm_bridge_funcs tc_edp_bridge_funcs = {
.atomic_enable = tc_edp_bridge_atomic_enable, .atomic_enable = tc_edp_bridge_atomic_enable,
.atomic_disable = tc_edp_bridge_atomic_disable, .atomic_disable = tc_edp_bridge_atomic_disable,
.detect = tc_bridge_detect, .detect = tc_bridge_detect,
.get_edid = tc_get_edid, .edid_read = tc_edid_read,
.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
.atomic_reset = drm_atomic_helper_bridge_reset, .atomic_reset = drm_atomic_helper_bridge_reset,
......
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