Also had to drop this one. On Mon, Jun 05, 2017 at 02:48:43PM +0200, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > This is a note to let you know that I've just added the patch titled > > drm/amd/powerplay/smu7: disable mclk switching for high refresh rates > > to the 4.9-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > The filename of the patch is: > drm-amd-powerplay-smu7-disable-mclk-switching-for-high-refresh-rates.patch > and it can be found in the queue-4.9 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > >From 2275a3a2fe9914ba6d76c8ea490da3c08342bd19 Mon Sep 17 00:00:00 2001 > From: Alex Deucher <alexander.deucher@xxxxxxx> > Date: Thu, 11 May 2017 13:57:41 -0400 > Subject: drm/amd/powerplay/smu7: disable mclk switching for high refresh rates > MIME-Version: 1.0 > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: 8bit > > From: Alex Deucher <alexander.deucher@xxxxxxx> > > commit 2275a3a2fe9914ba6d76c8ea490da3c08342bd19 upstream. > > Even if the vblank period would allow it, it still seems to > be problematic on some cards. > > bug: https://bugs.freedesktop.org/show_bug.cgi?id=96868 > > Acked-by: Christian König <christian.koenig@xxxxxxx> > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > --- > drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > @@ -2633,7 +2633,8 @@ static int smu7_apply_state_adjust_rules > > disable_mclk_switching = ((1 < info.display_count) || > disable_mclk_switching_for_frame_lock || > - smu7_vblank_too_short(hwmgr, mode_info.vblank_time_us)); > + smu7_vblank_too_short(hwmgr, mode_info.vblank_time_us) || > + (mode_info.refresh_rate > 120)); > > sclk = smu7_ps->performance_levels[0].engine_clock; > mclk = smu7_ps->performance_levels[0].memory_clock; > > > Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are > > queue-4.9/drm-amd-powerplay-smu7-add-vblank-check-for-mclk-switching-v2.patch > queue-4.9/drm-radeon-fix-vram_size-visible-values-in-drm_radeon_gem_info-ioctl.patch > queue-4.9/drm-radeon-ci-disable-mclk-switching-for-high-refresh-rates-v2.patch > queue-4.9/drm-radeon-unbreak-hpd-handling-for-r600.patch > queue-4.9/drm-amd-powerplay-smu7-disable-mclk-switching-for-high-refresh-rates.patch