From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 BBFFF3F0748 for ; Wed, 1 Apr 2026 23:07:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775084865; cv=none; b=jrnpEESBox97mltx75S5nsNS17L1WuY0MGyTguO23KbcoiQEb+PmYbMXGNG19vxb+W1YU1MzzeCXMUJ4vHWNr0oo0EYPpIEcule1blPh0EqAQVV46tjIjDutBcNSHkoIxS8zi9iVnUP3352A0EJ5ki6IH+cvSyJFtKcSnGcxGJ8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775084865; c=relaxed/simple; bh=81im7ehVEoXOeD7wcXJm6nQeOW+mlj7L5bPsJ38ccbY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h7buWRkNe55x4/ctFJh65ddOUkJ8DlBtwi52LK6tP+hNabDm6izYtuWju6V3ZhjZl3s9n0hbtuOOgi38coBd97UOQZvcwPLHbVUeQrqq0RyzLpfaKzhGJDh5AKQ0ph17LNOxgwoAc+VuyJY4gwtKgGmfaKqI+evfbxv0ULtWlhs= 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=JpsGEbIU; arc=none smtp.client-ip=209.85.128.48 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="JpsGEbIU" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-482f454be5bso15000595e9.0 for ; Wed, 01 Apr 2026 16:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775084861; x=1775689661; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t4vlVVvxWEWO2r6arzInv5eisxXfXrLq1ekNSjOyYGg=; b=JpsGEbIUC0a9wAu+fFOFamN0z7Kpmcc7RmiYJKi0eBVLMt0EIB1rzNejsCHPewMtqY IBvdBrH0VniyI5QzM6xAA9wANNlyfAfZs+K/tC8VxAgMl3zCuAGkNc5Gu4/GGKs0PMkY l/we7CqiDkdzks5HVdGtcdLNnIkwHuv4w7FOYrIb4x7tH20a6VDL/N1u6f4Q6Plv6WGc zVXKfp1+G3+lm8ImHnaHfm3aPycJ/45FqLqaSmG8+6Dby8vYTjUg9cM2h8QfRCGLhuFD OQh1D85wJeV26u8av6FcsJFBppYcazwlAL/tRBzJ6tQpp3xlY7coIDLD9OcxcI31UmTr ha8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775084861; x=1775689661; h=content-transfer-encoding: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; bh=t4vlVVvxWEWO2r6arzInv5eisxXfXrLq1ekNSjOyYGg=; b=I7VqrzYTe2MPbUVFq4RZu0DXU3UOplYWyTPhMDlfQBme+jy7a+cogb+DGRGEzgGyiK ztC1pz/vcCd8qX+JxK9peBKSKC8DyxJSN3ccXTQNL1pXe6P+Kkv/4O2KlIkiynq9Do/z ICZp987Tp7uIPyXxorKi2mgtXeF8xIrsIsQxuoTY+jInHk0tgMJN10xZFdiw+TwRyIT7 sU6UvliXg8ujOkH8OIdNnMUzoajudI2if7V8aF1rhzXhm+gANgyUtgQ1PlSmqH5NcJPB Sqj+uPam2suuJyGo5u2AOKjB78tadQhwtDWwi12XOys9xG+ruQdOzA0YtNQ8Ycu4vflT KdMQ== X-Forwarded-Encrypted: i=1; AJvYcCV4QCdsp38gqc2MaZAf99MwjaSQJltywDU5lNEuzamFt5af1FBBudGD6dN15FBLriZFg9snCAvqbpsBCaE=@vger.kernel.org X-Gm-Message-State: AOJu0YwVAm7Ew0VVN4oNCOvJynPeURKBSteOotw0EM9O5aMhukKnzmvk M/ATyVhyC3pQf6EIHzbnk6pMO0kdZaL45jR22NUaLDnE534CL2CBfBfm X-Gm-Gg: ATEYQzzj96coPgFKKqVPtwEtBQwcI4Nret7uyEP2UqOKscoYSW/bLYtIPRV2R+2rQU0 KxcPHrF3pT9KnFWPRwMYMlpe+YlKSFHd8fpKR3btlrjmLr5XTRi3AwJFgMDgSHFxO5dOzXYmC5x xD2p7apD0kflHxl9+ebrAMVSzhmXQgaJhRBK1coCKT9SBrOObn4KpXHANldxKwZc3oodkpNO4nE Ux5H7Ng4ni+OiHBlxs2G5jXUQmXon6L67MQNUuqL9RsGvbR+KdGu+cgNjrZoa+d3rsezQ28UjLh fOz/0IPWK2fUVSZD0e0JkK3vEE0kWQAiyxisROiY1w8L2P/t/p8ySTQvz+YCVGcfPhQMB+pg7cb L5cRqMu1fuNFETxwOE6nvYjfCVJjDKv/RjrXvCWZnVT7QOgKK9I6w8WljAl5W3MHPrauE8r1fLA btY4C2ZOmShFQ0+gPiDgiwjjslXWCuamKx5vC25tn9GcPQLLhSKqK5H9TMCiJpZVoFvTf8 X-Received: by 2002:a05:600c:a405:b0:47e:e59c:67c5 with SMTP id 5b1f17b1804b1-4888e078f42mr2697135e9.8.1775084860569; Wed, 01 Apr 2026 16:07:40 -0700 (PDT) Received: from rhel.homenet.telecomitalia.it ([87.13.132.253]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4887ad1cd86sm53682845e9.5.2026.04.01.16.07.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 16:07:40 -0700 (PDT) From: Adriano Vero To: dri-devel@lists.freedesktop.org Cc: jani.nikula@linux.intel.com, alexander.deucher@amd.com, harry.wentland@amd.com, sunpeng.li@amd.com, siqueira@igalia.com, christian.koenig@amd.com, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Adriano Vero , Rodrigo.Siqueira@amd.com Subject: [PATCH v2 2/2] drm/amd/display: remove manual DisplayID VRR parsing from freesync caps Date: Thu, 2 Apr 2026 01:07:25 +0200 Message-ID: <20260401230735.4866-2-litaliano00.contact@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260401230735.4866-1-litaliano00.contact@gmail.com> References: <20260328132027.22383-1-litaliano00.contact@gmail.com> <20260401230735.4866-1-litaliano00.contact@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit parse_edid_displayid_vrr() walked raw DisplayID bytes via struct edid* to find Dynamic Video Timing Range Limits blocks when monitor_range was zeroed. This is a layering violation. Now that drm_get_monitor_range_displayid() in the DRM core fills monitor_range from DisplayID Dynamic Video Timing blocks via the proper displayid_iter infrastructure, parse_edid_displayid_vrr() is redundant. Remove it and its drm_edid_raw() call from the VRR path. drm_edid_raw() remains for parse_amd_vsdb() and parse_hdmi_amd_vsdb() which read AMD vendor-specific CEA data blocks; those are tracked separately. Cc: Alex Deucher Cc: Harry Wentland Cc: Rodrigo.Siqueira@amd.com Signed-off-by: Adriano Vero --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 61 ++++--------------- 1 file changed, 11 insertions(+), 50 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 085cc98bd..c61d6e1fe 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -13110,49 +13110,6 @@ static bool parse_edid_cea(struct amdgpu_dm_connector *aconnector, return ret; } -static void parse_edid_displayid_vrr(struct drm_connector *connector, - const struct edid *edid) -{ - u8 *edid_ext = NULL; - int i; - int j = 0; - u16 min_vfreq; - u16 max_vfreq; - - if (!edid || !edid->extensions) - return; - - /* Find DisplayID extension */ - for (i = 0; i < edid->extensions; i++) { - edid_ext = (void *)(edid + (i + 1)); - if (edid_ext[0] == DISPLAYID_EXT) - break; - } - - if (i == edid->extensions) - return; - - while (j < EDID_LENGTH) { - /* Get dynamic video timing range from DisplayID if available */ - if (EDID_LENGTH - j > 13 && edid_ext[j] == 0x25 && - (edid_ext[j+1] & 0xFE) == 0 && (edid_ext[j+2] == 9)) { - min_vfreq = edid_ext[j+9]; - if (edid_ext[j+1] & 7) - max_vfreq = edid_ext[j+10] + ((edid_ext[j+11] & 3) << 8); - else - max_vfreq = edid_ext[j+10]; - - if (max_vfreq && min_vfreq) { - connector->display_info.monitor_range.max_vfreq = max_vfreq; - connector->display_info.monitor_range.min_vfreq = min_vfreq; - - return; - } - } - j++; - } -} - static int parse_amd_vsdb(struct amdgpu_dm_connector *aconnector, const struct edid *edid, struct amdgpu_hdmi_vsdb_info *vsdb_info) { @@ -13288,13 +13245,17 @@ void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, if (!adev->dm.freesync_module || !dc_supports_vrr(sink->ctx->dce_version)) goto update; - edid = drm_edid_raw(drm_edid); // FIXME: Get rid of drm_edid_raw() - - /* Some eDP panels only have the refresh rate range info in DisplayID */ - if ((connector->display_info.monitor_range.min_vfreq == 0 || - connector->display_info.monitor_range.max_vfreq == 0)) - parse_edid_displayid_vrr(connector, edid); - + /** + * monitor_range is now populated by the DRM core from both classic + * EDID Monitor Range Limits descriptors and DisplayID Dynamic Video + * Timing blocks (tag 0x25) via drm_get_monitor_range_displayid(). + * parse_edid_displayid_vrr() has been removed. + * + * drm_edid_raw() is retained only for parse_amd_vsdb() and + * parse_hdmi_amd_vsdb() which read AMD vendor-specific CEA blocks. + * Removing those raw accesses is tracked separately. + */ + edid = drm_edid_raw(drm_edid); /* TODO: amd/hdmi vsdb refactor */ if (edid && (sink->sink_signal == SIGNAL_TYPE_DISPLAY_PORT || sink->sink_signal == SIGNAL_TYPE_EDP)) { if (amdgpu_dm_connector->dc_link && -- 2.47.3