From: Hansen Dsouza <Hansen.Dsouza@amd.com>
Date: Thu, 15 Aug 2024 22:45:13 +0000 (-0400)
Subject: Revert "drm/amd/display: Update to using new dccg callbacks"
X-Git-Tag: v6.12-rc1~15^2~21^2~31
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=18ac82c26da45d033df7eb993139da83dd53ee68;p=linux-block.git

Revert "drm/amd/display: Update to using new dccg callbacks"

[Why]
Revert updated DCCG wrappers due to regression

[How]
This reverts commit 680458d41aa46a009909482f58358205b5c4b438.

Reviewed-by: Chris Park <chris.park@amd.com>
Signed-off-by: Hansen Dsouza <Hansen.Dsouza@amd.com>
Signed-off-by: Roman Li <roman.li@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c b/drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c
index 004c4fe3ddfc..7f91e48902e2 100644
--- a/drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c
+++ b/drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c
@@ -2396,11 +2396,11 @@ struct dccg *dccg35_create(
 	(void)&dccg35_disable_symclk_be_new;
 	(void)&dccg35_set_symclk32_le_root_clock_gating;
 	(void)&dccg35_set_smclk32_se_rcg;
-	(void)&dccg35_funcs;
+	(void)&dccg35_funcs_new;
 
 	base = &dccg_dcn->base;
 	base->ctx = ctx;
-	base->funcs = &dccg35_funcs_new;
+	base->funcs = &dccg35_funcs;
 
 	dccg_dcn->regs = regs;
 	dccg_dcn->dccg_shift = dccg_shift;