From nobody Mon Feb 9 21:19:52 2026 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 3F23C310774 for ; Tue, 2 Dec 2025 11:03:14 +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=1764673397; cv=none; b=BVUke8yAkj4KU4rhtKmG9Y7VIXY8USZ81uUYRCNeRYrmxgAnqKzF9mtQhWmS0rD8atJ9aEGDj1Z72VQF3ZZvZCXFqO2dy4tGRd20gQNd5zANzcXAdD6xSnT1XKjctU7EvpGJV2ry7cDDphcKC+QzQaSk1H1IEMFqHfwnyniI3jU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764673397; c=relaxed/simple; bh=v3U5twJ0npy8wDsGOoP4lABACuVPfKBEuyASwK3lyG8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=syjWqilRVHycrUUcBT/reeiz0+EO9dyDDZ+0trKk/kGp8cP4pqQbXJ//Gd4hs+djmcat4h4KbFL07DIAOoUUbXszQyQcMCt0xYsnxPg15vDeDaBmUk1+mSe1XR1/YFGomXYimD3tbXeI07Dw8X7nlsp52acqthkXtSOPLTwmdPg= 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=qCJd8ACe; dkim=permerror (0-bit key) header.d=lach.pw header.i=@lach.pw header.b=qNTPJahk; 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="qCJd8ACe"; dkim=permerror (0-bit key) header.d=lach.pw header.i=@lach.pw header.b="qNTPJahk" DKIM-Signature: v=1; a=rsa-sha256; s=202502r; d=lach.pw; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1764673364; bh=mMVF9F5ivLgdaRrSFpWUdY9 2OM3S8hL4DQz5bXExt80=; b=qCJd8ACevc7Gpr/dY31UJV808Zff2NQSihFOEeYu9TppEKzdNA F+VGm+XDbd4h4KeMsNyES8YzUgAEc2iZ8AwAZaybx8PLBmdVUjop6Jf8l56x/nBtvSCmjw2L2tf Tf69+LTGNjgeJczf49WMkEoWxQcBTbj+j9ZMuKx71FmpSV3HdGtY5fWhJnAFOZeLX6kdtfnrbXv bPcKdOHupZRgFHyiFevXmdZb0sbWfRi3XVDEaWMEL180EATAsTDn3Mzd2r9aVJbK8gZwMlbZuEV KWe0KABqLEX77Lpam0CO6JJFXttl4zkPH9elUO7Iz4giaLgoi5ggJ1dqDcbbyT1CdFg==; DKIM-Signature: v=1; a=ed25519-sha256; s=202502e; d=lach.pw; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1764673364; bh=mMVF9F5ivLgdaRrSFpWUdY9 2OM3S8hL4DQz5bXExt80=; b=qNTPJahkG/kpDC04ShWjiGkvuTdzlF7b24xsIwyOY5XTKXweDm Gm32lIQ2loSx3nneb1ZYNnEstpkM4CRMjtBw==; From: Yaroslav Bolyukin To: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jani Nikula 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 , Jani Nikula Subject: [PATCH v7 2/7] drm/edid: prepare for VESA vendor-specific data block extension Date: Tue, 2 Dec 2025 12:02:13 +0100 Message-ID: <20251202110218.9212-3-iam@lach.pw> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251202110218.9212-1-iam@lach.pw> References: <20251202110218.9212-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 | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 64f7a94dd9e4..a0a6ccf12475 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,22 @@ 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); + } else { + info->mso_pixel_overlap =3D 0; } - - 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