From b2de13946e260202562b4ce546fadad7d0893a3e Mon Sep 17 00:00:00 2001 From: "Jerry (Fangzhi) Zuo" Date: Tue, 27 Nov 2018 10:51:12 -0500 Subject: [PATCH 0871/2940] drm/amd/display: Fix NULL ptr when calculating refresh rate Calculate preferred refresh rate only when preferred mode exists. Signed-off-by: Jerry (Fangzhi) Zuo Reviewed-by: Bhawanpreet Lakha Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 e40784bc532b..650d3906f8b0 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2866,7 +2866,7 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, bool native_mode_found = false; bool scale = dm_state ? (dm_state->scaling != RMX_OFF) : false; int mode_refresh; - int preferred_refresh; + int preferred_refresh = 0; struct dc_sink *sink = NULL; if (aconnector == NULL) { @@ -2920,13 +2920,12 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, decide_crtc_timing_for_drm_display_mode( &mode, preferred_mode, dm_state ? (dm_state->scaling != RMX_OFF) : false); + preferred_refresh = drm_mode_vrefresh(preferred_mode); } if (!dm_state) drm_mode_set_crtcinfo(&mode, 0); - preferred_refresh = drm_mode_vrefresh(preferred_mode); - /* * If scaling is enabled and refresh rate didn't change * we copy the vic and polarities of the old timings -- 2.17.1