From nobody Thu Mar 5 08:44:38 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 13BA42737F2 for ; Mon, 16 Feb 2026 16:45:32 +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=1771260334; cv=none; b=IcbF9wCchZhKHg55vAEQNrCyVbQZxC0R2MmKSuuHp7gNtljWqXM4RJwvnq540fCFM1H5698sQVfYn5F1F2tSiehrkG9hllR/bu7yOUnWGrEzOgaWCaecyfUbj9OyQPmQPXxjP3ji5vXqdEGxMS2OYCqzylu2aSRs4MqBsivbzrA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771260334; c=relaxed/simple; bh=Y/nbbMWDFuvnBDs9qx5LKzqOkRHIWxgTaOIyKx5poOM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jDyjxLUn4JMCXF52zqRINeenilNqWfQo1rffcOoKIUfTNkDhbCdk1UeFcFaapErJ/oAlMpCaxHKd/QS7aljqhoy2gHK+BvZnGhfnhF+/AezgtUzP9qitFLUHXovEpiYD9bRJamoFgujDpZmLEq2+DCralptU5rl49tJQTO12DrQ= 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=mFOVfVt+; 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="mFOVfVt+" Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-b8fa033d805so46891966b.1 for ; Mon, 16 Feb 2026 08:45:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771260331; x=1771865131; 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=qpQ8hMace7VylP1UXnY5VctYMrzTpDvAnEUQfsbXrTg=; b=mFOVfVt+zguQi9wwq9ug4XwF+G9zKxH2BG5UTAm6bRUXH/rbG7w2QmcOLq8hiBRXV8 O8pxoNmp8e50kOgRWRl/g9TE/XOmEoTUmeoLUauiqm61cQYkXUK0vRHUtrgYRmeBElAZ LD4qFtjA2DbH6jFdUQPQnxfcP4kkNYzl48gF97ngmLfUzzfx5+lV33vDJb57pY5XCOJL pjBNcXpcsWoNBCHY2CN4rLJcyq+qsBTa97czy9Dv4ghzIYr2l8lJNIDaauNVSh1uKl/e A8oYEvgzZtm+VpcEaYmevAs/r24OkoGMJ3FRtAXqwFHSXpORh3hsvHJJZomodoRtlcpV qC6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771260331; x=1771865131; 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=qpQ8hMace7VylP1UXnY5VctYMrzTpDvAnEUQfsbXrTg=; b=HDV38OgvI6H9gLSyq9JbxKqVU0YvAywIS/om7abOrUCIi2MfF3chh35o7jDcCQQL7k BkdEfyBLPKllDMjIdrX23lfC7RKZm0MmYF3ACHsDoJ+1LPltpDXMenB/k6PJefC0ZdgN UGZdqojt0OzGyXzUjldhON35roJb4sX2jf215OdsPtk/dEgChimDkPIBsStrZMm7LYSw 6+tQlRdF/Nr4couSMVSE/LE8hc2M+g1H1girFQt+QNb6z8zC2w0MRNESWJ0fZHCA1+GV /XxKMqrZ5Lc1o+//qvpqzfZAChH7O/TfZAZVCfys4QuqGqSCw5PbGUI1O5pyZWwgE1Bg C3Fg== X-Forwarded-Encrypted: i=1; AJvYcCVha+rcW1X5eBXEpq0KBq+KBE7QdRzNihtdNcunKHnkV3YpAOVQz8h/tiIScoJRKXTDrN6djUngGojRsNs=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5cKyEP6d2xp7EEbNqAXmgPpd+uUf93ciDMY7TfABhdbbT0+rP lfPeU1SUWJJmUez1Ok8aCo976K/IL+5mT2vdd3aTTg77so3Hl3l50Hmm X-Gm-Gg: AZuq6aL0ocA0aRaVBcz4rzOz/gk0/Eqtm67za1/tv3otNWLa7DbKBE7+F7WTp8BIQXU dfNHMWX8EadlLBAEHQa/xIpiRlNvuIfitIV1CLhHuBIvtqKxTP+syvF67C78yZUd9QyNyKDH8rc mAeGEEmwkoCH7GuT+4773iRgAsMcdj768rtVpCdRrlS2hz4ivaXcWJ7niQayWmLkQELHtH541vu Dz6R1wCCUVQr9l8JSdnegH2iZqk3VqFTD5+wTdqnKKiY7FBd2+X0QAvdorY08eG9Bp2GnVGfNps DcchUxhU5iQn4cJZ7vZ5VlZ9FgTTRxFxso3rv3277+RMvOdZz+3MHJ0N1JZpNGOc9FxRJsn6RxA scjLTYf3lpqLgVkEyslRBZbBSmAPMS5Ma4QLOdgNiLZXOgNzgeioWI3VQAjA+WIW2wjzv/7Pz+D bVlvc+LdAJI+xGh39wh3HcTKK/1cS3BaFSnmNpjLLMmgfsDBMVtidLEWexh4zJJHjpVguDZvbQo +3G X-Received: by 2002:a17:907:3e88:b0:b73:59b0:34c6 with SMTP id a640c23a62f3a-b8face510e0mr348070666b.4.1771260331308; Mon, 16 Feb 2026 08:45:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Feb 2026 08:45:31 -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 09/27] drm/amd/display: Refactor PCON VRR compatibility check Date: Mon, 16 Feb 2026 17:44:58 +0100 Message-ID: <20260216164516.36803-10-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] DP->HDMI PCONs prevously entered the DP path [How] Restructure amdgpu_dm_update_freesync_caps() and move dm_get_adaptive_sync_support_type() to dm_helpers_is_vrr_pcon_allowed() to better reflect what this function does. It never actually gave us any other info. Signed-off-by: Tomasz Paku=C5=82a --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 ++---- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 39 ++++++------------- drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 +- 3 files changed, 17 insertions(+), 35 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 2f31fe7265d9..2603da69d772 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -13321,8 +13321,8 @@ void amdgpu_dm_update_freesync_caps(struct drm_conn= ector *connector, struct dpcd_caps dpcd_caps =3D {0}; const struct edid *edid; bool freesync_capable =3D false; + bool pcon_allowed =3D false; bool is_pcon =3D false; - enum adaptive_sync_type as_type =3D ADAPTIVE_SYNC_TYPE_NONE; =20 if (!connector->state) { drm_err(adev_to_drm(adev), "%s - Connector has no state", __func__); @@ -13357,6 +13357,7 @@ 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); } =20 /* DP & eDP excluding PCONs */ @@ -13390,15 +13391,11 @@ void amdgpu_dm_update_freesync_caps(struct drm_co= nnector *connector, } else if (sink->sink_signal =3D=3D SIGNAL_TYPE_HDMI_TYPE_A && vsdb_info.= freesync_supported) { monitor_range_from_vsdb(&connector->display_info, &vsdb_info); freesync_capable =3D copy_range_to_amdgpu_connector(connector); - } - - if (amdgpu_dm_connector->dc_link && is_pcon) - as_type =3D dm_get_adaptive_sync_support_type(amdgpu_dm_connector->dc_li= nk); =20 /* DP -> HDMI PCON */ - if (as_type =3D=3D FREESYNC_TYPE_PCON_IN_WHITELIST && vsdb_info.freesync_= supported) { + } else if (pcon_allowed && vsdb_info.freesync_supported) { + amdgpu_dm_connector->as_type =3D FREESYNC_TYPE_PCON_IN_WHITELIST; amdgpu_dm_connector->pack_sdp_v1_3 =3D true; - amdgpu_dm_connector->as_type =3D as_type; amdgpu_dm_connector->vsdb_info =3D vsdb_info; =20 parse_amd_vsdb_cea(amdgpu_dm_connector, edid, &vsdb_info); 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 1f41d6540b83..45a91df619d9 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,40 +1381,25 @@ void dm_helpers_dp_mst_update_branch_bandwidth( // TODO } =20 -static bool dm_is_freesync_pcon_whitelist(const uint32_t branch_dev_id) +bool dm_helpers_is_vrr_pcon_allowed(const struct dc_link *link) { - bool ret_val =3D false; + if (link->dpcd_caps.dongle_type !=3D DISPLAY_DONGLE_DP_HDMI_CONVERTER) + return false; =20 - switch (branch_dev_id) { + if (!link->dpcd_caps.allow_invalid_MSA_timing_param) + return false; + + if (!link->dpcd_caps.adaptive_sync_caps.dp_adap_sync_caps.bits.ADAPTIVE_S= YNC_SDP_SUPPORT) + return false; + + switch (link->dpcd_caps.branch_dev_id) { case DP_BRANCH_DEVICE_ID_0060AD: case DP_BRANCH_DEVICE_ID_00E04C: case DP_BRANCH_DEVICE_ID_90CC24: - ret_val =3D true; - break; - default: - break; + return true; } =20 - return ret_val; -} - -enum adaptive_sync_type dm_get_adaptive_sync_support_type(struct dc_link *= link) -{ - struct dpcd_caps *dpcd_caps =3D &link->dpcd_caps; - enum adaptive_sync_type as_type =3D ADAPTIVE_SYNC_TYPE_NONE; - - switch (dpcd_caps->dongle_type) { - case DISPLAY_DONGLE_DP_HDMI_CONVERTER: - if (dpcd_caps->adaptive_sync_caps.dp_adap_sync_caps.bits.ADAPTIVE_SYNC_S= DP_SUPPORT =3D=3D true && - dpcd_caps->allow_invalid_MSA_timing_param =3D=3D true && - dm_is_freesync_pcon_whitelist(dpcd_caps->branch_dev_id)) - as_type =3D FREESYNC_TYPE_PCON_IN_WHITELIST; - break; - default: - break; - } - - return as_type; + return false; } =20 bool dm_helpers_is_fullscreen(struct dc_context *ctx, struct dc_stream_sta= te *stream) diff --git a/drivers/gpu/drm/amd/display/dc/dm_helpers.h b/drivers/gpu/drm/= amd/display/dc/dm_helpers.h index 7014b8c2c956..e51f1e489129 100644 --- a/drivers/gpu/drm/amd/display/dc/dm_helpers.h +++ b/drivers/gpu/drm/amd/display/dc/dm_helpers.h @@ -220,10 +220,10 @@ int dm_helpers_dmub_set_config_sync(struct dc_context= *ctx, const struct dc_link *link, struct set_config_cmd_payload *payload, enum set_config_status *operation_result); -enum adaptive_sync_type dm_get_adaptive_sync_support_type(struct dc_link *= link); =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_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 --=20 2.53.0