Skip to content

Commit 0d966d5

Browse files
committed
drm: bridge: simple-bridge: 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/ae1fd3d94829e3e5c197ca58eb18108cb004cf0b.1706038510.git.jani.nikula@intel.com
1 parent 392b6e9 commit 0d966d5

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/gpu/drm/bridge/simple-bridge.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ drm_connector_to_simple_bridge(struct drm_connector *connector)
5151
static int simple_bridge_get_modes(struct drm_connector *connector)
5252
{
5353
struct simple_bridge *sbridge = drm_connector_to_simple_bridge(connector);
54-
struct edid *edid;
54+
const struct drm_edid *drm_edid;
5555
int ret;
5656

5757
if (sbridge->next_bridge->ops & DRM_BRIDGE_OP_EDID) {
58-
edid = drm_bridge_get_edid(sbridge->next_bridge, connector);
59-
if (!edid)
58+
drm_edid = drm_bridge_edid_read(sbridge->next_bridge, connector);
59+
if (!drm_edid)
6060
DRM_INFO("EDID read failed. Fallback to standard modes\n");
6161
} else {
62-
edid = NULL;
62+
drm_edid = NULL;
6363
}
6464

65-
if (!edid) {
65+
if (!drm_edid) {
6666
/*
6767
* In case we cannot retrieve the EDIDs (missing or broken DDC
6868
* bus from the next bridge), fallback on the XGA standards and
@@ -73,9 +73,9 @@ static int simple_bridge_get_modes(struct drm_connector *connector)
7373
return ret;
7474
}
7575

76-
drm_connector_update_edid_property(connector, edid);
77-
ret = drm_add_edid_modes(connector, edid);
78-
kfree(edid);
76+
drm_edid_connector_update(connector, drm_edid);
77+
ret = drm_edid_connector_add_modes(connector);
78+
drm_edid_free(drm_edid);
7979

8080
return ret;
8181
}

0 commit comments

Comments
 (0)