Revert "drm/amd/display: Fix incorrect pointer assignment"

This reverts commit 0a571e8657c40047e6602466abfcb6514a391041.

[Why]
The change being reverted incorrectly assumes that a pointer type was
intended, however copying to a new structure is correct. As well, there
is no compiler error, it was instead an error in the testing framework
being used.

Reviewed-by: Chaitanya Dhere <chaitanya.dhere@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Joshua Aberback <joshua.aberback@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/core/dc_state.c b/drivers/gpu/drm/amd/display/dc/core/dc_state.c
index 7f5d5545ae081d735b4fab207d72ce428332a745..70928223b64221f27e34240479147bbb426ab75d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_state.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_state.c
@@ -193,7 +193,7 @@ static void init_state(struct dc *dc, struct dc_state *state)
 struct dc_state *dc_state_create(struct dc *dc, struct dc_state_create_params *params)
 {
 #ifdef CONFIG_DRM_AMD_DC_FP
-       struct dml2_configuration_options *dml2_opt = &dc->dml2_options;
+       struct dml2_configuration_options dml2_opt = dc->dml2_options;
 #endif
        struct dc_state *state = kvzalloc(sizeof(struct dc_state),
                        GFP_KERNEL);
@@ -207,11 +207,11 @@ struct dc_state *dc_state_create(struct dc *dc, struct dc_state_create_params *p
 
 #ifdef CONFIG_DRM_AMD_DC_FP
        if (dc->debug.using_dml2) {
-               dml2_opt->use_clock_dc_limits = false;
-               dml2_create(dc, dml2_opt, &state->bw_ctx.dml2);
+               dml2_opt.use_clock_dc_limits = false;
+               dml2_create(dc, &dml2_opt, &state->bw_ctx.dml2);
 
-               dml2_opt->use_clock_dc_limits = true;
-               dml2_create(dc, dml2_opt, &state->bw_ctx.dml2_dc_power_source);
+               dml2_opt.use_clock_dc_limits = true;
+               dml2_create(dc, &dml2_opt, &state->bw_ctx.dml2_dc_power_source);
        }
 #endif