From nobody Tue Feb 10 04:13:50 2026 Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.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 8F32D1A3029 for ; Mon, 19 Jan 2026 01:11:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.66 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768785121; cv=none; b=nbQoqO3JMKJbHqsXlVBxDLordOtG7GzBtyrPD4d1w7hTPyuEiq2TiMqsqSRc2RO1USRdP9m2eD8uqVaODQy0tjHPYvzrtQsDtaWD7Ue1k55yiB8/CvjydMCLteUGiKgnoYyuU4LC024GFTpFsgg84RyqHGneB6v+gdCDw6XyOgY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768785121; c=relaxed/simple; bh=R+uLRY82QL+hpWLnKwLHrCHDd400bXoq6dB7SnnKie8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ojfS2NMaP+I5bnFUIVvyDYsv6SSVdRFqSoee8BpD5W+kYhRYDmCnr0aZXOKWfJqqjlYmwN5PD7lKTGws7p2uQruGwjvnZIBzl/4FdEGgHgICFrcDs7B8Nu35/tM8Lbeyo9dpN5yvSY3rxL29jdjKe916gFXY2sAncbOkbG5qOkI= 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=mk1BqKAk; arc=none smtp.client-ip=209.85.218.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="mk1BqKAk" Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-b87174fbacdso44798366b.2 for ; Sun, 18 Jan 2026 17:11:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768785116; x=1769389916; 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=O/+mgz8tz1oq1jAsf41mu+R3jbahLDvbH8hDJMkGxqs=; b=mk1BqKAklAM9PCEr9CoYq8S7xdSq3Kx5oAbsad6X5K1j77QAfhP8wVjtL5FaDv6bvK pSzk+4ebADWNSiQjebrpZSCajHtvPC0uoAaz/IpdEEcVCA03TSgvkodXYbT70yUX4YMW gS1su/ovAznXdX1FMqd5UVYMlv3LNFGKmyDNTro8cidYp1+KqITPu1M5KCDaFGSk9enE ZF03jbhFtJiVL1NV9pwQkm4G93dwDXQyzxN+6qBc7cWM6J3PNuYve19r6a+xX40RNm/5 tBWDQKI3Rxc3uyHcNuCu4+/ldX76DKmDlUE/NQJKSWAjJmA0E/99Nr7iIzKz5LD53MV7 U6ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768785116; x=1769389916; 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=O/+mgz8tz1oq1jAsf41mu+R3jbahLDvbH8hDJMkGxqs=; b=ONQBmIsOZRiE+94rdGaGnMHp6zN52J4tAd2vbg6kVUI2dTTQvWyDLJOsJ6aE5e267H jaYZtFsTwDVnny59uH9p6QUY4k37o3mVRpvlNqOUp/VPpbZwFUT166pE7TNW4FHFncWb EqwpVhinN22Kd2k6KfOp3KF8u/uFX9UmwsRZCVu+1mSVqZ3RQ7otCmEmzZBqoMI3v5fd 7Lql6BZ0iwZYFO7YTV9tozZkCuugD/v9c1kD8YQtU0Qaq6NBXN72nzjme8pnaX+YDxlV gyDsjZih0/Yu2ncuFdpYfGXCLMtgRySpEHk8a1iYrYq82Y39D+ML3aqxSwpskW/akXFA avcQ== X-Forwarded-Encrypted: i=1; AJvYcCXCydMa9gkUlovKnBYXRHNuQ2/CxzvgUTSokjMYWD5BjYjPY8Z2XKtrIQ5lP/zDyS4/AkvwB6q0WPBIrZk=@vger.kernel.org X-Gm-Message-State: AOJu0Yzup4dfcWXuVhl1IxmJSZEV1FEfbmF6gikXNA/ghZInjqGGDIYs QMFYRA0tq4zJGMwVFjOS9gwmMosDuHUM9Al770YdmW1uvCPPE5tPjt6B X-Gm-Gg: AY/fxX5miBQp8kbbTAv1yKJZnUuEFSp6lFajdICUF6PI6ZcI/hIRZ3VBqtYPvR2eFNi 82ZBYSrqhv0K0G5AlO3RECpsh/iXE1u7IsW6yNUAwY1UIpDHYsEQMWNNle257kNsc4UMhbzSUm2 gs3qHtCdF/JJuziegjG+iYGE6VdXdfOKuFnbjY+tNxmR8lKA2MUkVP/Eam+GRmTeoY+xG9N8Qsw j0/jEz6gdqbR3H5miJaR+Es31fNRilYIgAsfT9U7NgV9qRkreAJvdRd72oEcIN5MEzt7GbdFZpm gizFi9w2K3SolmMwIEwSew60UYdr8k5rOOgCUPwzowc4VmCBsACVWOAm+WFbOD7BQ6iDLtqK2Vm aXqdL2Vm4mYMBYxCBfmbnLCxQGqojG8vfaaMpVNtDJ78akeW109j0A5HaBF21nciuVtQG1RjKmC c7LBTDKMUV0AFxT9HbOeM5oNr0fKUgirKNxEqbHW02dMme3cgHUw+oqWI7e8OKnS+p X-Received: by 2002:a05:6402:5114:b0:64b:45db:3624 with SMTP id 4fb4d7f45d1cf-654529d2140mr4486900a12.3.1768785116317; Sun, 18 Jan 2026 17:11:56 -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 4fb4d7f45d1cf-654535c4912sm8989806a12.30.2026.01.18.17.11.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jan 2026 17:11:55 -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 Subject: [PATCH 05/17] drm/amd/display: Refactor PCON VRR compatibility check Date: Mon, 19 Jan 2026 02:11:34 +0100 Message-ID: <20260119011146.62302-6-tomasz.pakula.oficjalny@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260119011146.62302-1-tomasz.pakula.oficjalny@gmail.com> References: <20260119011146.62302-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 | 25 +++++++----- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 39 ++++++------------- drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 +- 3 files changed, 28 insertions(+), 38 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 37ab89532408..662f51faf949 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -13242,7 +13242,8 @@ void amdgpu_dm_update_freesync_caps(struct drm_conn= ector *connector, bool freesync_capable =3D false; bool valid_vsdb_cea =3D false; bool vsdb_freesync =3D false; - enum adaptive_sync_type as_type =3D ADAPTIVE_SYNC_TYPE_NONE; + bool pcon_allowed =3D false; + bool is_pcon =3D false; =20 if (!connector->state) { drm_err(adev_to_drm(adev), "%s - Connector has no state", __func__); @@ -13270,18 +13271,24 @@ void amdgpu_dm_update_freesync_caps(struct drm_co= nnector *connector, if (!adev->dm.freesync_module || !dc_supports_vrr(sink->ctx->dce_version)) goto update; =20 + /* Gather all data */ edid =3D drm_edid_raw(drm_edid); // FIXME: Get rid of drm_edid_raw() valid_vsdb_cea =3D parse_amd_vsdb_cea(amdgpu_dm_connector, edid, &vsdb_in= fo) >=3D 0; vsdb_freesync =3D valid_vsdb_cea && vsdb_info.freesync_supported; - if (amdgpu_dm_connector->dc_link) + + 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 /* Some eDP panels only have the refresh rate range info in DisplayID */ if (is_monitor_range_invalid(connector)) parse_edid_displayid_vrr(connector, edid); =20 - if (sink->sink_signal =3D=3D SIGNAL_TYPE_DISPLAY_PORT || - sink->sink_signal =3D=3D SIGNAL_TYPE_EDP) { + /* DP & eDP excluding PCONs */ + if ((sink->sink_signal =3D=3D SIGNAL_TYPE_EDP || + sink->sink_signal =3D=3D SIGNAL_TYPE_DISPLAY_PORT) && !is_pcon) { /* * Many monitors expose AMD vsdb in CAE even for DP and their * monitor ranges do not contain Range Limits Only flag @@ -13306,17 +13313,15 @@ void amdgpu_dm_update_freesync_caps(struct drm_co= nnector *connector, amdgpu_dm_connector->as_type =3D ADAPTIVE_SYNC_TYPE_EDP; } =20 + /* HDMI */ } else if (sink->sink_signal =3D=3D SIGNAL_TYPE_HDMI_TYPE_A && vsdb_frees= ync) { monitor_range_from_vsdb(connector, &vsdb_info); freesync_capable =3D copy_range_to_amdgpu_connector(connector); - } =20 - if (amdgpu_dm_connector->dc_link) - as_type =3D dm_get_adaptive_sync_support_type(amdgpu_dm_connector->dc_li= nk); - - if (as_type =3D=3D FREESYNC_TYPE_PCON_IN_WHITELIST && vsdb_freesync) { + /* DP -> HDMI PCON */ + } else if (pcon_allowed && vsdb_freesync) { + 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 monitor_range_from_vsdb(connector, &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 e5e993d3ef74..76a10fe8d545 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 @@ -1375,40 +1375,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 9d160b39e8c5..f8b45a09d680 100644 --- a/drivers/gpu/drm/amd/display/dc/dm_helpers.h +++ b/drivers/gpu/drm/amd/display/dc/dm_helpers.h @@ -219,10 +219,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.52.0