From nobody Mon Feb 9 16:02:47 2026 Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) (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 3379B2F3621 for ; Sun, 25 Jan 2026 18:39:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.66 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769366368; cv=none; b=E1UDzU2kIQ5ZVqR38l8fCoch53lI7AHPZswVvjgsFGAdLbqme4yJtZBH2Il2gmYK3I+Ikqj1QEod/Z6D6waY077ecj7g8cuwctYBxxj18tgdsZtTZhfsECPqHlEkrmzTzICjReQ5j3EHA8CwoQTaijya9YUwx7SSH6kEfdbNmHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769366368; c=relaxed/simple; bh=mADQCPW/HUTO+fnDyi7Loh1hY+4lOvUHG6Ob/q13tPE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TR7vMU6YVpgbExaUc3wuEdx6mN62slDRFYnrShAs7zlcOk7j5J56yVLZ+KpkyLCVwCb6JnQ6SNqf7xnfqt82i/+p8Q48ROPFPChf2qRFNq/yrIp++WrsBreylS2QNYo0s+wg8qzeMCUlNgmP7s6gCIUROc4AYvpUp/xcJwSv4Wo= 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=fUBml/PL; arc=none smtp.client-ip=209.85.208.66 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="fUBml/PL" Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-64b7a91f9daso544565a12.2 for ; Sun, 25 Jan 2026 10:39:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769366365; x=1769971165; 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=hmgwWRrt6HOF0PbDVge366fL7Mh7GQU+20kTg/ePqis=; b=fUBml/PLlISN6lYHvBY028NcY9H6vu9PjClQtL1fu5MARno0Oas7NhjHgyFG91DIJ9 273P2m2sj23JMjHhmOGjBUfFFmpFs9GUTGhSMYr9txZpCBqTJXQnWxY6B0A8mrTKwPon yTWIIPjKyp+xN3c55ZVYKiHwU+5qLSrZjZptSJuUcPNzxlQlst0uQmdQ6CM21P5uVSiQ 2eWp/NKhFVGh0RgTgPGAEtwPn8y5xcCBtctSJmbu+NbGze9xSaYn3JHax2ipaVzzH6cG we3+BUTg2gEYSOYzra1aKukaUKo+98Q4pVG2SmLolst6bcREF4GCIWd3N8KL7MUCFhsx BgEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769366365; x=1769971165; 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=hmgwWRrt6HOF0PbDVge366fL7Mh7GQU+20kTg/ePqis=; b=mj6Kb78/Vq082zbIkSGCTwW5IHyd8/uMTqlPGwpQeD7wD/7gf8/hXqaQoPx1ZUcFlm TT6t4tR01LDQ9yljJpl/aWcLyFPGepMsLS3+FBE6VmEPWkR44CT++muOKFY8j4lGQd8O xBoNK7hIWLWABLJxU88u2JQAyAprGVPAjdyo5dZnaWpkymkfzZV9REQFZODno6PFOQJo ircYh6Rj+kK0e8hy4ZF0NUCCBmR94TR+O0f6e2e2c0Hre4ItYruJb/e9hrI3qriQLt/K 4aPcASNWmgRgdwfyr1CIq0g1U3KGhPgWTiCalVZji/ob6VAMJ8gXezq6t8/OLzjsQioC uwKA== X-Forwarded-Encrypted: i=1; AJvYcCVlrn0dTobPmAf0Vk2Qil3Z2wF6A90S2g2TDYbg0IbK3voINA7qv4ejV9ToFxdHKBH2Jddy6VrpN17V930=@vger.kernel.org X-Gm-Message-State: AOJu0YyLxu26/8HCjGNZxHHO33RM9lDVjMdqp/ldtCwGsO+HoM+UgH7G I7W+pyiSO0x3TIusY1ORutxz4eDKta8id/C3ERvq6cDsB1HmgKMtogik X-Gm-Gg: AZuq6aIMvrfllTNlwPy8MLgPPFWlA54izeqXblLn5dEg82RCTZYCVhIp9FVro76sbuL iyJjF2K/kpWZn9pG54HiNpmNPcmUk9O2sy9dDdy5hr4f5ybXZHCdemergg2aC9JhbRHyFKG1ytg oR6Bqq7SgBcdDLwsg07O7bZPL9OIap9SB4FA6FsYqHGuLl0YdUgUSor2i9PqAO0LM4K79gRvWNH phxM0bLiLnZpprNrvCe+FcefOoHq98wit9FG1QfhDvPf6o61JKS6QMHCg1ynQyNVEQlR9ShK4dw A5tr39sMnutnBwV9ilvgKQkr9A/dOcUBN6N3EZIlj3eHm5YV5hN5Amsn3p1aUmIdOzmTtJInW7K MVLlOrI44N7l3Kv8J/mhEyc8PE4KWgchNddFZrCfyK/M9I0Oi6x5r1p3wyonc3JdEvETzbVjsZ6 k8ReYX2RzM9WT6a+eRltVJUEGpikX0A1y8Oc/3Cs3WfSRA9uDEyZX7n6IdrE+VOIc38ORyfnjQg hg= X-Received: by 2002:a17:907:d18:b0:b71:a627:3d9f with SMTP id a640c23a62f3a-b8d20b42346mr96019266b.0.1769366365198; Sun, 25 Jan 2026 10:39:25 -0800 (PST) Received: from laptok.lan (87-205-5-123.static.ip.netia.com.pl. [87.205.5.123]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b885b3dad3asm499133766b.12.2026.01.25.10.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 10:39:24 -0800 (PST) From: =?UTF-8?q?Tomasz=20Paku=C5=82a?= To: alexander.deucher@amd.com, harry.wentland@amd.com, sunpeng.li@amd.com Cc: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, siqueira@igalia.com, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, tomasz.pakula.oficjalny@gmail.com, bernhard.berger@gmail.com, michel.daenzer@mailbox.org, daniel@fooishbar.org Subject: [PATCH v2 06/19] drm/amd/display: Add PCON VRR ID check override Date: Sun, 25 Jan 2026 19:39:01 +0100 Message-ID: <20260125183914.459228-7-tomasz.pakula.oficjalny@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260125183914.459228-1-tomasz.pakula.oficjalny@gmail.com> References: <20260125183914.459228-1-tomasz.pakula.oficjalny@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: quoted-printable [Why] It's currently very hard to test if a random PCON supports VRR and report it's ID. [How] Adds override as part of dc debug mask. Allows faster testing and reporting of VRR-compatible DP->HDMI adapters. Signed-off-by: Tomasz Paku=C5=82a --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 8 +++++++- drivers/gpu/drm/amd/display/dc/dc.h | 1 + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 +- drivers/gpu/drm/amd/include/amd_shared.h | 6 ++++++ 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 33b76c1850b1..7673143ba651 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2062,6 +2062,9 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) if (amdgpu_dc_debug_mask & DC_SKIP_DETECTION_LT) adev->dm.dc->debug.skip_detection_link_training =3D true; =20 + if (amdgpu_dc_debug_mask & DC_OVERRIDE_PCON_VRR_ID_CHECK) + adev->dm.dc->debug.override_pcon_vrr_id_check =3D true; + adev->dm.dc->debug.visual_confirm =3D amdgpu_dc_visual_confirm; =20 /* TODO: Remove after DP2 receiver gets proper support of Cable ID featur= e */ @@ -13296,7 +13299,8 @@ void amdgpu_dm_update_freesync_caps(struct drm_conn= ector *connector, if (amdgpu_dm_connector->dc_link) { dpcd_caps =3D amdgpu_dm_connector->dc_link->dpcd_caps; is_pcon =3D dpcd_caps.dongle_type =3D=3D DISPLAY_DONGLE_DP_HDMI_CONVERTE= R; - pcon_allowed =3D dm_helpers_is_vrr_pcon_allowed(amdgpu_dm_connector->dc_= link); + pcon_allowed =3D dm_helpers_is_vrr_pcon_allowed( + amdgpu_dm_connector->dc_link, connector->dev); } =20 /* Some eDP panels only have the refresh rate range info in DisplayID */ diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/dr= ivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index 45a91df619d9..cb8a2855ac10 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 @@ -1381,7 +1381,7 @@ void dm_helpers_dp_mst_update_branch_bandwidth( // TODO } =20 -bool dm_helpers_is_vrr_pcon_allowed(const struct dc_link *link) +bool dm_helpers_is_vrr_pcon_allowed(const struct dc_link *link, const stru= ct drm_device *dev) { if (link->dpcd_caps.dongle_type !=3D DISPLAY_DONGLE_DP_HDMI_CONVERTER) return false; @@ -1399,6 +1399,12 @@ bool dm_helpers_is_vrr_pcon_allowed(const struct dc_= link *link) return true; } =20 + if (link->dc->debug.override_pcon_vrr_id_check) { + drm_info(dev, "Overriding VRR PCON check for ID: 0x%06x\n", + link->dpcd_caps.branch_dev_id); + return true; + } + return false; } =20 diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/disp= lay/dc/dc.h index ff15e5990ec0..144b5357e6fb 100644 --- a/drivers/gpu/drm/amd/display/dc/dc.h +++ b/drivers/gpu/drm/amd/display/dc/dc.h @@ -1057,6 +1057,7 @@ struct dc_debug_options { bool scl_reset_length10; bool hdmi20_disable; bool skip_detection_link_training; + bool override_pcon_vrr_id_check; uint32_t edid_read_retry_times; unsigned int force_odm_combine; //bit vector based on otg inst unsigned int seamless_boot_odm_combine; diff --git a/drivers/gpu/drm/amd/display/dc/dm_helpers.h b/drivers/gpu/drm/= amd/display/dc/dm_helpers.h index e51f1e489129..5e77deb09200 100644 --- a/drivers/gpu/drm/amd/display/dc/dm_helpers.h +++ b/drivers/gpu/drm/amd/display/dc/dm_helpers.h @@ -223,7 +223,7 @@ int dm_helpers_dmub_set_config_sync(struct dc_context *= ctx, =20 enum dc_edid_status dm_helpers_get_sbios_edid(struct dc_link *link, struct= dc_edid *edid); =20 -bool dm_helpers_is_vrr_pcon_allowed(const struct dc_link *link); +bool dm_helpers_is_vrr_pcon_allowed(const struct dc_link *link, const stru= ct drm_device *dev); bool dm_helpers_is_fullscreen(struct dc_context *ctx, struct dc_stream_sta= te *stream); bool dm_helpers_is_hdr_on(struct dc_context *ctx, struct dc_stream_state *= stream); =20 diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd= /include/amd_shared.h index ac2d3701e2bd..894e1e738ce0 100644 --- a/drivers/gpu/drm/amd/include/amd_shared.h +++ b/drivers/gpu/drm/amd/include/amd_shared.h @@ -412,6 +412,12 @@ enum DC_DEBUG_MASK { * @DC_SKIP_DETECTION_LT: (0x200000) If set, skip detection link training */ DC_SKIP_DETECTION_LT =3D 0x200000, + + /** + * @DC_OVERRIDE_PCON_VRR_ID_CHECK: (0x400000) If set, always return true = if checking for + * PCON VRR compatibility and print it's ID in kernel log. + */ + DC_OVERRIDE_PCON_VRR_ID_CHECK =3D 0x400000, }; =20 enum amd_dpm_forced_level; --=20 2.52.0