From: Aric Cyr aric.cyr@amd.com
[ Upstream commit 2b63d0ec0daf79ba503fa8bfa25e07dc3da274f3 ]
[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 Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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 793c0cec407f9..5fcffb29317e3 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c @@ -398,7 +398,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,