From nobody Tue Dec 2 00:05:25 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 F37853168EB for ; Wed, 26 Nov 2025 06:52:22 +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=1764139945; cv=none; b=cgM0Ss1Lvnk56PRfSsmAk39dVQL1PN2pkNvR8heRCQsjpiJpYXCXrA4qvcGHedBpliT/XuOdT+gktQoXQW6Tbsj2nFiJMMF1NQoutbi4qU92JHgv52ucmM6BHNx+ta3Sh1GjXDQkMDojnlVoBpMKVfhiKR1hqXr/elH5gmso5vo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764139945; c=relaxed/simple; bh=ZBQq7HcEdi40D+o58hd5pkIr7j4Is9Ke1LtnpWpj+HU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ev2dqNvEUQPCRRbKwbmmfA92LFlYhkzbd1UHQYDkzMC3RkhPs9fGCQsJ8yPEcRxqC96dtE+KT+7MUoWvjGhyfuzP0rtGAbrEbkhqo/+YfgTRPEHY+H/amLUEaNyN4L1PK3YvDVHniGAF83vpKqiTuU2mXMv0zp3rd5cjJpJUiss= 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=Z/tPye09; dkim=permerror (0-bit key) header.d=lach.pw header.i=@lach.pw header.b=TJOxnYEW; 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="Z/tPye09"; dkim=permerror (0-bit key) header.d=lach.pw header.i=@lach.pw header.b="TJOxnYEW" DKIM-Signature: v=1; a=rsa-sha256; s=202502r; d=lach.pw; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1764139913; bh=BssbELFqqiAfaHRY+tK0FRe AvQAlEWMvvRZcrNJOO/A=; b=Z/tPye09Uc9EH7Lib5u6kSEPCZpVILgwZbfqXjJFIHv3pDQhhn pY2gCHVDoNbYSYL0IKG8lD0xEzYeWymuZhOcDGfGTE5ExfPT835qodmLOboT8Vfats26vD+yoRn tgAwwTcHBSSwND9T3SYTfJTxJxNJT+r+UBiPTmamlRshw6Xrim7/mYCflHJa5+WJ+Qhatl20mjp Ep5Iv/QCdkU2EpPCATgBMyyDzC505olTbpsK50tIOAF7aUuMzhBQ/V/d9HRyPJIeekG/LnjLZDP R3TSFrT5EepiStoyw+gVfIIBO5lj/+1a/StTUAptGGJHyXJGxl9kKNx6Q4Y51MUa6Ww==; DKIM-Signature: v=1; a=ed25519-sha256; s=202502e; d=lach.pw; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1764139913; bh=BssbELFqqiAfaHRY+tK0FRe AvQAlEWMvvRZcrNJOO/A=; b=TJOxnYEWp93zdebRIUqEa9TnTyOEFQk6uaoVm2xA8yXzFwDmmE BF4/X5i3NbEh+BLhoEQCr+mjEEcQmPR8AdCg==; 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 5/7] drm/edid: for consistency, use mask everywhere for block rev parsing Date: Wed, 26 Nov 2025 07:51:24 +0100 Message-ID: <20251126065126.54016-6-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" Signed-off-by: Yaroslav Bolyukin --- drivers/gpu/drm/drm_displayid_internal.h | 1 + drivers/gpu/drm/drm_edid.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_displayid_internal.h b/drivers/gpu/drm/drm= _displayid_internal.h index 724174b429f2..55f972d32847 100644 --- a/drivers/gpu/drm/drm_displayid_internal.h +++ b/drivers/gpu/drm/drm_displayid_internal.h @@ -139,6 +139,7 @@ struct displayid_formula_timings_9 { u8 vrefresh; } __packed; =20 +#define DISPLAYID_BLOCK_DESCRIPTOR_PAYLOAD_BYTES GENMASK(6, 4) struct displayid_formula_timing_block { struct displayid_block base; struct displayid_formula_timings_9 timings[]; diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 72a94b1713e2..7bdc99d5084a 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -6906,7 +6906,8 @@ static int add_displayid_formula_modes(struct drm_con= nector *connector, struct drm_display_mode *newmode; int num_modes =3D 0; bool type_10 =3D block->tag =3D=3D DATA_BLOCK_2_TYPE_10_FORMULA_TIMING; - int timing_size =3D 6 + ((formula_block->base.rev & 0x70) >> 4); + int timing_size =3D 6 + + FIELD_GET(DISPLAYID_BLOCK_DESCRIPTOR_PAYLOAD_BYTES, formula_block->base.= rev); =20 /* extended blocks are not supported yet */ if (timing_size !=3D 6) --=20 2.51.2