5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roman Li roman.li@amd.com
commit 3beac533b8daa18358dabbe5059c417d192b2a93 upstream.
[Why] dc_dmub_srv_destroy() has internal null-check and null assignment. No need to duplicate them externally.
[How] Remove redundant safeguards.
Signed-off-by: Lang Yu Lang.Yu@amd.com Signed-off-by: Roman Li roman.li@amd.com Reviewed-by: Nicholas Kazlauskas Nicholas.Kazlauskas@amd.com Acked-by: Qingqing Zhuo qingqing.zhuo@amd.com Tested-by: Daniel Wheeler daniel.wheeler@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com Signed-off-by: Eslam Khafagy eslam.medhat1993@gmail.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1141,10 +1141,8 @@ static void amdgpu_dm_fini(struct amdgpu if (adev->dm.dc) dc_deinit_callbacks(adev->dm.dc); #endif - if (adev->dm.dc->ctx->dmub_srv) { - dc_dmub_srv_destroy(&adev->dm.dc->ctx->dmub_srv); - adev->dm.dc->ctx->dmub_srv = NULL; - } + + dc_dmub_srv_destroy(&adev->dm.dc->ctx->dmub_srv);
if (adev->dm.dmub_bo) amdgpu_bo_free_kernel(&adev->dm.dmub_bo,