Commit 58124bf8 authored by Jerry (Fangzhi) Zuo's avatar Jerry (Fangzhi) Zuo Committed by Alex Deucher
Browse files

drm/amd/display: Fix NULL ptr when calculating refresh rate 



Calculate preferred refresh rate only when preferred mode exists.

Signed-off-by: default avatarJerry (Fangzhi) Zuo <Jerry.Zuo@amd.com>
Reviewed-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8b955e00

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+2 −3
Original line number Diff line number Diff line
@@ -2848,7 +2848,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) {
@@ -2902,13 +2902,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