From: Jani Nikula <jani.nikula@linux.intel.com>
To: Xin Ji <anx-upstream@analogixsemi.com.cn>,
Andrzej Hajda <andrzej.hajda@intel.com>,
Neil Armstrong <neil.armstrong@linaro.org>,
Robert Foss <rfoss@kernel.org>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Jonas Karlman <jonas@kwiboo.se>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Luca Ceresoli <luca.ceresoli@bootlin.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>
Cc: bliang@analogixsemi.com, qwen@analogixsemi.com,
fshao@chromium.org, Xin Ji <xji@analogixsemi.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drm/bridge: anx7625: switch to drm_edid_read_custom()
Date: Mon, 16 Nov 2026 13:03:07 +0200 [thread overview]
Message-ID: <d1553faf45c5651feefd667a3decb454fc596415@intel.com> (raw)
In-Reply-To: <20261116023740.2257699-1-anx-upstream@analogixsemi.com.cn>
On Mon, 16 Nov 2026, Xin Ji <anx-upstream@analogixsemi.com.cn> wrote:
> From: Xin Ji <xji@analogixsemi.com>
>
> Currently, sp_tx_get_edid_block() only reads the base block extension
> count at 0x7e and ignores CTA-861 HF-EEODB overrides in block 1. On
> displays using HF-EEODB, the driver only reads 2 blocks, which
> drm_edid_valid() then rejects due to the size mismatch.
> Switch to drm_edid_read_custom() with a per-block read callback so DRM
> core handles block count discovery (including HF-EEODB and >4 blocks)
> and validation automatically.
Yay!
It warms my heart that the work I put in drm_edid.c to handle HF-EEODB
still keeps paying off, and people can enable the complexity of it by
*simplifying* the driver code. :)
> Signed-off-by: Xin Ji <xji@analogixsemi.com>
> ---
> drivers/gpu/drm/bridge/analogix/anx7625.c | 172 +++++-----------------
> drivers/gpu/drm/bridge/analogix/anx7625.h | 4 -
> 2 files changed, 33 insertions(+), 143 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
> index c3af88e14f8b..eb503be005e0 100644
> --- a/drivers/gpu/drm/bridge/analogix/anx7625.c
> +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
> @@ -1022,27 +1022,6 @@ static int sp_tx_aux_rd(struct anx7625_data *ctx, u8 len_cmd)
> return (ret | wait_aux_op_finish(ctx));
> }
>
> -static int sp_tx_get_edid_block(struct anx7625_data *ctx)
> -{
> - int c = 0;
> - struct device *dev = ctx->dev;
> -
> - sp_tx_aux_wr(ctx, 0x7e);
> - sp_tx_aux_rd(ctx, 0x01);
> - c = anx7625_reg_read(ctx, ctx->i2c.rx_p0_client, AP_AUX_BUFF_START);
> - if (c < 0) {
> - DRM_DEV_ERROR(dev, "IO error : access AUX BUFF.\n");
> - return -EIO;
> - }
> -
> - DRM_DEV_DEBUG_DRIVER(dev, " EDID Block = %d\n", c + 1);
> -
> - if (c > MAX_EDID_BLOCK)
> - c = 1;
> -
> - return c;
> -}
> -
> static int edid_read(struct anx7625_data *ctx,
> u8 offset, u8 *pblock_buf)
> {
> @@ -1123,18 +1102,16 @@ static int segments_edid_read(struct anx7625_data *ctx,
> return ret;
> }
>
> -static int sp_tx_edid_read(struct anx7625_data *ctx,
> - u8 *pedid_blocks_buf)
> +static int anx7625_get_edid_block(void *data, u8 *buf, unsigned int block, size_t len)
> {
> + struct anx7625_data *ctx = data;
> u8 offset;
> - int edid_pos;
> - int count, blocks_num;
> - u8 pblock_buf[MAX_DPCD_BUFFER_SIZE];
> - u8 i, j;
> - int g_edid_break = 0;
> - int ret;
> + int ret, i;
> struct device *dev = ctx->dev;
>
> + if (len != EDID_LENGTH || block > 255)
> + return -EINVAL;
> +
> /* Address initial */
> ret = anx7625_reg_write(ctx, ctx->i2c.rx_p0_client,
> AP_AUX_ADDR_7_0, 0x50);
> @@ -1147,85 +1124,18 @@ static int sp_tx_edid_read(struct anx7625_data *ctx,
> return -EIO;
> }
>
> - blocks_num = sp_tx_get_edid_block(ctx);
> - if (blocks_num < 0)
> - return blocks_num;
> -
> - count = 0;
> -
> - do {
> - switch (count) {
> - case 0:
> - case 1:
> - for (i = 0; i < 8; i++) {
> - offset = (i + count * 8) * MAX_DPCD_BUFFER_SIZE;
> - g_edid_break = edid_read(ctx, offset,
> - pblock_buf);
> -
> - if (g_edid_break < 0)
> - break;
> -
> - memcpy(&pedid_blocks_buf[offset],
> - pblock_buf,
> - MAX_DPCD_BUFFER_SIZE);
> - }
> -
> - break;
> - case 2:
> - offset = 0x00;
> -
> - for (j = 0; j < 8; j++) {
> - edid_pos = (j + count * 8) *
> - MAX_DPCD_BUFFER_SIZE;
> -
> - if (g_edid_break == 1)
> - break;
> -
> - ret = segments_edid_read(ctx, count / 2,
> - pblock_buf, offset);
> - if (ret < 0)
> - return ret;
> -
> - memcpy(&pedid_blocks_buf[edid_pos],
> - pblock_buf,
> - MAX_DPCD_BUFFER_SIZE);
> - offset = offset + 0x10;
> - }
> -
> - break;
> - case 3:
> - offset = 0x80;
> -
> - for (j = 0; j < 8; j++) {
> - edid_pos = (j + count * 8) *
> - MAX_DPCD_BUFFER_SIZE;
> - if (g_edid_break == 1)
> - break;
> -
> - ret = segments_edid_read(ctx, count / 2,
> - pblock_buf, offset);
> - if (ret < 0)
> - return ret;
> -
> - memcpy(&pedid_blocks_buf[edid_pos],
> - pblock_buf,
> - MAX_DPCD_BUFFER_SIZE);
> - offset = offset + 0x10;
> - }
> -
> - break;
> - default:
> - break;
> - }
> -
> - count++;
> + DRM_DEV_DEBUG_DRIVER(dev, "Read EDID block %u, len %zu\n", block, len);
>
> - } while (blocks_num >= count);
> + for (i = 0; i < len; i += MAX_DPCD_BUFFER_SIZE) {
> + offset = (block & 1) * EDID_LENGTH + i;
> + if (block < 2)
> + ret = edid_read(ctx, offset, &buf[i]);
> + else
> + ret = segments_edid_read(ctx, block / 2, &buf[i],
> + offset);
>
> - /* Check edid data */
> - if (!drm_edid_is_valid((struct edid *)pedid_blocks_buf)) {
> - DRM_DEV_ERROR(dev, "WARNING! edid check fail!\n");
> - return -EINVAL;
> + if (ret < 0)
> + return -EIO;
> }
>
> /* Reset aux channel */
> @@ -1235,7 +1145,7 @@ static int sp_tx_edid_read(struct anx7625_data *ctx,
> return ret;
> }
>
> - return (blocks_num + 1);
> + return 0;
> }
>
> static void anx7625_power_on(struct anx7625_data *ctx)
> @@ -1958,37 +1868,6 @@ static ssize_t anx7625_aux_transfer(struct drm_dp_aux *aux,
> return ret;
> }
>
> -static const struct drm_edid *anx7625_edid_read(struct anx7625_data *ctx)
> -{
> - struct device *dev = ctx->dev;
> - u8 *edid_buf;
> - int edid_num;
> -
> - if (ctx->cached_drm_edid)
> - goto out;
> -
> - edid_buf = kmalloc(FOUR_BLOCK_SIZE, GFP_KERNEL);
> - if (!edid_buf)
> - return NULL;
> -
> - pm_runtime_get_sync(dev);
> - _anx7625_hpd_polling(ctx, 5000 * 100);
> - edid_num = sp_tx_edid_read(ctx, edid_buf);
> - pm_runtime_put_sync(dev);
> -
> - if (edid_num < 1) {
> - DRM_DEV_ERROR(dev, "Fail to read EDID: %d\n", edid_num);
> - kfree(edid_buf);
> - return NULL;
> - }
> -
> - ctx->cached_drm_edid = drm_edid_alloc(edid_buf, edid_num * ONE_BLOCK_SIZE);
> - kfree(edid_buf);
> -
> -out:
> - return drm_edid_dup(ctx->cached_drm_edid);
> -}
> -
> static enum drm_connector_status anx7625_sink_detect(struct anx7625_data *ctx)
> {
> struct device *dev = ctx->dev;
> @@ -2647,10 +2526,25 @@ static const struct drm_edid *anx7625_bridge_edid_read(struct drm_bridge *bridge
> {
> struct anx7625_data *ctx = bridge_to_anx7625(bridge);
> struct device *dev = ctx->dev;
> + const struct drm_edid *drm_edid;
>
> DRM_DEV_DEBUG_DRIVER(dev, "drm bridge get edid\n");
>
> - return anx7625_edid_read(ctx);
> + if (ctx->cached_drm_edid)
> + return drm_edid_dup(ctx->cached_drm_edid);
> +
> + pm_runtime_get_sync(dev);
> + _anx7625_hpd_polling(ctx, 5000 * 100);
> + ctx->cached_drm_edid = drm_edid_read_custom(connector,
> + anx7625_get_edid_block,
> + ctx);
> + drm_edid = drm_edid_dup(ctx->cached_drm_edid);
Consider deduplicating?
if (!ctx->cached_drm_edid) {
// ...
ctx->cached_drm_edid = drm_edid_read_custom();
// ...
}
drm_edid = drm_edid_dup(ctx->cached_drm_edid);
BR,
Jani.
> + pm_runtime_put_sync(dev);
> +
> + if (!drm_edid)
> + DRM_DEV_ERROR(dev, "Fail to read EDID\n");
> +
> + return drm_edid;
> }
>
> static void anx7625_bridge_hpd_enable(struct drm_bridge *bridge)
> diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.h b/drivers/gpu/drm/bridge/analogix/anx7625.h
> index 957d234ec07c..55615ad274f2 100644
> --- a/drivers/gpu/drm/bridge/analogix/anx7625.h
> +++ b/drivers/gpu/drm/bridge/analogix/anx7625.h
> @@ -424,10 +424,6 @@ enum audio_wd_len {
>
> #define MAX_DPCD_BUFFER_SIZE 16
>
> -#define ONE_BLOCK_SIZE 128
> -#define FOUR_BLOCK_SIZE (128 * 4)
> -
> -#define MAX_EDID_BLOCK 3
> #define EDID_TRY_CNT 3
> #define SUPPORT_PIXEL_CLOCK 300000
--
Jani Nikula, Intel
next prev parent reply other threads:[~2026-11-16 11:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 2:37 Xin Ji
2026-11-16 11:03 ` Jani Nikula [this message]
2026-11-16 11:38 ` Xin Ji
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d1553faf45c5651feefd667a3decb454fc596415@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=airlied@gmail.com \
--cc=andrzej.hajda@intel.com \
--cc=anx-upstream@analogixsemi.com.cn \
--cc=bliang@analogixsemi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=fshao@chromium.org \
--cc=jernej.skrabec@gmail.com \
--cc=jonas@kwiboo.se \
--cc=linux-kernel@vger.kernel.org \
--cc=luca.ceresoli@bootlin.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=qwen@analogixsemi.com \
--cc=rfoss@kernel.org \
--cc=simona@ffwll.ch \
--cc=tzimmermann@suse.de \
--cc=xji@analogixsemi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®