From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=198.175.65.11 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794826995; b=iMYhTgkrprb+06WmezJ6tEa/A62aldmP/9JiNxzFFqtkQQ080y+s+jICiBwBAjU20NUy f1SAwBVhOMnRkVEU9CjCvMJGThAkdmV2PIrFH2TttcpKSclfswamoWOgMa2fvhT7PLqnA higm3ghkJbo1SzV7FzWc+p21LiEdiNUG8n+JQQiykC8day7ZvX//qbZDr7g9N9MOjLA6U I4DEYan2N6pVUsPMdUTQXkNHgtiBAbTmJO/n8D5EjwJGIll5gcfPaQz5clAjV9U8zdeaE BHK/YpaSBGRRXVYj8YkfHdXnygov+wXJfOJKowXfPz1588wzYF7/Yfn9dsBxkaILkEQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794826995; h=DMARC-Filter:DKIM-Signature:X-CSE-ConnectionGUID:X-CSE-MsgGUID: X-IronPort-AV:X-IronPort-AV:Received:X-CSE-ConnectionGUID: X-CSE-MsgGUID:X-ExtLoop1:X-IronPort-AV:Received:From:To:Cc:Subject: In-Reply-To:Organization:References:Date:Message-ID:MIME-Version: Content-Type; bh=OCsSyweRCa3CY+ZerhTa9QAnm+4UX8plI54H4fs2FHU=; b=xNrfhuSawKLTqMfRUHVpe7EsIPyEExh7yT+27ZW75ilS+iMJvhXXt5ORwjdVX0Y0dWgX le+UeDJXhyvrQhp34Ibqpz227/DofNyB2aVV/dcfSUJePcLksAQkFaow8NDdqJu8D281c TwB/7TcVwhIIFNZZ0VTjB33HxLmvLwjYVF/Dl9jJ6coTCHsa2Gvv3hPO+fZGrhnscwrao 2LxeTlOC8id1av+MvZeRSa00xu57NFHV0gj5Cl9abXKLZ4pRANlcVt79Woq+0/TGxNRLy uQcE39kBq99Ina1R4Z8kp2F8jddkFUWQB18AB+Fz8oIej58ZRhayumHiN0ngEE8M9/w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=D9slPciu; arc=none smtp.remote-ip=198.175.65.11 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 503D7606A323 for ; Mon, 16 Nov 2026 11:03:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 503D7606A323 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=D9slPciu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1794826996; x=1826362996; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=Ic6j+iLLJHWTLcxQJh6egA6Z2981WwOmhes2lvK7oj0=; b=D9slPciuFicVdn36XHB6HL7UdcG0CQus3cAnCFzY5M9SLmNWmrru0fQt 9xV4cTk6R4N6nNmNLayj7zJbmVXPdeWYB3Q3uEbevV/6KnKKFYTSMb5f5 LicGSPaGXFwpcns4jMqmmCrx/2CmVXCaCoEoQWg3w+6U4b7F7cghKn+Qi uVXMtvsXyrI2X80gHO9K8WW9wzk8TYMlSIH7myPBlNWrRerfSAcK7v5Di sl7NbrZBV57WgpoFj7S6Fj6xgicId9lyzrwDBmRut6BwuBUSkjkBvmLeN 0FAo+NuX+0h3pJ7uk19lXzxrMu3QT3oN+cDS+ZZtnjenAFcGfQgYwxqej A==; X-CSE-ConnectionGUID: 1zsYRYi/SBylra8dyS1eYQ== X-CSE-MsgGUID: A8hd/E4dQ0SEFaej0DmePQ== X-IronPort-AV: E=McAfee;i="6800,10657,11967"; a="3453767" X-IronPort-AV: E=Sophos;i="6.27,216,1787036400"; d="scan'208";a="3453767" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2026 03:03:15 -0800 X-CSE-ConnectionGUID: Bcm91qDkRgG8yxshQVOoRg== X-CSE-MsgGUID: Kcmi/Uz2TpiDOhUS1MIq/A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,216,1787036400"; d="scan'208";a="9929761" Received: from slindbla-desk.ger.corp.intel.com (HELO localhost) ([10.245.245.117]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2026 03:03:10 -0800 From: Jani Nikula To: Xin Ji , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: bliang@analogixsemi.com, qwen@analogixsemi.com, fshao@chromium.org, Xin Ji , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/bridge: anx7625: switch to drm_edid_read_custom() In-Reply-To: <20261116023740.2257699-1-anx-upstream@analogixsemi.com.cn> Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland References: <20261116023740.2257699-1-anx-upstream@analogixsemi.com.cn> Date: Mon, 16 Nov 2026 13:03:07 +0200 Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain On Mon, 16 Nov 2026, Xin Ji wrote: > From: Xin Ji > > 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 > --- > 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