drm/amdgpu/pp/smu7: drop unused values in smu data structure

use kaddr directly rather than secondary variable.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
index 9f407c48d4f0d4775c6c3dd8943591c19e22331e..0f11c5341c4951fe74069e13b5d55e7cf57338c8 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
@@ -422,7 +422,7 @@ int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr)
                           + UCODE_ID_CP_MEC_JT2_MASK;
        }
 
-       toc = (struct SMU_DRAMData_TOC *)smu_data->header;
+       toc = (struct SMU_DRAMData_TOC *)smu_data->header_buffer.kaddr;
        toc->structure_version = 1;
 
        PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
@@ -591,7 +591,6 @@ int smu7_init(struct pp_hwmgr *hwmgr)
        if (r)
                return -EINVAL;
 
-       smu_data->header = smu_data->header_buffer.kaddr;
        smu_data->header_buffer.mc_addr = mc_addr;
 
        if (!hwmgr->not_vf)

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h
index 39c9bfda0ab416665864c47b66f29c25c0c6f5fe..e6def283b731125d209a28e7da2cd254862c16e1 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h
@@ -37,8 +37,6 @@ struct smu7_buffer_entry {
 };
 
 struct smu7_smumgr {
-       uint8_t *header;
-       uint8_t *mec_image;
        struct smu7_buffer_entry smu_buffer;
        struct smu7_buffer_entry header_buffer;