drm/amd/display: Remove unused values from psr struct

[Why]
Taking up unnecessary space.

[How]
Remove unused values from psr struct.

Signed-off-by: Wyatt Wood <wyatt.wood@amd.com>
Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
index bdf80b09277e609854e75c6b5a0339969bc5390b..59cdd8ea31fb8288c43ea838050ce0edc8630676 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
@@ -159,10 +159,6 @@ static bool dmub_psr_copy_settings(struct dmub_psr *dmub,
 
        copy_settings_data->mpcc_inst                           = pipe_ctx->plane_res.mpcc_inst;
 
-       if (pipe_ctx->plane_res.hubp)
-               copy_settings_data->hubp_inst                   = pipe_ctx->plane_res.hubp->inst;
-       else
-               copy_settings_data->hubp_inst                   = 0;
        if (pipe_ctx->plane_res.dpp)
                copy_settings_data->dpp_inst                    = pipe_ctx->plane_res.dpp->inst;
        else
@@ -178,18 +174,9 @@ static bool dmub_psr_copy_settings(struct dmub_psr *dmub,
 
        // Misc
        copy_settings_data->psr_level                           = psr_context->psr_level.u32all;
-       copy_settings_data->hyst_frames                         = psr_context->timehyst_frames;
-       copy_settings_data->hyst_lines                          = psr_context->hyst_lines;
-       copy_settings_data->phy_type                            = psr_context->phyType;
-       copy_settings_data->aux_repeat                          = psr_context->aux_repeats;
        copy_settings_data->smu_optimizations_en                = psr_context->allow_smu_optimizations;
-       copy_settings_data->skip_wait_for_pll_lock              = psr_context->skipPsrWaitForPllLock;
        copy_settings_data->frame_delay                         = psr_context->frame_delay;
-       copy_settings_data->smu_phy_id                          = psr_context->smuPhyId;
-       copy_settings_data->num_of_controllers                  = psr_context->numberOfControllers;
        copy_settings_data->frame_cap_ind                       = psr_context->psrFrameCaptureIndicationReq;
-       copy_settings_data->phy_num                             = psr_context->frame_delay & 0x7;
-       copy_settings_data->link_rate                           = psr_context->frame_delay & 0xF;
 
        dc_dmub_srv_cmd_queue(dc->dmub_srv, &cmd.psr_copy_settings.header);
        dc_dmub_srv_cmd_execute(dc->dmub_srv);

diff --git a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
index 8f518e7d8b4ec40ad91d10b97e158b64f771e0c7..0cb8967f0c45862c801dc32009c8342e0153fd78 100644 (file)
--- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
+++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
@@ -216,7 +216,6 @@ struct dmub_rb_cmd_dpphy_init {
 
 struct dmub_cmd_psr_copy_settings_data {
        uint16_t psr_level;
-       uint8_t hubp_inst;
        uint8_t dpp_inst;
        uint8_t mpcc_inst;
        uint8_t opp_inst;
@@ -225,17 +224,8 @@ struct dmub_cmd_psr_copy_settings_data {
        uint8_t digbe_inst;
        uint8_t dpphy_inst;
        uint8_t aux_inst;
-       uint8_t hyst_frames;
-       uint8_t hyst_lines;
-       uint8_t phy_num;
-       uint8_t phy_type;
-       uint8_t aux_repeat;
        uint8_t smu_optimizations_en;
-       uint8_t skip_wait_for_pll_lock;
        uint8_t frame_delay;
-       uint8_t smu_phy_id;
-       uint8_t num_of_controllers;
-       uint8_t link_rate;
        uint8_t frame_cap_ind;
 };