Skip to content

Commit 7b90330

Browse files
committed
drm/bridge: tfp410: use drm_bridge_edid_read()
Prefer using the struct drm_edid based functions. Cc: Andrzej Hajda <andrzej.hajda@intel.com> Cc: Neil Armstrong <neil.armstrong@linaro.org> Cc: Robert Foss <rfoss@kernel.org> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> Cc: Jonas Karlman <jonas@kwiboo.se> Cc: Jernej Skrabec <jernej.skrabec@gmail.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/f857bb36a78c57dc6a07b7b6cc90312fc3139ca8.1706038510.git.jani.nikula@intel.com
1 parent 400bb4e commit 7b90330

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/gpu/drm/bridge/ti-tfp410.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,18 @@ drm_connector_to_tfp410(struct drm_connector *connector)
5050
static int tfp410_get_modes(struct drm_connector *connector)
5151
{
5252
struct tfp410 *dvi = drm_connector_to_tfp410(connector);
53-
struct edid *edid;
53+
const struct drm_edid *drm_edid;
5454
int ret;
5555

5656
if (dvi->next_bridge->ops & DRM_BRIDGE_OP_EDID) {
57-
edid = drm_bridge_get_edid(dvi->next_bridge, connector);
58-
if (!edid)
57+
drm_edid = drm_bridge_edid_read(dvi->next_bridge, connector);
58+
if (!drm_edid)
5959
DRM_INFO("EDID read failed. Fallback to standard modes\n");
6060
} else {
61-
edid = NULL;
61+
drm_edid = NULL;
6262
}
6363

64-
if (!edid) {
64+
if (!drm_edid) {
6565
/*
6666
* No EDID, fallback on the XGA standard modes and prefer a mode
6767
* pretty much anything can handle.
@@ -71,11 +71,11 @@ static int tfp410_get_modes(struct drm_connector *connector)
7171
return ret;
7272
}
7373

74-
drm_connector_update_edid_property(connector, edid);
74+
drm_edid_connector_update(connector, drm_edid);
7575

76-
ret = drm_add_edid_modes(connector, edid);
76+
ret = drm_edid_connector_add_modes(connector);
7777

78-
kfree(edid);
78+
drm_edid_free(drm_edid);
7979

8080
return ret;
8181
}

0 commit comments

Comments
 (0)