From: Dillon Varone <[email protected]> [WHY&HOW] Consolidate dmub fb info into a single structure to simplify translation between components.
Reviewed-by: Nicholas Kazlauskas <[email protected]> Signed-off-by: Dillon Varone <[email protected]> Signed-off-by: Chenyu Chen <[email protected]> --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 16 ++++++++++++---- .../gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 6 +++--- .../gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 6 +++--- .../gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 6 +++--- .../gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 6 +++--- .../gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 6 +++--- .../gpu/drm/amd/display/dmub/src/dmub_dcn401.c | 6 +++--- drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 3 +-- 9 files changed, 33 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 0346052f2e57..d66854e7f18f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1336,8 +1336,8 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev) /* Initialize hardware. */ memset(&hw_params, 0, sizeof(hw_params)); - hw_params.fb_base = adev->gmc.fb_start; - hw_params.fb_offset = adev->vm_manager.vram_base_offset; + hw_params.soc_fb_info.fb_base = adev->gmc.fb_start; + hw_params.soc_fb_info.fb_offset = adev->vm_manager.vram_base_offset; /* backdoor load firmware and trigger dmub running */ if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) diff --git a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h b/drivers/gpu/drm/amd/display/dmub/dmub_srv.h index 12c1f9f7115a..3b6bba017040 100644 --- a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h +++ b/drivers/gpu/drm/amd/display/dmub/dmub_srv.h @@ -307,6 +307,16 @@ struct dmub_srv_fb_info { struct dmub_fb fb[DMUB_WINDOW_TOTAL]; }; +/** + * struct dmub_soc_fb_info - relevant addresses from the frame buffer + * @fb_base: base of the framebuffer aperture + * @fb_offset: offset of the framebuffer aperture + */ +struct dmub_soc_fb_info { + uint64_t fb_base; + uint64_t fb_offset; +}; + /* * struct dmub_srv_hw_params - params for dmub hardware initialization * @fb: framebuffer info for each region @@ -317,8 +327,7 @@ struct dmub_srv_fb_info { */ struct dmub_srv_hw_params { struct dmub_fb *fb[DMUB_WINDOW_TOTAL]; - uint64_t fb_base; - uint64_t fb_offset; + struct dmub_soc_fb_info soc_fb_info; uint32_t psp_version; bool load_inst_const; bool skip_panel_power_sequence; @@ -610,8 +619,7 @@ struct dmub_srv { bool hw_init; bool dpia_supported; - uint64_t fb_base; - uint64_t fb_offset; + struct dmub_soc_fb_info soc_fb_info; uint32_t psp_version; /* Feature capabilities reported by fw */ diff --git a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c index 73888c1bea93..54df2147e4dc 100644 --- a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c +++ b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c @@ -63,9 +63,9 @@ static void dmub_dcn20_get_fb_base_offset(struct dmub_srv *dmub, { uint32_t tmp; - if (dmub->fb_base || dmub->fb_offset) { - *fb_base = dmub->fb_base; - *fb_offset = dmub->fb_offset; + if (dmub->soc_fb_info.fb_base || dmub->soc_fb_info.fb_offset) { + *fb_base = dmub->soc_fb_info.fb_base; + *fb_offset = dmub->soc_fb_info.fb_offset; return; } diff --git a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c index a4abe951c838..84a6eb3f677d 100644 --- a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c +++ b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c @@ -63,9 +63,9 @@ static void dmub_dcn30_get_fb_base_offset(struct dmub_srv *dmub, { uint32_t tmp; - if (dmub->fb_base || dmub->fb_offset) { - *fb_base = dmub->fb_base; - *fb_offset = dmub->fb_offset; + if (dmub->soc_fb_info.fb_base || dmub->soc_fb_info.fb_offset) { + *fb_base = dmub->soc_fb_info.fb_base; + *fb_offset = dmub->soc_fb_info.fb_offset; return; } diff --git a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c index cd04d7c756c3..a0cefc03b21d 100644 --- a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c +++ b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c @@ -59,9 +59,9 @@ static void dmub_dcn31_get_fb_base_offset(struct dmub_srv *dmub, { uint32_t tmp; - if (dmub->fb_base || dmub->fb_offset) { - *fb_base = dmub->fb_base; - *fb_offset = dmub->fb_offset; + if (dmub->soc_fb_info.fb_base || dmub->soc_fb_info.fb_offset) { + *fb_base = dmub->soc_fb_info.fb_base; + *fb_offset = dmub->soc_fb_info.fb_offset; return; } diff --git a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c index 7e9856289910..2f99a2772599 100644 --- a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c +++ b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c @@ -65,9 +65,9 @@ static void dmub_dcn32_get_fb_base_offset(struct dmub_srv *dmub, { uint32_t tmp; - if (dmub->fb_base || dmub->fb_offset) { - *fb_base = dmub->fb_base; - *fb_offset = dmub->fb_offset; + if (dmub->soc_fb_info.fb_base || dmub->soc_fb_info.fb_offset) { + *fb_base = dmub->soc_fb_info.fb_base; + *fb_offset = dmub->soc_fb_info.fb_offset; return; } diff --git a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c index e13557ed97be..6a2d35756c8c 100644 --- a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c +++ b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c @@ -63,9 +63,9 @@ static void dmub_dcn35_get_fb_base_offset(struct dmub_srv *dmub, uint32_t tmp; /* - if (dmub->fb_base || dmub->fb_offset) { - *fb_base = dmub->fb_base; - *fb_offset = dmub->fb_offset; + if (dmub->soc_fb_info.fb_base || dmub->soc_fb_info.fb_offset) { + *fb_base = dmub->soc_fb_info.fb_base; + *fb_offset = dmub->soc_fb_info.fb_offset; return; } */ diff --git a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c index 95542299e3b3..16ed07f0e96d 100644 --- a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c +++ b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c @@ -39,9 +39,9 @@ static void dmub_dcn401_get_fb_base_offset(struct dmub_srv *dmub, { uint32_t tmp; - if (dmub->fb_base || dmub->fb_offset) { - *fb_base = dmub->fb_base; - *fb_offset = dmub->fb_offset; + if (dmub->soc_fb_info.fb_base || dmub->soc_fb_info.fb_offset) { + *fb_base = dmub->soc_fb_info.fb_base; + *fb_offset = dmub->soc_fb_info.fb_offset; return; } diff --git a/drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c b/drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c index be893531ae7d..019eb005bba8 100644 --- a/drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c +++ b/drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c @@ -709,8 +709,7 @@ enum dmub_status dmub_srv_hw_init(struct dmub_srv *dmub, } } - dmub->fb_base = params->fb_base; - dmub->fb_offset = params->fb_offset; + memcpy(&dmub->soc_fb_info, ¶ms->soc_fb_info, sizeof(params->soc_fb_info)); dmub->psp_version = params->psp_version; if (dmub->hw_funcs.reset) -- 2.43.0
