aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c4
-rw-r--r--drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c3
-rw-r--r--drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h3
-rw-r--r--drivers/gpu/drm/amd/powerplay/inc/hwmgr.h3
-rw-r--r--drivers/gpu/drm/amd/powerplay/inc/smumgr.h1
-rw-r--r--drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c1
6 files changed, 0 insertions, 15 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index 545074479e1f..ecc4141cd716 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@ -52,10 +52,6 @@ static int amdgpu_powerplay_init(struct amdgpu_device *adev)
52 pp_init->chip_family = adev->family; 52 pp_init->chip_family = adev->family;
53 pp_init->chip_id = adev->asic_type; 53 pp_init->chip_id = adev->asic_type;
54 pp_init->device = amdgpu_cgs_create_device(adev); 54 pp_init->device = amdgpu_cgs_create_device(adev);
55 pp_init->rev_id = adev->pdev->revision;
56 pp_init->sub_sys_id = adev->pdev->subsystem_device;
57 pp_init->sub_vendor_id = adev->pdev->subsystem_vendor;
58
59 ret = amd_powerplay_init(pp_init, amd_pp); 55 ret = amd_powerplay_init(pp_init, amd_pp);
60 kfree(pp_init); 56 kfree(pp_init);
61#endif 57#endif
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
index d829076ed9ea..50d465d00927 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -76,9 +76,6 @@ int hwmgr_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
76 hwmgr->device = pp_init->device; 76 hwmgr->device = pp_init->device;
77 hwmgr->chip_family = pp_init->chip_family; 77 hwmgr->chip_family = pp_init->chip_family;
78 hwmgr->chip_id = pp_init->chip_id; 78 hwmgr->chip_id = pp_init->chip_id;
79 hwmgr->hw_revision = pp_init->rev_id;
80 hwmgr->sub_sys_id = pp_init->sub_sys_id;
81 hwmgr->sub_vendor_id = pp_init->sub_vendor_id;
82 hwmgr->usec_timeout = AMD_MAX_USEC_TIMEOUT; 79 hwmgr->usec_timeout = AMD_MAX_USEC_TIMEOUT;
83 hwmgr->power_source = PP_PowerSource_AC; 80 hwmgr->power_source = PP_PowerSource_AC;
84 81
diff --git a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
index 3f8172f545b0..18f39e89a7aa 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
@@ -131,9 +131,6 @@ struct amd_pp_init {
131 struct cgs_device *device; 131 struct cgs_device *device;
132 uint32_t chip_family; 132 uint32_t chip_family;
133 uint32_t chip_id; 133 uint32_t chip_id;
134 uint32_t rev_id;
135 uint16_t sub_sys_id;
136 uint16_t sub_vendor_id;
137}; 134};
138 135
139enum amd_pp_display_config_type{ 136enum amd_pp_display_config_type{
diff --git a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
index 36b4ec9c9cb1..aca94e0cac6f 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
@@ -579,9 +579,6 @@ struct phm_microcode_version_info {
579struct pp_hwmgr { 579struct pp_hwmgr {
580 uint32_t chip_family; 580 uint32_t chip_family;
581 uint32_t chip_id; 581 uint32_t chip_id;
582 uint32_t hw_revision;
583 uint32_t sub_sys_id;
584 uint32_t sub_vendor_id;
585 582
586 void *device; 583 void *device;
587 struct pp_smumgr *smumgr; 584 struct pp_smumgr *smumgr;
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smumgr.h b/drivers/gpu/drm/amd/powerplay/inc/smumgr.h
index 3c235f0177cd..dede153afe65 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/smumgr.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/smumgr.h
@@ -74,7 +74,6 @@ struct pp_smumgr_func {
74struct pp_smumgr { 74struct pp_smumgr {
75 uint32_t chip_family; 75 uint32_t chip_family;
76 uint32_t chip_id; 76 uint32_t chip_id;
77 uint32_t hw_revision;
78 void *device; 77 void *device;
79 void *backend; 78 void *backend;
80 uint32_t usec_timeout; 79 uint32_t usec_timeout;
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
index cf3cabee8918..e6dc95d2976d 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
@@ -48,7 +48,6 @@ int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
48 smumgr->device = pp_init->device; 48 smumgr->device = pp_init->device;
49 smumgr->chip_family = pp_init->chip_family; 49 smumgr->chip_family = pp_init->chip_family;
50 smumgr->chip_id = pp_init->chip_id; 50 smumgr->chip_id = pp_init->chip_id;
51 smumgr->hw_revision = pp_init->rev_id;
52 smumgr->usec_timeout = AMD_MAX_USEC_TIMEOUT; 51 smumgr->usec_timeout = AMD_MAX_USEC_TIMEOUT;
53 smumgr->reload_fw = 1; 52 smumgr->reload_fw = 1;
54 handle->smu_mgr = smumgr; 53 handle->smu_mgr = smumgr;