From nobody Sat Apr 4 03:27:34 2026 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 6ADA4361679 for ; Sat, 21 Mar 2026 05:45:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774071925; cv=none; b=OWftcdzsEaY//3VM/NijBg6Gf6IZMuTgcisJDDdLnRgV22M/z3av3tW/2UPEhBioNFGINGl60y5Q4UHXrOVYEm4olQwB+I+66jeTgWl7V2Dn1hqlIuSBfjcvk+gqalYrP2o1cTxEzFC+clG2sw83kgay5mGMHa625Tc4S+Eif8U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774071925; c=relaxed/simple; bh=kNMlH2XhVonaDfaqvjgoER1rDhjPF7i5Jkwi4w8bsds=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Y+JvaoRvqTMgZ+jRp+liS8T+6xlfvX/jckPXkP7rwfLiW2BGG123ESWULXqO+CnJjd5sWRReAqv+Ki1ZsTXizHYPAB4nqKG0SgE1NvpOEKBtE5Pqs/i7dIt6VPfWjbsdyzUgSnk5djGvIdwQKRgkPMUY3IuEn7ywbnQCS0NUljk= 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=gJn0s2I1; arc=none smtp.client-ip=209.85.210.170 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="gJn0s2I1" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-82985f42664so1770062b3a.0 for ; Fri, 20 Mar 2026 22:45:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774071921; x=1774676721; 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=NjvyyKp+kerkpBKvLgO2U9Ah6zaz9YuhJLQKe3qODCg=; b=gJn0s2I1/YYVzKHlcA5Ku+c90ry3O6vz12OAc0c98ouYVN9hL3EH7KK83k/nTB2qvu 1BdU0uE9Zodc80i5qs1HWExbDlOu02m7vVm6iUzKaTmMohOnMDi4WEtD7TNQmvrw1qJ8 zvq65dvNQ4MViVJ9D8JLtrfxyZSKDu/v8Eh/Ngu1b/JAokeFLLSPoFFOYLQUUFCCXmBC AtW2ppaxmmq0LmgIJxpMqLXmpCJ/sBljyUtR2u9wEllU/A/BkyahuWhrTgSHj/D5RWB+ YbwvkZxp4NzWrV730QFkYKCCsK2mdRag5OYTXGzOVHUbcNXYJlKBUHyNq5rsqofXwb/T OT7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774071921; x=1774676721; 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=NjvyyKp+kerkpBKvLgO2U9Ah6zaz9YuhJLQKe3qODCg=; b=Ac6FNVUlzi0T7bMhKeOwoS+4qcKbQ20WnYbS85u5WZpCVE8kIhfmhut7qei2h2vq1L +FeQBon7yacx6nXW+C3AzKgI4aLSMecnEVfktPBeZOdBp3vpwEBW2+uWQr/9jm1S9H19 lbO7qvljWx67GI+1KD/DSf8ckCG3w+0+3dfJD8L8b88+Rk22SWYdnUGMf6cByfjQJjV7 ZEFKmP9nAIeEHdVCN1u6dxoJ/G0pUXH4jBkk4Aj4pA0rU/qhb3ecSbQz1HRrIB9k7nq5 5FDvnLUrW0lANx7tnLZiQneC++/gY6PytLRoGI0lXybS/jyRBheOrxGTFQLdC3axzxp0 wxLg== X-Forwarded-Encrypted: i=1; AJvYcCXfPl0tCwNdVBhZ7c4EBDgmoUR8U3fahlQtB/1tgYepHGZpF4DZsP3ze77Rkw7a7sbmL2YmsVHty0Pdr9w=@vger.kernel.org X-Gm-Message-State: AOJu0YxCUWn+ECacZv7vCwrV8W1e40U8kWD/BQZ+cGCaDiHq+lY81iDm k736+vzpssTZR4uHWvH/ELM3e07bcDdJlqF69CeQvxCKqmbGCSJ0oPbU X-Gm-Gg: ATEYQzxHCJvOAFfwDu9xFTRzNOYmSHGjWJ6aKoSGZW5RaQwVI3+K42M7rF6C7WjkQPN KazzG4RF273/faYG6h3DoRb/q4QHKnuh+f7uCEziBokursWf9gVg+sm9Vn0yPqtL9GubenlRPxQ 5mawu74Zc+hr9+3K2AvhY7rWM/MskeJI0MmiXMeDTdKiZupbLIpDBLuzKzZJJosZ/R63b3SFpG1 FuTc+QVK7xXGCzimtf0yZkvfvpaHE9atQs/vjFwHylEyYqk9zF8fPSK1AsjDhd3886V6ojtu6sW W2hXgtJV/IkT4YoN9nF6xpEDz8MH8Z4+EE5W9yumrR9d+WD2mpptJ1qKMc5Yoxytv6U8zpqJq6l HEgURUshJARPZ4uF++HZqv2OHWTZX7REviWbWj2ucL8Rlpu37Y55N3Hbhwzeq4y1w0obP1I2DRZ lSzL9xzZywAzFjUrVGlk8x8hsZ1XA8GWcXFPuDM1xQ1m0i+SVnfvQFzZh/DFjg6y3RbA== X-Received: by 2002:a05:6a00:1f0f:b0:81a:7d1e:8132 with SMTP id d2e1a72fcca58-82a8c2821a1mr4070784b3a.21.1774071920566; Fri, 20 Mar 2026 22:45:20 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 22:45:20 -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 4/4] drm/amd/pm: Use pm_display_cfg in legacy DPM (v2) Date: Fri, 20 Mar 2026 22:44:53 -0700 Message-ID: <20260321054453.19683-5-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> 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 From: Timur Krist=C3=B3f [ Upstream commit 9d73b107a61b73e7101d4b728ddac3d2c77db111 ] This commit is necessary for DC to function well with chips that use the legacy power management code, ie. SI and KV. Communicate display information from DC to the legacy PM code. Currently DC uses pm_display_cfg to communicate power management requirements from the display code to the DPM code. However, the legacy (non-DC) code path used different fields and therefore could not take into account anything from DC. Change the legacy display code to fill the same pm_display_cfg struct as DC and use the same in the legacy DPM code. To ease review and reduce churn, this commit does not yet delete the now unneeded code, that is done in the next commit. v2: Rebase. Fix single_display in amdgpu_dpm_pick_power_state. Signed-off-by: Timur Krist=C3=B3f Signed-off-by: Alex Deucher Signed-off-by: Rosen Penev --- drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c | 67 +++++++++++++++++++ .../gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h | 2 + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 4 +- .../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 6 +- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 65 ++++++------------ .../gpu/drm/amd/pm/powerplay/amd_powerplay.c | 11 +-- 6 files changed, 97 insertions(+), 58 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c b/drivers/gpu/drm= /amd/pm/amdgpu_dpm_internal.c index 2d2d2d5e6763..9ef965e4a92e 100644 --- a/drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c +++ b/drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c @@ -100,3 +100,70 @@ u32 amdgpu_dpm_get_vrefresh(struct amdgpu_device *adev) return vrefresh; } + +void amdgpu_dpm_get_display_cfg(struct amdgpu_device *adev) +{ + struct drm_device *ddev =3D adev_to_drm(adev); + struct amd_pp_display_configuration *cfg =3D &adev->pm.pm_display_cfg; + struct single_display_configuration *display_cfg; + struct drm_crtc *crtc; + struct amdgpu_crtc *amdgpu_crtc; + struct amdgpu_connector *conn; + int num_crtcs =3D 0; + int vrefresh; + u32 vblank_in_pixels, vblank_time_us; + + cfg->min_vblank_time =3D 0xffffffff; /* if the displays are off, vblank t= ime is max */ + + if (adev->mode_info.num_crtc && adev->mode_info.mode_config_initialized) { + list_for_each_entry(crtc, &ddev->mode_config.crtc_list, head) { + amdgpu_crtc =3D to_amdgpu_crtc(crtc); + + /* The array should only contain active displays. */ + if (!amdgpu_crtc->enabled) + continue; + + conn =3D to_amdgpu_connector(amdgpu_crtc->connector); + display_cfg =3D &adev->pm.pm_display_cfg.displays[num_crtcs++]; + + if (amdgpu_crtc->hw_mode.clock) { + vrefresh =3D drm_mode_vrefresh(&amdgpu_crtc->hw_mode); + + vblank_in_pixels =3D + amdgpu_crtc->hw_mode.crtc_htotal * + (amdgpu_crtc->hw_mode.crtc_vblank_end - + amdgpu_crtc->hw_mode.crtc_vdisplay + + (amdgpu_crtc->v_border * 2)); + + vblank_time_us =3D + vblank_in_pixels * 1000 / amdgpu_crtc->hw_mode.clock; + + /* The legacy (non-DC) code has issues with mclk switching + * with refresh rates over 120 Hz. Disable mclk switching. + */ + if (vrefresh > 120) + vblank_time_us =3D 0; + + /* Find minimum vblank time. */ + if (vblank_time_us < cfg->min_vblank_time) + cfg->min_vblank_time =3D vblank_time_us; + + /* Find vertical refresh rate of first active display. */ + if (!cfg->vrefresh) + cfg->vrefresh =3D vrefresh; + } + + if (amdgpu_crtc->crtc_id < cfg->crtc_index) { + /* Find first active CRTC and its line time. */ + cfg->crtc_index =3D amdgpu_crtc->crtc_id; + cfg->line_time_in_us =3D amdgpu_crtc->line_time; + } + + display_cfg->controller_id =3D amdgpu_crtc->crtc_id; + display_cfg->pixel_clock =3D conn->pixelclock_for_modeset; + } + } + + cfg->display_clk =3D adev->clock.default_dispclk; + cfg->num_display =3D num_crtcs; +} diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h b/drivers/gpu= /drm/amd/pm/inc/amdgpu_dpm_internal.h index 5c2a89f0d5d5..8be11510cd92 100644 --- a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h +++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h @@ -29,4 +29,6 @@ u32 amdgpu_dpm_get_vblank_time(struct amdgpu_device *adev= ); u32 amdgpu_dpm_get_vrefresh(struct amdgpu_device *adev); +void amdgpu_dpm_get_display_cfg(struct amdgpu_device *adev); + #endif diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c b/drivers/gpu/drm/a= md/pm/legacy-dpm/kv_dpm.c index a75c04d510fd..de25e63abc7b 100644 --- a/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c +++ b/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c @@ -2312,7 +2312,7 @@ static void kv_apply_state_adjust_rules(struct amdgpu= _device *adev, if (pi->sys_info.nb_dpm_enable) { force_high =3D (mclk >=3D pi->sys_info.nbp_memory_clock[3]) || - pi->video_start || (adev->pm.dpm.new_active_crtc_count >=3D 3) || + pi->video_start || (adev->pm.pm_display_cfg.num_display >=3D 3) || pi->disable_nb_ps3_in_battery; ps->dpm0_pg_nb_ps_lo =3D force_high ? 0x2 : 0x3; ps->dpm0_pg_nb_ps_hi =3D 0x2; @@ -2371,7 +2371,7 @@ static int kv_calculate_nbps_level_settings(struct am= dgpu_device *adev) return 0; force_high =3D ((mclk >=3D pi->sys_info.nbp_memory_clock[3]) || - (adev->pm.dpm.new_active_crtc_count >=3D 3) || pi->video_start); + (adev->pm.pm_display_cfg.num_display >=3D 3) || pi->video_start); if (force_high) { for (i =3D pi->lowest_valid; i <=3D pi->highest_valid; i++) diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c b/drivers/gpu/d= rm/amd/pm/legacy-dpm/legacy_dpm.c index 2fd97f5cf8f6..1aa435ddde9a 100644 --- a/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c +++ b/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c @@ -797,8 +797,7 @@ static struct amdgpu_ps *amdgpu_dpm_pick_power_state(st= ruct amdgpu_device *adev, int i; struct amdgpu_ps *ps; u32 ui_class; - bool single_display =3D (adev->pm.dpm.new_active_crtc_count < 2) ? - true : false; + bool single_display =3D adev->pm.pm_display_cfg.num_display < 2; /* check if the vblank period is too short to adjust the mclk */ if (single_display && adev->powerplay.pp_funcs->vblank_too_short) { @@ -1003,7 +1002,8 @@ void amdgpu_legacy_dpm_compute_clocks(void *handle) { struct amdgpu_device *adev =3D (struct amdgpu_device *)handle; - amdgpu_dpm_get_active_displays(adev); + if (!adev->dc_enabled) + amdgpu_dpm_get_display_cfg(adev); amdgpu_dpm_change_power_state_locked(adev); } diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c b/drivers/gpu/drm/a= md/pm/legacy-dpm/si_dpm.c index 0972d1a58579..064d406e9af7 100644 --- a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +++ b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c @@ -3058,7 +3058,7 @@ static int si_get_vce_clock_voltage(struct amdgpu_dev= ice *adev, static bool si_dpm_vblank_too_short(void *handle) { struct amdgpu_device *adev =3D (struct amdgpu_device *)handle; - u32 vblank_time =3D amdgpu_dpm_get_vblank_time(adev); + u32 vblank_time =3D adev->pm.pm_display_cfg.min_vblank_time; /* we never hit the non-gddr5 limit so disable it */ u32 switch_limit =3D adev->gmc.vram_type =3D=3D AMDGPU_VRAM_TYPE_GDDR5 ? = 450 : 0; @@ -3424,9 +3424,10 @@ static void rv770_get_engine_memory_ss(struct amdgpu= _device *adev) static void si_apply_state_adjust_rules(struct amdgpu_device *adev, struct amdgpu_ps *rps) { + const struct amd_pp_display_configuration *display_cfg =3D + &adev->pm.pm_display_cfg; struct si_ps *ps =3D si_get_ps(rps); struct amdgpu_clock_and_voltage_limits *max_limits; - struct amdgpu_connector *conn; bool disable_mclk_switching =3D false; bool disable_sclk_switching =3D false; u32 mclk, sclk; @@ -3475,14 +3476,9 @@ static void si_apply_state_adjust_rules(struct amdgp= u_device *adev, * For example, 4K 60Hz and 1080p 144Hz fall into this category. * Find number of such displays connected. */ - for (i =3D 0; i < adev->mode_info.num_crtc; i++) { - if (!(adev->pm.dpm.new_active_crtcs & (1 << i)) || - !adev->mode_info.crtcs[i]->enabled) - continue; - - conn =3D to_amdgpu_connector(adev->mode_info.crtcs[i]->connector); - - if (conn->pixelclock_for_modeset > 297000) + for (i =3D 0; i < display_cfg->num_display; i++) { + /* The array only contains active displays. */ + if (display_cfg->displays[i].pixel_clock > 297000) high_pixelclock_count++; } @@ -3515,7 +3511,7 @@ static void si_apply_state_adjust_rules(struct amdgpu= _device *adev, rps->ecclk =3D 0; } - if ((adev->pm.dpm.new_active_crtc_count > 1) || + if ((adev->pm.pm_display_cfg.num_display > 1) || si_dpm_vblank_too_short(adev)) disable_mclk_switching =3D true; @@ -3663,7 +3659,7 @@ static void si_apply_state_adjust_rules(struct amdgpu= _device *adev, ps->performance_levels[i].mclk, max_limits->vddc, &ps->performance_levels[i].vddc); btc_apply_voltage_dependency_rules(&adev->pm.dpm.dyn_state.vddc_dependen= cy_on_dispclk, - adev->clock.current_dispclk, + display_cfg->display_clk, max_limits->vddc, &ps->performance_levels[i].vddc); } @@ -4188,16 +4184,16 @@ static void si_program_ds_registers(struct amdgpu_d= evice *adev) static void si_program_display_gap(struct amdgpu_device *adev) { + const struct amd_pp_display_configuration *cfg =3D &adev->pm.pm_display_c= fg; u32 tmp, pipe; - int i; tmp =3D RREG32(CG_DISPLAY_GAP_CNTL) & ~(DISP1_GAP_MASK | DISP2_GAP_MASK); - if (adev->pm.dpm.new_active_crtc_count > 0) + if (cfg->num_display > 0) tmp |=3D DISP1_GAP(R600_PM_DISPLAY_GAP_VBLANK_OR_WM); else tmp |=3D DISP1_GAP(R600_PM_DISPLAY_GAP_IGNORE); - if (adev->pm.dpm.new_active_crtc_count > 1) + if (cfg->num_display > 1) tmp |=3D DISP2_GAP(R600_PM_DISPLAY_GAP_VBLANK_OR_WM); else tmp |=3D DISP2_GAP(R600_PM_DISPLAY_GAP_IGNORE); @@ -4207,17 +4203,8 @@ static void si_program_display_gap(struct amdgpu_dev= ice *adev) tmp =3D RREG32(DCCG_DISP_SLOW_SELECT_REG); pipe =3D (tmp & DCCG_DISP1_SLOW_SELECT_MASK) >> DCCG_DISP1_SLOW_SELECT_SH= IFT; - if ((adev->pm.dpm.new_active_crtc_count > 0) && - (!(adev->pm.dpm.new_active_crtcs & (1 << pipe)))) { - /* find the first active crtc */ - for (i =3D 0; i < adev->mode_info.num_crtc; i++) { - if (adev->pm.dpm.new_active_crtcs & (1 << i)) - break; - } - if (i =3D=3D adev->mode_info.num_crtc) - pipe =3D 0; - else - pipe =3D i; + if (cfg->num_display > 0 && pipe !=3D cfg->crtc_index) { + pipe =3D cfg->crtc_index; tmp &=3D ~DCCG_DISP1_SLOW_SELECT_MASK; tmp |=3D DCCG_DISP1_SLOW_SELECT(pipe); @@ -4228,7 +4215,7 @@ static void si_program_display_gap(struct amdgpu_devi= ce *adev) * This can be a problem on PowerXpress systems or if you want to use the= card * for offscreen rendering or compute if there are no crtcs enabled. */ - si_notify_smc_display_change(adev, adev->pm.dpm.new_active_crtc_count > 0= ); + si_notify_smc_display_change(adev, cfg->num_display > 0); } static void si_enable_spread_spectrum(struct amdgpu_device *adev, bool ena= ble) @@ -5533,7 +5520,7 @@ static int si_convert_power_level_to_smc(struct amdgp= u_device *adev, (pl->mclk <=3D pi->mclk_stutter_mode_threshold) && !eg_pi->uvd_enabled && (RREG32(DPG_PIPE_STUTTER_CONTROL) & STUTTER_ENABLE) && - (adev->pm.dpm.new_active_crtc_count <=3D 2)) { + (adev->pm.pm_display_cfg.num_display <=3D 2)) { level->mcFlags |=3D SISLANDS_SMC_MC_STUTTER_EN; if (gmc_pg) @@ -5685,7 +5672,7 @@ static bool si_is_state_ulv_compatible(struct amdgpu_= device *adev, /* XXX validate against display requirements! */ for (i =3D 0; i < adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.count= ; i++) { - if (adev->clock.current_dispclk <=3D + if (adev->pm.pm_display_cfg.display_clk <=3D adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[i].clk) { if (ulv->pl.vddc < adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[i].v) @@ -5839,30 +5826,22 @@ static int si_upload_ulv_state(struct amdgpu_device= *adev) static int si_upload_smc_data(struct amdgpu_device *adev) { - struct amdgpu_crtc *amdgpu_crtc =3D NULL; - int i; + const struct amd_pp_display_configuration *cfg =3D &adev->pm.pm_display_c= fg; u32 crtc_index =3D 0; u32 mclk_change_block_cp_min =3D 0; u32 mclk_change_block_cp_max =3D 0; - for (i =3D 0; i < adev->mode_info.num_crtc; i++) { - if (adev->pm.dpm.new_active_crtcs & (1 << i)) { - amdgpu_crtc =3D adev->mode_info.crtcs[i]; - break; - } - } - /* When a display is plugged in, program these so that the SMC * performs MCLK switching when it doesn't cause flickering. * When no display is plugged in, there is no need to restrict * MCLK switching, so program them to zero. */ - if (adev->pm.dpm.new_active_crtc_count && amdgpu_crtc) { - crtc_index =3D amdgpu_crtc->crtc_id; + if (cfg->num_display) { + crtc_index =3D cfg->crtc_index; - if (amdgpu_crtc->line_time) { - mclk_change_block_cp_min =3D 200 / amdgpu_crtc->line_time; - mclk_change_block_cp_max =3D 100 / amdgpu_crtc->line_time; + if (cfg->line_time_in_us) { + mclk_change_block_cp_min =3D 200 / cfg->line_time_in_us; + mclk_change_block_cp_max =3D 100 / cfg->line_time_in_us; } } diff --git a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c b/drivers/gpu= /drm/amd/pm/powerplay/amd_powerplay.c index 9bf85ca607c3..1f8b744d6b17 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +++ b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c @@ -1568,16 +1568,7 @@ static void pp_pm_compute_clocks(void *handle) struct amdgpu_device *adev =3D hwmgr->adev; if (!adev->dc_enabled) { - amdgpu_dpm_get_active_displays(adev); - adev->pm.pm_display_cfg.num_display =3D adev->pm.dpm.new_active_crtc_cou= nt; - adev->pm.pm_display_cfg.vrefresh =3D amdgpu_dpm_get_vrefresh(adev); - adev->pm.pm_display_cfg.min_vblank_time =3D amdgpu_dpm_get_vblank_time(a= dev); - /* we have issues with mclk switching with - * refresh rates over 120 hz on the non-DC code. - */ - if (adev->pm.pm_display_cfg.vrefresh > 120) - adev->pm.pm_display_cfg.min_vblank_time =3D 0; - + amdgpu_dpm_get_display_cfg(adev); pp_display_configuration_change(handle, &adev->pm.pm_display_cfg); } -- 2.53.0