From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BF0051099B54 for ; Sat, 21 Mar 2026 05:45:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2CB9710E2E3; Sat, 21 Mar 2026 05:45:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SrDW3CGk"; dkim-atps=neutral Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by gabe.freedesktop.org (Postfix) with ESMTPS id EB04910E2D5 for ; Sat, 21 Mar 2026 05:45:18 +0000 (UTC) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-c74f0c3fc16so519080a12.2 for ; Fri, 20 Mar 2026 22:45:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774071918; x=1774676718; darn=lists.freedesktop.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=o1e3VlB8M6gxe/ov0H5wYQTMPrywihYmSqb8em+k4zw=; b=SrDW3CGkTAw0CBIsrrr66VRBZP4fSY1nVa/9x+ujDlYGYlOGdxA9HijUIkXeCebD+S OPR770DkjOc12foATwwSNcMPugOlSpIJotDkHLGapSUl4CsG6iHkMklal/j5G0aoTkzu HNA22Vb1tYY+QzwugJcKJiHXYRxGudKgSv+xFvh268iINRjTI6eAgX8BhQzhFY8+3VuL Mnp3pbirTRTaSUhx1Y+W/BM0vD3XxZrFsJOYfFm+R77xCFsbSdTIUZw9R8dTtcVxMiei KkzINH/Y7LN8NrMnhh8NF+iDPzP5pSbqgVnXfUzoyx3g4BLNQkeKX1LfzpGNhaUlwcKl 39SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774071918; x=1774676718; 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=o1e3VlB8M6gxe/ov0H5wYQTMPrywihYmSqb8em+k4zw=; b=kt4Jlcr5bJHJyUzL8euGSpEdKEk3UbFX+i5QWe+Ourx03CzZwrXgHIqKCTOhawSpdc VMNoVTMcvdzSBVGSW1aqAiHX9HtSfNz5wd0dG1vd0OU+BJ+2v+DVttnT7P2XjsxVm3zY P7hmVkMhCC0v0VSDeVoES/LWUGBfl+mGF7bVA+BoSQRM9bwTlXknz1bU4h/8hgWiCEcT rW308wH99gh5GZySYuN1KhZ8BuwEPh8nqbzbMu8AxUeIujsbLKpm0wmyMI8LKaMk64JY 2BxPNVL/XoNNUQ8GEriBxeK37mqyyu0sHezqmcx897vyzlWZ3Drn5CKQPD2XUUozZyLE MF5Q== X-Forwarded-Encrypted: i=1; AJvYcCXOi20dH5ZkME0xN900mpyj5EamCUpDmAe1BjCCmHXeeVphrAGgXQUyb9RQE1bpcR4KmCrQWZzBWwk=@lists.freedesktop.org X-Gm-Message-State: AOJu0YxrGtuiiqY2icmG0WmHeLA0py7TTHvF9dIL2p0o5IQyvvXxS9q/ 2QW9CI020NHbQO/RHR0R7OWLdK7gpjQwCn31KHYCBVHFPQG+bnPkkciK X-Gm-Gg: ATEYQzwncLEgm8D0U1qrBAzah6AeQOV3+2XI/n8ChHCjTyARQ9+jDDv/iFe2mAjFI+q XxWDNQnh+0pPu5K+oLl6jLLs/QGfOe/K1NrVf8m9ivDa4MPHNDtcKuuxvV0d60Ipiva/PxgAdcJ MIb3NQik7YNahejIpATTwlb76yzrG39mBeuw0ZkcBuNVCJu/F48nPOXQiL+xurOWKmNupTid4KB oDg4/8gqSunQqwYKrBo+pDqoDJFXjsW3H9buW8JjFWJjKqq7m3M8sSueEHTf9e5pKyIvZ9eTSRi YwjPSoiRDsBkTUOiIpzCvFN77mv6ozTBTBdRoyitht7f4R5HYFYCkg6I5hUOYg4oxOXuaPh38/K 8NyE2WdLVYrqfsrwn4knLfteP+T6CBdFVlTAKnnQZVKqL2sVmMCKq28Rhq9qpglSigZpyiRyH+X wC2tf9PSMN/OYom1zlWkmWugQIorwyGNXFUQqnJZhbs3jqDiM8h0WALvM= X-Received: by 2002:a05:6a21:6d99:b0:398:7357:bb81 with SMTP id adf61e73a8af0-39bce9f0d74mr5250717637.15.1774071918403; Fri, 20 Mar 2026 22:45:18 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82b0409c681sm4338783b3a.37.2026.03.20.22.45.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 22:45:17 -0700 (PDT) From: Rosen Penev To: stable@vger.kernel.org Cc: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Harry Wentland , Leo Li , Rodrigo Siqueira , Evan Quan , Mario Limonciello , Sasha Levin , Rosen Penev , Lijo Lazar , Ma Jun , Greg Kroah-Hartman , Srinivasan Shanmugam , "Mario Limonciello (AMD)" , Zhigang Luo , Bert Karwatzki , Ray Wu , Wayne Lin , Roman Li , Hersen Wu , =?UTF-8?q?Timur=20Krist=C3=B3f?= , Alex Hung , decce6 , Wentao Liang , amd-gfx@lists.freedesktop.org (open list:RADEON and AMDGPU DRM DRIVERS), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCHv3 for 6.1 3/4] drm/amd/display: Add pixel_clock to amd_pp_display_configuration Date: Fri, 20 Mar 2026 22:44:52 -0700 Message-ID: <20260321054453.19683-4-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260321054453.19683-1-rosenp@gmail.com> References: <20260321054453.19683-1-rosenp@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Timur Kristóf [ Upstream commit b515dcb0dc4e85d8254f5459cfb32fce88dacbfb ] This commit adds the pixel_clock field to the display config struct so that power management (DPM) can use it. We currently don't have a proper bandwidth calculation on old GPUs with DCE 6-10 because dce_calcs only supports DCE 11+. So the power management (DPM) on these GPUs may need to make ad-hoc decisions for display based on the pixel clock. Also rename sym_clock to pixel_clock in dm_pp_single_disp_config to avoid confusion with other code where the sym_clock refers to the DisplayPort symbol clock. Signed-off-by: Timur Kristóf Signed-off-by: Alex Deucher Signed-off-by: Rosen Penev --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 1 + drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 2 +- drivers/gpu/drm/amd/display/dc/dm_services_types.h | 2 +- drivers/gpu/drm/amd/include/dm_pp_interface.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c index 75284e2cec74..c4e7d9212cd4 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c @@ -97,6 +97,7 @@ bool dm_pp_apply_display_requirements( const struct dm_pp_single_disp_config *dc_cfg = &pp_display_cfg->disp_configs[i]; adev->pm.pm_display_cfg.displays[i].controller_id = dc_cfg->pipe_idx + 1; + adev->pm.pm_display_cfg.displays[i].pixel_clock = dc_cfg->pixel_clock; } amdgpu_dpm_display_configuration_change(adev, &adev->pm.pm_display_cfg); diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c index fb2f154f4fda..bce53ab36f3e 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c @@ -164,7 +164,7 @@ void dce110_fill_display_configs( stream->link->cur_link_settings.link_rate; cfg->link_settings.link_spread = stream->link->cur_link_settings.link_spread; - cfg->sym_clock = stream->phy_pix_clk; + cfg->pixel_clock = stream->phy_pix_clk; /* Round v_refresh*/ cfg->v_refresh = stream->timing.pix_clk_100hz * 100; cfg->v_refresh /= stream->timing.h_total; diff --git a/drivers/gpu/drm/amd/display/dc/dm_services_types.h b/drivers/gpu/drm/amd/display/dc/dm_services_types.h index b52ba6ffabe1..954b3aa65adb 100644 --- a/drivers/gpu/drm/amd/display/dc/dm_services_types.h +++ b/drivers/gpu/drm/amd/display/dc/dm_services_types.h @@ -127,7 +127,7 @@ struct dm_pp_single_disp_config { uint32_t src_height; uint32_t src_width; uint32_t v_refresh; - uint32_t sym_clock; /* HDMI only */ + uint32_t pixel_clock; /* Pixel clock in KHz (for HDMI only: normalized) */ struct dc_link_settings link_settings; /* DP only */ }; diff --git a/drivers/gpu/drm/amd/include/dm_pp_interface.h b/drivers/gpu/drm/amd/include/dm_pp_interface.h index 1d93a0c574c9..ee4212cc93d1 100644 --- a/drivers/gpu/drm/amd/include/dm_pp_interface.h +++ b/drivers/gpu/drm/amd/include/dm_pp_interface.h @@ -66,6 +66,7 @@ struct single_display_configuration uint32_t view_resolution_cy; enum amd_pp_display_config_type displayconfigtype; uint32_t vertical_refresh; /* for active display */ + uint32_t pixel_clock; /* Pixel clock in KHz (for HDMI only: normalized) */ }; #define MAX_NUM_DISPLAY 32 -- 2.53.0