Commit 1d83b43e authored by Jani Nikula's avatar Jani Nikula

drm: bridge: it66121: 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/b7b0d7957b75297a4768e9df61f21e21170b2bf2.1706038510.git.jani.nikula@intel.com
parent 9ed8ba5a
...@@ -874,33 +874,33 @@ static void it66121_bridge_hpd_disable(struct drm_bridge *bridge) ...@@ -874,33 +874,33 @@ static void it66121_bridge_hpd_disable(struct drm_bridge *bridge)
dev_err(ctx->dev, "failed to disable HPD IRQ\n"); dev_err(ctx->dev, "failed to disable HPD IRQ\n");
} }
static struct edid *it66121_bridge_get_edid(struct drm_bridge *bridge, static const struct drm_edid *it66121_bridge_edid_read(struct drm_bridge *bridge,
struct drm_connector *connector) struct drm_connector *connector)
{ {
struct it66121_ctx *ctx = container_of(bridge, struct it66121_ctx, bridge); struct it66121_ctx *ctx = container_of(bridge, struct it66121_ctx, bridge);
struct edid *edid; const struct drm_edid *drm_edid;
int ret; int ret;
mutex_lock(&ctx->lock); mutex_lock(&ctx->lock);
ret = it66121_preamble_ddc(ctx); ret = it66121_preamble_ddc(ctx);
if (ret) { if (ret) {
edid = NULL; drm_edid = NULL;
goto out_unlock; goto out_unlock;
} }
ret = regmap_write(ctx->regmap, IT66121_DDC_HEADER_REG, ret = regmap_write(ctx->regmap, IT66121_DDC_HEADER_REG,
IT66121_DDC_HEADER_EDID); IT66121_DDC_HEADER_EDID);
if (ret) { if (ret) {
edid = NULL; drm_edid = NULL;
goto out_unlock; goto out_unlock;
} }
edid = drm_do_get_edid(connector, it66121_get_edid_block, ctx); drm_edid = drm_edid_read_custom(connector, it66121_get_edid_block, ctx);
out_unlock: out_unlock:
mutex_unlock(&ctx->lock); mutex_unlock(&ctx->lock);
return edid; return drm_edid;
} }
static const struct drm_bridge_funcs it66121_bridge_funcs = { static const struct drm_bridge_funcs it66121_bridge_funcs = {
...@@ -916,7 +916,7 @@ static const struct drm_bridge_funcs it66121_bridge_funcs = { ...@@ -916,7 +916,7 @@ static const struct drm_bridge_funcs it66121_bridge_funcs = {
.mode_set = it66121_bridge_mode_set, .mode_set = it66121_bridge_mode_set,
.mode_valid = it66121_bridge_mode_valid, .mode_valid = it66121_bridge_mode_valid,
.detect = it66121_bridge_detect, .detect = it66121_bridge_detect,
.get_edid = it66121_bridge_get_edid, .edid_read = it66121_bridge_edid_read,
.hpd_enable = it66121_bridge_hpd_enable, .hpd_enable = it66121_bridge_hpd_enable,
.hpd_disable = it66121_bridge_hpd_disable, .hpd_disable = it66121_bridge_hpd_disable,
}; };
......
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