From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50F1E224F3 for ; Mon, 13 Jul 2026 18:39:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783967945; cv=none; b=LaMrq3F1rZyI6ou3im5sV4mFbu49Tik9hO3pmVcOCm04CMKdgWVdOP8OMHVMjXNhHyyNn1Q8qarT8+CtJErJq8MrrIKOpjAMq9qVzxMjdpZr3qBsS/MJCYsiDUU+ZGScU10zJ3LJy6+84CYVSSac/0ltSoL82D2LMNP84QesStc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783967945; c=relaxed/simple; bh=Sy9dX+35xnu54P8NBjX+w83Bxjl9f8tq4qSPbrVH+EY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EMnT50Xcktw0mx0RACzDimRgBIzLlhk/s1bnDHDXRvxW4Xb4yFoIwMuaoQSfnbYX3/wQqeB5PF9J2qYwL6rxnfLB2abntXYWAsJpUou9F2aaIWoG7kLMeZWA9OQmUtE7elw8ufw7EwXaxc0/T1j6PiEgxOz/HepLFZmvdxTHjsk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=D35wuA+b; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="D35wuA+b" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-493c733f15aso32688215e9.0 for ; Mon, 13 Jul 2026 11:39:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783967942; x=1784572742; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=zd5o6Ej/s5YZL/Mnfze+Lcvp2kVDTJWSbodyoJwd+Bc=; b=D35wuA+b8pZdzXI98E8jid8jy975uf2TMAMZyC70C1M2MJKqrGaGRVZOyysXkPA13N v/iHKqe2YNLZAVf/IQTnI7uPLWpuyzik3Y7Qb1LSpW1ZXZtKNvMjOoh0CijOEmGHIH/V P7w/h4XCzk5MrkxjpZx7PpAKJ+u9uelmpJk1SnCK4HUgUAMC+blmfqD1uZ+m6ND4Jnnc 5UWLf38l1vMhZOmlZlYYkPHO6eM7IlvQ1j8ay4AZTO8i+N+u7RfENcyu1fUSeDeClNlQ Lv9XYjRxejLdU1V421pieZI+gix9v3AA0lTPneDipLqZnOwv1kbpZSfvPCflYHDcDHli 781A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783967942; x=1784572742; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=zd5o6Ej/s5YZL/Mnfze+Lcvp2kVDTJWSbodyoJwd+Bc=; b=DTRMHniT1vmFSnXaSF2yTsxPC3L6gzNcO0IcY1CUrtS5Ja0qVmKz0bp/IShEHH56y4 0Rsk0Cwhc7B6UzQjuv1DZz4Q2WnEfGqtfD38QI7uuRwG8xVoHqdGhW29pJtQa9Yr3aCh nXRt59XjNfCoTCqq/PrKbgE8Bg+JdXqJYqPgggevpv2tf9iZ58xUw12y9VSVNFEkicU5 X93eK5NBQDQFrEkJRXJ+C/byLzE/saxUie+frcJCqndHXdTtaN1O5HiVdkDzcnf8kGut 4dq5BqAOCdioh1hORQBPBUoSwn69vyqm7aNGkCaP3cZcucX/5GTI4PaA+gHV1F1y2O+i 8k2g== X-Forwarded-Encrypted: i=1; AHgh+Rr9IlVElJbwfuMTKQqfJLrLnWM23HUjD3A/d7PAq+zD1fNiH/GxG6awEN8BD1ZSmNIPGsP88ueaeBOvYV0=@vger.kernel.org X-Gm-Message-State: AOJu0YxZYc1J/C2Q478JOjbgEGbJHcQ8AYUSMW8lmXLlWzXmFwuNuc4K +z7xkpFxkwkidIepIF3C9qujfboARRbWNpnoPnc51n/OSwRXkSBKExiB X-Gm-Gg: AfdE7cmI7rxAicJ6jWFCXcudWFQmtgHeAytCXq1qj5iXqPllUzRCyv5vK9rvn9cxbu0 sfbgmKfemJREqntL58tA2guIa7ZdlCL0LJgaZAXG3eDJJZTdUQJFxgUmE5KyWjJnxrJCi3gQ6st dWrDe4n1ytXwia3PPpwSQqeS7oZSD+XHzZBaR7NIBMc5s/s1cY9eqE+IxNRJEdEyBbtpQu2wTgZ eTVuzAoDmDvXvvfELA8b4UIo11Rw+kfJ8WAYbrqtG7RBNemnYxWrdu80x9SpgB9LRRvXAct9L91 fXeVr7RPQoS3dFLbYGlrnzUWtjGXluQ0Vfdx9unUJ44MB66S/vXJN0+AQX+8zBf2raz/v89vGo2 ldT/lznhMFBMgzwGtPUIFI06yH9cLym/NpTyH0b26KuXud/ARzJ3kwPNl0gtnpbFBpK6q8cN5SM 0WZ6xxTACeERFQ3fEOFOoZCfVasWIu X-Received: by 2002:a05:600d:109:b0:493:e8bc:a75b with SMTP id 5b1f17b1804b1-493f882b13cmr69903995e9.30.1783967942492; Mon, 13 Jul 2026 11:39:02 -0700 (PDT) Received: from timo-z13.fritz.box ([193.30.163.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49508727f7dsm14702455e9.4.2026.07.13.11.39.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2026 11:39:02 -0700 (PDT) From: =?UTF-8?q?Timo=20Pr=C3=B6mer?= To: Harry Wentland , Leo Li , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter Cc: Rodrigo Siqueira , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Timo=20Pr=C3=B6mer?= Subject: [PATCH 2/2] drm/amd/display: Use drm_edid_block_count() instead of raw extensions Date: Mon, 13 Jul 2026 20:38:41 +0200 Message-ID: <20260713183841.5921-3-timo.proemer04@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260713183841.5921-1-timo.proemer04@gmail.com> References: <20260713183841.5921-1-timo.proemer04@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of manually calculating the EDID block count by reading the extensions field from the raw edid structure (`edid->extensions + 1`), utilize the core DRM helper `drm_edid_block_count()`. This now includes possible HF-EEODB extension blocks, which are not included in `edid->extensions` and were previously truncated with the `memmove`. Signed-off-by: Timo Prömer --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index c6f94eb71..ac5a3b337 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c @@ -1160,6 +1160,7 @@ enum dc_edid_status dm_helpers_read_local_edid( struct drm_connector *connector = &aconnector->base; struct i2c_adapter *ddc; int retry = 25; + int block_count; enum dc_edid_status edid_status = EDID_NO_RESPONSE; const struct drm_edid *drm_edid; const struct edid *edid; @@ -1205,7 +1206,9 @@ enum dc_edid_status dm_helpers_read_local_edid( edid->extensions >= sizeof(sink->dc_edid.raw_edid) / EDID_LENGTH) return EDID_BAD_INPUT; - sink->dc_edid.length = EDID_LENGTH * (edid->extensions + 1); + block_count = drm_edid_block_count(drm_edid); + + sink->dc_edid.length = EDID_LENGTH * block_count; memmove(sink->dc_edid.raw_edid, (uint8_t *)edid, sink->dc_edid.length); /* We don't need the original edid anymore */ -- 2.55.0