diff options
author | Rex Zhu <Rex.Zhu@amd.com> | 2016-08-23 23:28:41 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-16 15:52:49 -0400 |
commit | b1c8e1e21f421653971c18fdafa22f2553899ca9 (patch) | |
tree | 7456ca3f2d40eabbf02bd4d2c1be7528c1d22379 | |
parent | e1aa5715f6683d486f2e14255f6e42cf0a66c4e8 (diff) |
drm/amd/powerplay: add pp_table_version in hwmgr.
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c index 2d72e06845b7..82427fb454d2 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | |||
@@ -67,6 +67,7 @@ int hwmgr_init(struct amd_pp_init *pp_init, struct pp_instance *handle) | |||
67 | hwmgr->chip_id = pp_init->chip_id; | 67 | hwmgr->chip_id = pp_init->chip_id; |
68 | hwmgr->usec_timeout = AMD_MAX_USEC_TIMEOUT; | 68 | hwmgr->usec_timeout = AMD_MAX_USEC_TIMEOUT; |
69 | hwmgr->power_source = PP_PowerSource_AC; | 69 | hwmgr->power_source = PP_PowerSource_AC; |
70 | hwmgr->pp_table_version = PP_TABLE_V1; | ||
70 | 71 | ||
71 | hwmgr_init_default_caps(hwmgr); | 72 | hwmgr_init_default_caps(hwmgr); |
72 | hwmgr_set_user_specify_caps(hwmgr); | 73 | hwmgr_set_user_specify_caps(hwmgr); |
diff --git a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h index 7caf8d071ce7..e98748344801 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +++ b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | |||
@@ -599,6 +599,13 @@ enum PP_VCE_LEVEL { | |||
599 | }; | 599 | }; |
600 | 600 | ||
601 | 601 | ||
602 | enum PP_TABLE_VERSION { | ||
603 | PP_TABLE_V0 = 0, | ||
604 | PP_TABLE_V1, | ||
605 | PP_TABLE_V2, | ||
606 | PP_TABLE_MAX | ||
607 | }; | ||
608 | |||
602 | /** | 609 | /** |
603 | * The main hardware manager structure. | 610 | * The main hardware manager structure. |
604 | */ | 611 | */ |
@@ -606,6 +613,7 @@ struct pp_hwmgr { | |||
606 | uint32_t chip_family; | 613 | uint32_t chip_family; |
607 | uint32_t chip_id; | 614 | uint32_t chip_id; |
608 | 615 | ||
616 | uint32_t pp_table_version; | ||
609 | void *device; | 617 | void *device; |
610 | struct pp_smumgr *smumgr; | 618 | struct pp_smumgr *smumgr; |
611 | const void *soft_pp_table; | 619 | const void *soft_pp_table; |