From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (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 8BED61EB9E3 for ; Mon, 19 Jan 2026 01:11:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768785114; cv=none; b=SxxjY3YXAti4JiQqKrBHyKADQ6c+ML4I+UzbDE/ygFonadfoymqxBcePxjxM4zu86UpHjd63nO/4/hgKqswknY1Er2zci9Ok3iErvY8K+JuqH3iuRNEcRQgQTmiqbFpob42bqf7HNRnpQdf0s/gfOeX6gJxDF5heSbv3LRdgmms= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768785114; c=relaxed/simple; bh=xjkx/RjLm3qmEeybCu80XAZFZoqG7bh+CR0W8zHb7us=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DeiPXHZt+W8hq6NTRcbS57FMgALkGlvNNvirgapDPgCWi+vcfsuW3QBeGZmyVfszzj86NyODoeDT5MFKoD7IvpqeI+cqC2ufEDY1364H5q1m8EvFMxNaeyEdZn08BeqgZ8c3Z8pdZTAJBZjtntUWIbKG7wlTBNV7mjM+kNRgHi8= 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=CnTjFqVw; arc=none smtp.client-ip=209.85.208.41 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="CnTjFqVw" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-64b686e7d04so460153a12.3 for ; Sun, 18 Jan 2026 17:11:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768785111; x=1769389911; 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=DDkX9tiIpLGCY4WDxdoWW0wKCm3VG7e/EcS3/xb60P4=; b=CnTjFqVwIGOQX06n3hDW6Pe7F6AiyjkzvLosnp4aJ+7pPdvh35RW7+UIvy/ria7EGp +FOP776qTco3QQG2A2QqViCxBUQxi6SxCxKnVR0s0ZpmBmeC7IAvGS8RR0464qCYUwCX EHJE62TcdbXSNXWqHWVxcRTF6ihH0zM1dXFpjE0L16VVsuDgptqnQoTPZ3buQjnimVqB hOhkznRZ2WJoMKnietZYfZ63VH6G6sP7oy58IArjM894nKJJbt0dRc4z7aY5dq3JohXb gRuhr+9w3jXI+vGtDknDPImUvOvmU43NLLk5XkxkxPms+iX7XyEtMBze5eiiAk7SE2L0 NVTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768785111; x=1769389911; 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=DDkX9tiIpLGCY4WDxdoWW0wKCm3VG7e/EcS3/xb60P4=; b=OLLHx6Gw5DSuF8cKfJbNCLAykwflcTCFwWekOxNcAUrXCaB4XKsq70X1NCLbzn7wPg iLgqgb67rez3FqB7Bcny+lQcxjSqM2P/U6xlK50DFCNeCmLMq3BZeaLb0uQC4aSUUd5C nWmT+gffo96EvCCDdFPfnOjaCfnyiyYnZ/SCpmTacSRzaSTltJ7YSNkxlgvtAVeHWBBs R+ReRPzJ+gWmX22/ZcStYnRfbekkJ06usSp02rb/ogh5s/+gh+nQN5XHLE3dgsPu6Vth smU/Xiad99++6B3SwxsMh2vBd5ZwoabtedhFesQWOoYa7KBmQ1QniUIUGDIlxU+Cm02D O4AA== X-Forwarded-Encrypted: i=1; AJvYcCX1Xc526BZ/EsKuKPK4u8S8/MqIroLUd/m0HqgCy2HED69ickuF75o6ISzP3nrVn/TBc0UVL71dc6mOPBA=@vger.kernel.org X-Gm-Message-State: AOJu0YwQYXBTuugXnYyRtaCOXd8DlO4sOnH1NiRfGwo21K7nN2OI1DMD u94Yfbe9CrpUIpuMnlSVaoYkoH5hYGHzDxgXwg5FrJOsIzroOm1b0IOk X-Gm-Gg: AY/fxX63NFVvCohIEnyM37zzvTyCFPP3DG6zLSJ8IyVIZG574R8+KwI6wSfMdMCpIaD 82wc1o4pnJPAIMge3vwP+iOy8Uplyt7dwbLlarp4NeTFJKWdLgB+XmRIoeVVGkJ4QYeJvZOxec9 PJc1381Sb+51/Hxwd/KptgO3zTawC0KfDaM7BrWHGr/bUCTbhA8KvxJCd5wpfDjgMYgoRybfECn Hw9hKTPDn5hJuIa1XYm7N8vor9UG0J7fQsqwMzvdz7pFBJQBLxnY/eiHzB684Em0km5Y/aiQMnC hb6ZN+IL0wsCMy4rd6Ny9cKLOEA5vmyUIS/Rjrws5cTgPZTvxA5rrcweRsz6uQvMdtBz2gkgO36 7Ajxq3gXmOoRrg7jZYLzm9lYdFZ230LAkegUB8lcqUyaSEYBilHmPUD9grO1t4TOpNAvy2Ct25d Ax0Waf61vLP2x6kUV6r/vuyufihN/Jk1THvPGN1lAXGvwsYHmTPq9305q6eWAbTwjE X-Received: by 2002:a05:6402:27cf:b0:64d:4623:8475 with SMTP id 4fb4d7f45d1cf-654524cf67cmr4280700a12.2.1768785110864; Sun, 18 Jan 2026 17:11:50 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jan 2026 17:11:50 -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 02/17] drm/amd/display: Refactor amdgpu_dm_update_freesync_caps() Date: Mon, 19 Jan 2026 02:11:31 +0100 Message-ID: <20260119011146.62302-3-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: 8bit [Why] This function started to get very messy and hard to follow. [How] Eject some functionality to separate functions and simplify greatly. Signed-off-by: Tomasz PakuĊ‚a --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 119 +++++++++++------- 1 file changed, 72 insertions(+), 47 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index a0d23853b8fc..d83c65dc93d7 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -13096,8 +13096,8 @@ static void parse_edid_displayid_vrr(struct drm_connector *connector, } } -static int parse_amd_vsdb(struct amdgpu_dm_connector *aconnector, - const struct edid *edid, struct amdgpu_hdmi_vsdb_info *vsdb_info) +static int parse_amd_vsdb_did(struct amdgpu_dm_connector *aconnector, + const struct edid *edid, struct amdgpu_hdmi_vsdb_info *vsdb_info) { u8 *edid_ext = NULL; int i; @@ -13134,9 +13134,9 @@ static int parse_amd_vsdb(struct amdgpu_dm_connector *aconnector, return false; } -static int parse_hdmi_amd_vsdb(struct amdgpu_dm_connector *aconnector, - const struct edid *edid, - struct amdgpu_hdmi_vsdb_info *vsdb_info) +static int parse_amd_vsdb_cea(struct amdgpu_dm_connector *aconnector, + const struct edid *edid, + struct amdgpu_hdmi_vsdb_info *vsdb_info) { u8 *edid_ext = NULL; int i; @@ -13166,6 +13166,44 @@ static int parse_hdmi_amd_vsdb(struct amdgpu_dm_connector *aconnector, return valid_vsdb_found ? i : -ENODEV; } +static bool is_monitor_range_invalid(struct drm_connector *conn) +{ + return conn->display_info.monitor_range.min_vfreq == 0 || + conn->display_info.monitor_range.max_vfreq == 0; +} + +/** + * Returns true if (max_vfreq - min_vfreq) > 10 + */ +static bool is_freesync_capable(struct drm_monitor_range_info *range) +{ + return (range->max_vfreq - range->min_vfreq) > 10; +} + +static void monitor_range_from_vsdb(struct drm_connector *conn, + struct amdgpu_hdmi_vsdb_info *vsdb) +{ + struct drm_monitor_range_info *range = &conn->display_info.monitor_range; + + range->min_vfreq = vsdb->min_refresh_rate_hz; + range->max_vfreq = vsdb->max_refresh_rate_hz; +} + +/** + * Returns true if connector is capable of freesync + * Optionally, can fetch the range from AMD vsdb + */ +static bool copy_range_to_amdgpu_connector(struct drm_connector *conn) +{ + struct amdgpu_dm_connector *aconn = to_amdgpu_dm_connector(conn); + struct drm_monitor_range_info *range = &conn->display_info.monitor_range; + + aconn->min_vfreq = range->min_vfreq; + aconn->max_vfreq = range->max_vfreq; + + return is_freesync_capable(range); +} + /** * amdgpu_dm_update_freesync_caps - Update Freesync capabilities * @@ -13180,15 +13218,18 @@ static int parse_hdmi_amd_vsdb(struct amdgpu_dm_connector *aconnector, void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, const struct drm_edid *drm_edid) { - int i = 0; struct amdgpu_dm_connector *amdgpu_dm_connector = to_amdgpu_dm_connector(connector); struct dm_connector_state *dm_con_state = NULL; struct dc_sink *sink; struct amdgpu_device *adev = drm_to_adev(connector->dev); struct amdgpu_hdmi_vsdb_info vsdb_info = {0}; + struct amdgpu_hdmi_vsdb_info vsdb_did = {0}; + struct dpcd_caps dpcd_caps = {0}; const struct edid *edid; bool freesync_capable = false; + bool valid_vsdb_cea = false; + bool vsdb_freesync = false; enum adaptive_sync_type as_type = ADAPTIVE_SYNC_TYPE_NONE; if (!connector->state) { @@ -13218,62 +13259,46 @@ void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, goto update; edid = drm_edid_raw(drm_edid); // FIXME: Get rid of drm_edid_raw() + valid_vsdb_cea = parse_amd_vsdb_cea(amdgpu_dm_connector, edid, &vsdb_info) >= 0; + vsdb_freesync = valid_vsdb_cea && vsdb_info.freesync_supported; + if (amdgpu_dm_connector->dc_link) + dpcd_caps = amdgpu_dm_connector->dc_link->dpcd_caps; /* Some eDP panels only have the refresh rate range info in DisplayID */ - if ((connector->display_info.monitor_range.min_vfreq == 0 || - connector->display_info.monitor_range.max_vfreq == 0)) + if (is_monitor_range_invalid(connector)) parse_edid_displayid_vrr(connector, edid); - if (edid && (sink->sink_signal == SIGNAL_TYPE_DISPLAY_PORT || - sink->sink_signal == SIGNAL_TYPE_EDP)) { - if (amdgpu_dm_connector->dc_link && - amdgpu_dm_connector->dc_link->dpcd_caps.allow_invalid_MSA_timing_param) { - amdgpu_dm_connector->min_vfreq = connector->display_info.monitor_range.min_vfreq; - amdgpu_dm_connector->max_vfreq = connector->display_info.monitor_range.max_vfreq; - if (amdgpu_dm_connector->max_vfreq - amdgpu_dm_connector->min_vfreq > 10) - freesync_capable = true; - } + if (sink->sink_signal == SIGNAL_TYPE_DISPLAY_PORT || + sink->sink_signal == SIGNAL_TYPE_EDP) { - parse_amd_vsdb(amdgpu_dm_connector, edid, &vsdb_info); + if (dpcd_caps.allow_invalid_MSA_timing_param) + freesync_capable = copy_range_to_amdgpu_connector(connector); - if (vsdb_info.replay_mode) { - amdgpu_dm_connector->vsdb_info.replay_mode = vsdb_info.replay_mode; - amdgpu_dm_connector->vsdb_info.amd_vsdb_version = vsdb_info.amd_vsdb_version; + /* eDP */ + if (edid) + parse_amd_vsdb_did(amdgpu_dm_connector, edid, &vsdb_did); + + if (vsdb_did.replay_mode) { + amdgpu_dm_connector->vsdb_info.replay_mode = vsdb_did.replay_mode; + amdgpu_dm_connector->vsdb_info.amd_vsdb_version = vsdb_did.amd_vsdb_version; amdgpu_dm_connector->as_type = ADAPTIVE_SYNC_TYPE_EDP; } - } else if (drm_edid && sink->sink_signal == SIGNAL_TYPE_HDMI_TYPE_A) { - i = parse_hdmi_amd_vsdb(amdgpu_dm_connector, edid, &vsdb_info); - if (i >= 0 && vsdb_info.freesync_supported) { - amdgpu_dm_connector->min_vfreq = vsdb_info.min_refresh_rate_hz; - amdgpu_dm_connector->max_vfreq = vsdb_info.max_refresh_rate_hz; - if (amdgpu_dm_connector->max_vfreq - amdgpu_dm_connector->min_vfreq > 10) - freesync_capable = true; - - connector->display_info.monitor_range.min_vfreq = vsdb_info.min_refresh_rate_hz; - connector->display_info.monitor_range.max_vfreq = vsdb_info.max_refresh_rate_hz; - } + } else if (sink->sink_signal == SIGNAL_TYPE_HDMI_TYPE_A && vsdb_freesync) { + monitor_range_from_vsdb(connector, &vsdb_info); + freesync_capable = copy_range_to_amdgpu_connector(connector); } if (amdgpu_dm_connector->dc_link) as_type = dm_get_adaptive_sync_support_type(amdgpu_dm_connector->dc_link); - if (as_type == FREESYNC_TYPE_PCON_IN_WHITELIST) { - i = parse_hdmi_amd_vsdb(amdgpu_dm_connector, edid, &vsdb_info); - if (i >= 0 && vsdb_info.freesync_supported && vsdb_info.amd_vsdb_version > 0) { + if (as_type == FREESYNC_TYPE_PCON_IN_WHITELIST && vsdb_freesync) { + amdgpu_dm_connector->pack_sdp_v1_3 = true; + amdgpu_dm_connector->as_type = as_type; + amdgpu_dm_connector->vsdb_info = vsdb_info; - amdgpu_dm_connector->pack_sdp_v1_3 = true; - amdgpu_dm_connector->as_type = as_type; - amdgpu_dm_connector->vsdb_info = vsdb_info; - - amdgpu_dm_connector->min_vfreq = vsdb_info.min_refresh_rate_hz; - amdgpu_dm_connector->max_vfreq = vsdb_info.max_refresh_rate_hz; - if (amdgpu_dm_connector->max_vfreq - amdgpu_dm_connector->min_vfreq > 10) - freesync_capable = true; - - connector->display_info.monitor_range.min_vfreq = vsdb_info.min_refresh_rate_hz; - connector->display_info.monitor_range.max_vfreq = vsdb_info.max_refresh_rate_hz; - } + monitor_range_from_vsdb(connector, &vsdb_info); + freesync_capable = copy_range_to_amdgpu_connector(connector); } update: -- 2.52.0