From nobody Mon Feb 9 17:58:04 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 BD0372F25EB for ; Sun, 25 Jan 2026 18:39:25 +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=1769366367; cv=none; b=Ua04nVMYGCWvIj5xkntBTWkyQUE72dlupRTSLQrknEEeyNu67lAhWVzEdPUCCh2tD5FDGCFqvYBIrvJH3wsGWEItY2lAPyWWPa5FMdETnZSrAg8TmPZKJbf2P7N/AkEA+eZ9GsCR4LgHoNz7rFISiG+tZcHks8WncIPneas7cHQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769366367; c=relaxed/simple; bh=4+3zOf3U25EsK64bzCIdecW6JQXCwDwBwOOlyGfWByM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=QPosh4naNGHvbpgbpg8QTHib5NdSpfxnn7zurj9dZ7tkjHQdzPGVebrnK3BACSBRmPl4C4LKD+kr463NVbwnaJ6NFP6BSEk1zfiq6ecFvgQ4XTb6ok55M+5vFrZLI9ryeQwzpL/SbTT7QJD+4QNW/L5G4a6QWvz7gjFLhPfPfi4= 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=N0bd40Tc; 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="N0bd40Tc" Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-b8862767cf2so34948766b.1 for ; Sun, 25 Jan 2026 10:39:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769366364; x=1769971164; 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=7MhJNXHQ/ZzkYdK/mC1IYoZJ62H8eejAR4KssW2i5ac=; b=N0bd40TcTPdOyE9RAKWTgfxw+dGfhz/nuSHCQbNMKgqKQZt7KC9VpCO3CwcaSm+7hW c8XudfjM6JHYZhcAt5ujyVOAfhWOyLoxydNgjqfABL2alP3Bltaay46hUDeZdjWHdQnY 53bQAB6H+PsGJKFDeuYjIFlUPnUYbQp3yiugCnFmzmeJuyFGEojNXNHgYzX4eIbCFPJb am+CQ9QM5cSykzaPj5dYH8Yd8Mr1amM+lGX1MJaSEPT+6BNNtaKZ+Hy2y4JoCUqXiRQo yoO8aSgrmWG1N/Lj2zG1t3vYYqZ925iwOQIa0kpwTueDDEqF5l3/cWZ6Lw/7Wux7d8E6 XMJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769366364; x=1769971164; 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=7MhJNXHQ/ZzkYdK/mC1IYoZJ62H8eejAR4KssW2i5ac=; b=OEI9e5QbHs7IGWu4tF4tbsa4fVPGc1T611sFBMS4xF5loRMqY8nbPRanxxLkoDSIBV EYVs+WYB9XEJv7NEyHs35hnEybJ3Dga+a0eyDtA0hGnTRbfyyn0D6MMxty/B+7FV4lOe RIPucHoNC/Sh4aej9Izx5XDCp26KfYKABWP0mqvXNiHxdL2yqTssrjDz7K1+HJ57wUGk JF4r7I78J4K53Rh/q2UJN80DiJKFJOFzMCUulLGLaUZjir2A5CudVb/UXU1yzB1ybjaC 0EIdurWPKkNpCE9whWsj4OSSdeNbAgEUFZHqJOfJS4+AHpGdcGIz8ohA/wTbtHQ5qc9m tEyA== X-Forwarded-Encrypted: i=1; AJvYcCWfEeBsT8vmO+KXxSQUCvwc+P0kjbtVJhyMk6FD/7RBoZDsCDdlaLMUKGQpHpcJEBeJXGI0I74supzPoyg=@vger.kernel.org X-Gm-Message-State: AOJu0YwAMch1U9rA87WgB2VXWXWKZBHO9sJC09azkQYXSmKrxx4dC/aJ w53xRYU4Ul2xNf7ksZLreqkE7EISoVBV8ZMbplGJn4xRN1qoorFrIkNh X-Gm-Gg: AZuq6aJd7jkBtH3C7YJLOcQWW1Y1ppZX7pcosxIMMsaecRakv+HLKWd/8X4/D/E0cFH LQNqCHfjiRQDactk/L8TXky/Ab9c3U5jy1uG3FBLCTneGGL44UwPflOAp0myAxXvqYWqPxgrB57 Q75M2YQxcUcjltV4LJ1iIKqzDrVBTVb6EyQjOxUF/A3eDLuxzjcETz60HW+bfj6ku1yFm/1rHye nRKh0AsE4SKVO3LcKJOvqOrGU9ri933ABOQH4ze/xBQ8UpvmfShaByGGWgVVLLhp7AwFvzcWHXA sd/AyKahphofl7UzdVpTlVY3ZNoOA+miadao7pXxVkr8+vnKM9YJAmuXaItUsAyupTg5QdDIYr5 msPgvKfQXseMlhdFkhskhF5RmH/QyRKWJ2Sph4oINtWl0DsNrM+HnStKx+wPbnX4yGDwHsokyeK hoN6vypmuGJJy8gI2EKjCaHHqmEr15hUHEhPJp1+U46Lod+iuiW/vmUsm1RmivTP51 X-Received: by 2002:a17:907:c28:b0:b87:106c:88eb with SMTP id a640c23a62f3a-b8d20d64cdcmr80420966b.0.1769366363818; Sun, 25 Jan 2026 10:39:23 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 10:39:23 -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 05/19] drm/amd/display: Refactor PCON VRR compatibility check Date: Sun, 25 Jan 2026 19:39:00 +0100 Message-ID: <20260125183914.459228-6-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] 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 68a59275dead..33b76c1850b1 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -13259,7 +13259,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__); @@ -13287,18 +13288,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 @@ -13323,17 +13330,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 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.52.0