From: Krunoslav Kovac <Krunoslav.Kovac@amd.com>
Date: Tue, 10 Jul 2018 20:04:05 +0000 (-0400)
Subject: drm/amd/display: Null ptr check for set_sdr_white_level
X-Git-Tag: v5.4.17~5429^2~18^2~19
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ddb85fcd839cab0ac46a44d47c4f345dad4c2cb1;p=arm%2Flinux.git

drm/amd/display: Null ptr check for set_sdr_white_level

[Why&How]
Cursor boosting can only be done on DCN+
Check for nullptr since DCE doesn't implement it.

Signed-off-by: Krunoslav Kovac <Krunoslav.Kovac@amd.com>
Reviewed-by: Sivapiriyan Kumarasamy <Sivapiriyan.Kumarasamy@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
index 4717330a42f4..fdcc8ab19bf3 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
@@ -214,7 +214,8 @@ bool dc_stream_set_cursor_attributes(
 		}
 
 		core_dc->hwss.set_cursor_attribute(pipe_ctx);
-		core_dc->hwss.set_cursor_sdr_white_level(pipe_ctx);
+		if (core_dc->hwss.set_cursor_sdr_white_level)
+			core_dc->hwss.set_cursor_sdr_white_level(pipe_ctx);
 	}
 
 	if (pipe_to_program)