From: Alex Deucher Date: Fri, 30 Jun 2017 13:58:34 +0000 (-0400) Subject: drm/amdgpu/cgs: always set reference clock in mode_info X-Git-Tag: v4.12.4~109 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f64c0826e5c96e649545404067a3d703f8b9089c;p=thirdparty%2Fkernel%2Fstable.git drm/amdgpu/cgs: always set reference clock in mode_info commit 73cc90798ff765341a1d9c2cfe18153ab231c9bb upstream. It's relevent regardless of whether there are displays enabled. Fixes garbage values for ref clock in powerplay leading to incorrect fan speed reporting when displays are disabled. bug: https://bugs.freedesktop.org/show_bug.cgi?id=101653 Acked-by: Christian König Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c index 8b8eda7d1703d..c0a806280257c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c @@ -838,9 +838,12 @@ static int amdgpu_cgs_get_active_displays_info(struct cgs_device *cgs_device, return -EINVAL; mode_info = info->mode_info; - if (mode_info) + if (mode_info) { /* if the displays are off, vblank time is max */ mode_info->vblank_time_us = 0xffffffff; + /* always set the reference clock */ + mode_info->ref_clock = adev->clock.spll.reference_freq; + } if (adev->mode_info.num_crtc && adev->mode_info.mode_config_initialized) { list_for_each_entry(crtc,