drm/amd/display: Separate set_gsl from set_gsl_source_select

[ Upstream commit 660a467a5e7366cd6642de61f1aaeaf0d253ee68 ]

[Why/How]
Separate the checks for set_gsl and set_gsl_source_select, since
source_select may not be implemented/necessary.

Reviewed-by: Nevenko Stupar <nevenko.stupar@amd.com>
Signed-off-by: Ilya Bakoulin <Ilya.Bakoulin@amd.com>
Signed-off-by: Ray Wu <ray.wu@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c
index c277df12c8172e4db9832d9fe14b71712a62f0d8..a93282d6e5a4315a9a632967cc9c211dce89ec4e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c
@@ -283,14 +283,13 @@ void dcn20_setup_gsl_group_as_lock(
        }
 
        /* at this point we want to program whether it's to enable or disable */
-       if (pipe_ctx->stream_res.tg->funcs->set_gsl != NULL &&
-               pipe_ctx->stream_res.tg->funcs->set_gsl_source_select != NULL) {
+       if (pipe_ctx->stream_res.tg->funcs->set_gsl != NULL) {
                pipe_ctx->stream_res.tg->funcs->set_gsl(
                        pipe_ctx->stream_res.tg,
                        &gsl);
-
-               pipe_ctx->stream_res.tg->funcs->set_gsl_source_select(
-                       pipe_ctx->stream_res.tg, group_idx,     enable ? 4 : 0);
+               if (pipe_ctx->stream_res.tg->funcs->set_gsl_source_select != NULL)
+                       pipe_ctx->stream_res.tg->funcs->set_gsl_source_select(
+                               pipe_ctx->stream_res.tg, group_idx, enable ? 4 : 0);
        } else
                BREAK_TO_DEBUGGER();
 }