From: Aric Cyr <aric.cyr@amd.com>
Date: Wed, 22 Jan 2020 03:50:13 +0000 (-0500)
Subject: drm/amd/display: Check engine is not NULL before acquiring
X-Git-Tag: baikal/mips/sdk5.9~14283^2~1^2~12
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=4e7981b0285e29e046d8ad26fd27ae48105e572b;p=kernel.git

drm/amd/display: Check engine is not NULL before acquiring

[Why]
Engine can be NULL in some cases, so we must not acquire it.

[How]
Check for NULL engine before acquiring.

Signed-off-by: Aric Cyr <aric.cyr@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
index f1a5d2c6aa378..68c4049cbc2ad 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
@@ -400,7 +400,7 @@ static bool acquire(
 {
 	enum gpio_result result;
 
-	if (!is_engine_available(engine))
+	if ((engine == NULL) || !is_engine_available(engine))
 		return false;
 
 	result = dal_ddc_open(ddc, GPIO_MODE_HARDWARE,