]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Revert "drm/radeon/ci: disable mclk switching for high refresh rates (v2)"
authorGuillaume Bertholon <guillaume.bertholon@ens.fr>
Tue, 1 Feb 2022 17:11:13 +0000 (18:11 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Feb 2022 08:27:53 +0000 (09:27 +0100)
This reverts commit 0157e2a8a71978c58a7d6cfb3616ab17d9726631.

The reverted commit was backported and applied twice on the stable branch:
- First as commit 15de2e4c90b7 ("drm/radeon/ci: disable mclk switching for
high refresh rates (v2)")
- Then as commit 0157e2a8a719 ("drm/radeon/ci: disable mclk switching for
high refresh rates (v2)")

Fixes: 0157e2a8a719 ("drm/radeon/ci: disable mclk switching for high refresh rates (v2)")
Signed-off-by: Guillaume Bertholon <guillaume.bertholon@ens.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/radeon/ci_dpm.c

index 8e1bf9ed8efff80411432425a70fbed27b32a03b..c8baa06773df855c93dd18d8977af1b645191689 100644 (file)
@@ -776,12 +776,6 @@ bool ci_dpm_vblank_too_short(struct radeon_device *rdev)
        u32 vblank_time = r600_dpm_get_vblank_time(rdev);
        u32 switch_limit = pi->mem_gddr5 ? 450 : 300;
 
-       /* disable mclk switching if the refresh is >120Hz, even if the
-        * blanking period would allow it
-        */
-       if (r600_dpm_get_vrefresh(rdev) > 120)
-               return true;
-
        /* disable mclk switching if the refresh is >120Hz, even if the
         * blanking period would allow it
         */