drm/amd/display: Reuse Subvp debug option for FAMS

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 <aurabindo.pillai@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 9f2e26336cccfd1ca0cafd2ff93a6d0247d107ac..1797fa85fac6a93825375d3127cb324f46fd91fe 100644 (file)
--- 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.bits.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 31de36c9156f7315d1311a55482b4436a96f76c5..11374a2cbab87eb06329b573cbf7e0bfe8a76389 100644 (file)
--- 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
         */