summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Sa <daniel.sa@amd.com>2024-05-23 15:58:31 +0300
committerAlex Deucher <alexander.deucher@amd.com>2024-06-14 23:17:14 +0300
commitd9d42ebd186a3e1468ac99b327ff236acf7ba3c4 (patch)
treebaf55fe029532ed06205d8f67c0864b461516d1f
parent42697ae79e5547cf02c3861504dc51608385abac (diff)
downloadlinux-d9d42ebd186a3e1468ac99b327ff236acf7ba3c4.tar.xz
drm/amd/display: Return after Init
why: DML21 being overwritten after init. how: After initializing, early return. Reviewed-by: Dillon Varone <dillon.varone@amd.com> Acked-by: Zaeem Mohamed <zaeem.mohamed@amd.com> Signed-off-by: Daniel Sa <daniel.sa@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c b/drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c
index 17cc2fdd7d34..f5c2ab0c0d58 100644
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c
@@ -740,6 +740,7 @@ static void dml2_init(const struct dc *in_dc, const struct dml2_configuration_op
// TODO : Temporarily add DCN_VERSION_3_2 for N-1 validation. Remove DCN_VERSION_3_2 after N-1 validation phase is complete.
if ((in_dc->debug.using_dml21) && (in_dc->ctx->dce_version == DCN_VERSION_4_01 || in_dc->ctx->dce_version == DCN_VERSION_3_2)) {
dml21_reinit(in_dc, dml2, config);
+ return;
}
// Store config options