On 2025-05-22 10:36, Aurabindo Pillai wrote:
> FAMS is the successor to SubVP starting with DCN4x. Reuse the same
> debug option to disable FAMS for debugging purposes.
>
> Signed-off-by: Aurabindo Pillai <[email protected]>
Reviewed-by: Harry Wentland <[email protected]>
Harry
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +++-
> drivers/gpu/drm/amd/include/amd_shared.h | 5 +++--
> 2 files changed, 6 insertions(+), 3 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 acb5a6baabf4..8a1bf7ab8570 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -2000,8 +2000,10 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
> if (amdgpu_dc_debug_mask & DC_FORCE_SUBVP_MCLK_SWITCH)
> adev->dm.dc->debug.force_subvp_mclk_switch = true;
>
> - if (amdgpu_dc_debug_mask & DC_DISABLE_SUBVP)
> + if (amdgpu_dc_debug_mask & DC_DISABLE_SUBVP_FAMS) {
> adev->dm.dc->debug.force_disable_subvp = true;
> + adev->dm.dc->debug.fams2_config.enable = false;
> + }
>
> if (amdgpu_dc_debug_mask & DC_ENABLE_DML2) {
> adev->dm.dc->debug.using_dml2 = true;
> diff --git a/drivers/gpu/drm/amd/include/amd_shared.h
> b/drivers/gpu/drm/amd/include/amd_shared.h
> index 31de36c9156f..11374a2cbab8 100644
> --- a/drivers/gpu/drm/amd/include/amd_shared.h
> +++ b/drivers/gpu/drm/amd/include/amd_shared.h
> @@ -351,9 +351,10 @@ enum DC_DEBUG_MASK {
> DC_DISABLE_HDMI_CEC = 0x10000,
>
> /**
> - * @DC_DISABLE_SUBVP: If set, disable DCN Sub-Viewport feature in
> amdgpu driver.
> + * @DC_DISABLE_SUBVP_FAMS: If set, disable DCN Sub-Viewport & Firmware
> Assisted
> + * Memory Clock Switching (FAMS) feature in amdgpu driver.
> */
> - DC_DISABLE_SUBVP = 0x20000,
> + DC_DISABLE_SUBVP_FAMS = 0x20000,
> /**
> * @DC_DISABLE_CUSTOM_BRIGHTNESS_CURVE: If set, disable support for
> custom brightness curves
> */
