From nobody Tue Dec 2 00:05:07 2025 Received: from mail.0la.ch (mail.0la.ch [78.47.82.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B9AE2F6593 for ; Wed, 26 Nov 2025 06:52:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=78.47.82.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764139932; cv=none; b=TNYB0QSKKrTL5vJW/UWgWhhW3ZMDMiCQRMeNXoewjoLfhigZhbYM1NVOMR7SXEJGmiLxwKleGvDAkVhC5xx+EcpyDJuVG/AvByqbvk1JA46k7I1MkMfErJ2WkTVYY7MLL1ySVdziA6cZIhyozkwKawJTiiRLcGLBIXENIi6s0ok= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764139932; c=relaxed/simple; bh=TEWFE/XggMM1N+N/MEbjHHwTMuM/7sh3TbPdPyHHRSc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FnJrUu0pMpyG/eG2iO/wMu5zg8COw9ilKQdPBvcJGjkuHCXzLghXAEZGVTvgaJFkZL+Wh07anEuKIYjB10vclLpfChbf94vbZEYQwGvfAFa4LkRsgopL0WzbdA/EdJJ40jMLFGnHAzsnLFC14CNY0YMPjRjaEbh2T/wIqtSYTdQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lach.pw; spf=pass smtp.mailfrom=lach.pw; dkim=pass (2048-bit key) header.d=lach.pw header.i=@lach.pw header.b=pPp79NPZ; dkim=permerror (0-bit key) header.d=lach.pw header.i=@lach.pw header.b=ar1sT3n4; arc=none smtp.client-ip=78.47.82.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lach.pw Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lach.pw Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lach.pw header.i=@lach.pw header.b="pPp79NPZ"; dkim=permerror (0-bit key) header.d=lach.pw header.i=@lach.pw header.b="ar1sT3n4" DKIM-Signature: v=1; a=rsa-sha256; s=202502r; d=lach.pw; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1764139911; bh=UZ017X1htm+rMcGR4tOux+d jQ8/TyvYII9ENisiXiXY=; b=pPp79NPZutNKi+mXSY1VCS6cgNJqElFjXge5eggSpNoOH8Gerr tgLSWeJotsdz5f60r+92oY3j5eK+08la0aGqb9PsYRFbFqxOlmNwmrfiabF0Keh+dpBqEr/UNER Rs9ucdzSDZ8LHt3Lthb31+3+LZbfTV49LB5IxUiqQVtBYIptIYm+cc/tdKKiFxk3gwqYLxeqiJo /YY00t3rUGaU+ZZBsikf3NTCHqegxQIaRWEpG72wtZdHfFh+RWghn1bUSQNpH+1zQlGBU8d6E9C 0qq+CIzio3cDFF5lpjJ7Eg0FQDWSLq7EDwG38RlBKALh3i5MKe6cH+FssCG8RnHmHxg==; DKIM-Signature: v=1; a=ed25519-sha256; s=202502e; d=lach.pw; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1764139911; bh=UZ017X1htm+rMcGR4tOux+d jQ8/TyvYII9ENisiXiXY=; b=ar1sT3n4NkP2FnsyFv8MAlOEozOTjnlEvlTAH2Ge0nwncAeHQ+ mRrlzQHU6nIoxee8/j5rdOdXqmSa//deudDw==; From: Yaroslav Bolyukin To: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Wayne Lin , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Yaroslav Bolyukin Subject: [PATCH v6 2/7] drm/edid: prepare for VESA vendor-specific data block extension Date: Wed, 26 Nov 2025 07:51:21 +0100 Message-ID: <20251126065126.54016-3-iam@lach.pw> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251126065126.54016-1-iam@lach.pw> References: <20251126065126.54016-1-iam@lach.pw> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Current VESA vendor-specific block parsing expects real block size to be the same as the defined struct size, use real offsets in conditionals instead to add struct fields in future commits. Signed-off-by: Yaroslav Bolyukin Reviewed-by: Jani Nikula --- drivers/gpu/drm/drm_edid.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 64f7a94dd9e4..a52fd6de9327 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -6544,7 +6544,7 @@ static void drm_parse_vesa_specific_block(struct drm_= connector *connector, if (oui(vesa->oui[0], vesa->oui[1], vesa->oui[2]) !=3D VESA_IEEE_OUI) return; =20 - if (sizeof(*vesa) !=3D sizeof(*block) + block->num_bytes) { + if (block->num_bytes < 5) { drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] Unexpected VESA vendor block size\n", connector->base.id, connector->name); @@ -6567,24 +6567,20 @@ static void drm_parse_vesa_specific_block(struct dr= m_connector *connector, break; } =20 - if (!info->mso_stream_count) { - info->mso_pixel_overlap =3D 0; - return; - } - - info->mso_pixel_overlap =3D FIELD_GET(DISPLAYID_VESA_MSO_OVERLAP, vesa->m= so); - if (info->mso_pixel_overlap > 8) { + if (info->mso_stream_count) { + info->mso_pixel_overlap =3D FIELD_GET(DISPLAYID_VESA_MSO_OVERLAP, vesa->= mso); + if (info->mso_pixel_overlap > 8) { + drm_dbg_kms(connector->dev, + "[CONNECTOR:%d:%s] Reserved MSO pixel overlap value %u\n", + connector->base.id, connector->name, + info->mso_pixel_overlap); + info->mso_pixel_overlap =3D 8; + } drm_dbg_kms(connector->dev, - "[CONNECTOR:%d:%s] Reserved MSO pixel overlap value %u\n", + "[CONNECTOR:%d:%s] MSO stream count %u, pixel overlap %u\n", connector->base.id, connector->name, - info->mso_pixel_overlap); - info->mso_pixel_overlap =3D 8; + info->mso_stream_count, info->mso_pixel_overlap); } - - drm_dbg_kms(connector->dev, - "[CONNECTOR:%d:%s] MSO stream count %u, pixel overlap %u\n", - connector->base.id, connector->name, - info->mso_stream_count, info->mso_pixel_overlap); } =20 static void drm_update_vesa_specific_block(struct drm_connector *connector, --=20 2.51.2