From nobody Thu Mar 5 08:37:31 2026 Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) (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 878FE3FCC for ; Mon, 16 Feb 2026 16:45:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.68 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771260343; cv=none; b=JqtlXoOj+GIUw+pdLD9HkWKphoKQBlRMHSvCT6JluFPO6CgR7wq+XbsoH33kp4GbnG5at4nX3+pEY+K/pFrx/dCtaLS/CyDg8VQVwQ0XHzm/C0BV7jZ2PXg2s0g9PWg+m9+nEWm09c45qWhyGvxiu59IrsV8VQovbNQT3t3tQhA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771260343; c=relaxed/simple; bh=F16tDJB4mI+m3aE3BtfybNEdzIkgiq8Z8HDrBYHP0EM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SBT/tlVo42Rl7nzh5JI+lXouEnpeQxoFemKSN3Dn4i5bryDAmjwTrQ9Q3IA6KkRzuZ30EvFVOHZpQ8v+p8fgME72EEgUsQvnbPXrvZSXft9+7Fsn3PfeOMkrKOn9jnjZw7qUDI9GPee3gTq1bx+oMexnF1tLseaaqOCGBIAZstw= 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=d1YJI1HJ; arc=none smtp.client-ip=209.85.218.68 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="d1YJI1HJ" Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-b8fa19e6186so64118966b.3 for ; Mon, 16 Feb 2026 08:45:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771260333; x=1771865133; 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=hyN3DnmAfywMU21NsWIFe7SPLTrpTlCuaZerH4yt4wo=; b=d1YJI1HJ06igci2lYjU1L7g5S5U8MFdfvOWIBnK7uK9yrHDU1yeQ1ZFR2e0MiIa3KJ 6KyaM6idbBRg3cZEgRHkRq5i8yG5daowcxkga0G3fRukE5SYAnu+8JXqxdBr87DbkXAf 16AXLSu64oy9/YsFZe+3+W4q2NDb4zBiQ4kVSkdtrI8si9ngLJCjqmCw7Qu2jF0WQQxZ X5UZ1q46hqk0fjgkuqxhMd4wRGL80NGsOmuuzVgV6T1ABIVFbdCl8znfnCXJTUVCKsF/ Pvpbrd4ZobGWQ+JL2svZhRZsgfNjpRLijqIMub6AYxTDLtjPRQMYwSDSxyhz8OOs7D8z TaeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771260333; x=1771865133; 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=hyN3DnmAfywMU21NsWIFe7SPLTrpTlCuaZerH4yt4wo=; b=SBBsAs6P0gqvUZ4BpHWDsH6KOF0NlCfFyYk+yokNlNz49yelpuGbKdhOSw/ialp90g jTuoM/sQ2twGKN8NtS/EtmL8C6m+wg0LBFZb9KXSgLtDIMgpoOXloRIqr6Y+CLsEqzlw Mdim9N7dHQwZePz9Z81nktK7kAb/ks2eSgXlgK/FD13fwgxrzY+cdky+yaBx+iqO1YBm iqHZn9wIDpDjFycC+wkFZtmtuTeBDVltjIn0nbjxeUVX2E7d35NBTw87jcYDMOmlMb5p I3m68nceMxFcwnFEy1JabDarzL7ybCbH2PaslCCLTGUWbJpd11VYfgfA4x9Z0yAGyg6i Wa/w== X-Forwarded-Encrypted: i=1; AJvYcCUbyP6PHj8vUteVMmBJaqPwbsA1hkSE/CF7Jj/sCG+/0QVjQkgImtFyojpOyB6eeE4xx0WHcPZEcwARVqU=@vger.kernel.org X-Gm-Message-State: AOJu0YxWMM40minkoC2TnRvLxa83enb36OYlJ1PiLuQlhPqMAQu/+svf xjqxay5wXIFEYZf4Sbfuj3GkiyAOSTFrwVEQKq3lJKdXUfpXa9grmYMU X-Gm-Gg: AZuq6aLVlsiasOgu6OMBucDU49sA9OyLM73b7GifQN2bnKfwyshkQbNdtwytFBmdVD2 nR9jskTO1Hfka/zcF1Pz4TO7X+R0AQvSmo3JOfCyPqFnTRT7uy0ysSXSb0VQkA2TyLaj5QVATz5 LrLYT/X398vjBryCf9+1ONosVnf2ut49r3ohtid2atnwONm0hY5vwnPsv1nARbUkluUM63rd+51 CbC/JiyoGC8YyGAUZlFeh+QDQ2hVpTtznSBunQjqPICIM6RadKpxaZJeNzP8uaPg68Ium2QoQpF OsjR06FIS3sPN4l87WBlgEky4oBSUElpWrb5VHU7sol/eXnUGDBLbg/8mI71B+LHQEGjeLZfTAJ rnz0KEDQLNCsAt6bBMCLtnZ9/XltlGjflfL9O/ueMOEsdgYCF/URgqlTDxRqivdCXQxn8uViA5q oxmIH0qWAHgZrVireZEpwifEzkxz8BIBFKRZp4paiUDcGr/eN5PAymGny01sv7pYhHJjU/FF8gx H/5 X-Received: by 2002:a17:907:608c:b0:b8f:e96:7880 with SMTP id a640c23a62f3a-b8fac86c68dmr364370966b.0.1771260332728; Mon, 16 Feb 2026 08:45:32 -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-b8fc735d185sm264683866b.14.2026.02.16.08.45.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Feb 2026 08:45:32 -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 v4 10/27] drm/amd/display: Add PCON VRR ID check override Date: Mon, 16 Feb 2026 17:44:59 +0100 Message-ID: <20260216164516.36803-11-tomasz.pakula.oficjalny@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260216164516.36803-1-tomasz.pakula.oficjalny@gmail.com> References: <20260216164516.36803-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 Reviewed-by: Harry Wentland --- 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 2603da69d772..b6079a1ce2ac 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2060,6 +2060,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 */ @@ -13357,7 +13360,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 /* DP & eDP excluding PCONs */ 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 ce08477d1ccd..141d8c76d001 100644 --- a/drivers/gpu/drm/amd/display/dc/dc.h +++ b/drivers/gpu/drm/amd/display/dc/dc.h @@ -1058,6 +1058,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.53.0