FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-06 11:19:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/amd/powerplay: fix segment fault issue in multi-display case.

Browse Source 
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
This commit is contained in:
Rex Zhu 2016-03-29 13:21:59 +08:00 committed by Alex Deucher
parent 72b9ff0612
commit f9e9c08e20
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
View File

@ -816,10 +816,13 @@ static int amdgpu_cgs_get_active_displays_info(void *cgs_device,
struct drm_device *ddev = adev->ddev; struct drm_device *ddev = adev->ddev;
struct drm_crtc *crtc; struct drm_crtc *crtc;
uint32_t line_time_us, vblank_lines; uint32_t line_time_us, vblank_lines;
struct cgs_mode_info *mode_info;
if (info == NULL) if (info == NULL)
return -EINVAL; return -EINVAL;
mode_info = info->mode_info;
if (adev->mode_info.num_crtc && adev->mode_info.mode_config_initialized) { if (adev->mode_info.num_crtc && adev->mode_info.mode_config_initialized) {
list_for_each_entry(crtc, list_for_each_entry(crtc,
&ddev->mode_config.crtc_list, head) { &ddev->mode_config.crtc_list, head) {
@ -828,7 +831,7 @@ static int amdgpu_cgs_get_active_displays_info(void *cgs_device,
info->active_display_mask |= (1 << amdgpu_crtc->crtc_id); info->active_display_mask |= (1 << amdgpu_crtc->crtc_id);
info->display_count++; info->display_count++;
} }
if (info->mode_info != NULL && if (mode_info != NULL &&
crtc->enabled && amdgpu_crtc->enabled && crtc->enabled && amdgpu_crtc->enabled &&
amdgpu_crtc->hw_mode.clock) { amdgpu_crtc->hw_mode.clock) {
line_time_us = (amdgpu_crtc->hw_mode.crtc_htotal * 1000) / line_time_us = (amdgpu_crtc->hw_mode.crtc_htotal * 1000) /
@ -836,10 +839,10 @@ static int amdgpu_cgs_get_active_displays_info(void *cgs_device,
vblank_lines = amdgpu_crtc->hw_mode.crtc_vblank_end - vblank_lines = amdgpu_crtc->hw_mode.crtc_vblank_end -
amdgpu_crtc->hw_mode.crtc_vdisplay + amdgpu_crtc->hw_mode.crtc_vdisplay +
(amdgpu_crtc->v_border * 2); (amdgpu_crtc->v_border * 2);
info->mode_info->vblank_time_us = vblank_lines * line_time_us; mode_info->vblank_time_us = vblank_lines * line_time_us;
info->mode_info->refresh_rate = drm_mode_vrefresh(&amdgpu_crtc->hw_mode); mode_info->refresh_rate = drm_mode_vrefresh(&amdgpu_crtc->hw_mode);
info->mode_info->ref_clock = adev->clock.spll.reference_freq; mode_info->ref_clock = adev->clock.spll.reference_freq;
info->mode_info++; mode_info = NULL;
} }
} }
} }