From: Rex Zhu Date: Thu, 28 Sep 2017 08:12:51 +0000 (+0800) Subject: drm/amd/powerplay: delete flag PP_VALID X-Git-Tag: v4.15-rc1~56^2~24^2~33 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e1827a307e96ec51a657a2b7e68a8ffc36ae2a43;p=users%2Fhch%2Fmisc.git drm/amd/powerplay: delete flag PP_VALID don't need to check pp_valid, all pp export functions are moved to ip_funcs and pp_funcs. so just need to check the function point. Reviewed-by: Alex Deucher Signed-off-by: Rex Zhu Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c index 71bb7d932c86..3c8ef4bfc205 100644 --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c @@ -37,7 +37,7 @@ static int pp_dpm_dispatch_tasks(void *handle, enum amd_pp_task task_id, static inline int pp_check(struct pp_instance *handle) { - if (handle == NULL || handle->pp_valid != PP_VALID) + if (handle == NULL) return -EINVAL; if (handle->hwmgr == NULL || handle->hwmgr->smumgr_funcs == NULL) @@ -64,7 +64,6 @@ static int amd_powerplay_create(struct amd_pp_init *pp_init, if (instance == NULL) return -ENOMEM; - instance->pp_valid = PP_VALID; instance->chip_family = pp_init->chip_family; instance->chip_id = pp_init->chip_id; instance->pm_en = pp_init->pm_en; diff --git a/drivers/gpu/drm/amd/powerplay/inc/pp_instance.h b/drivers/gpu/drm/amd/powerplay/inc/pp_instance.h index 25fb1460a194..7d1eec5d2e7a 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/pp_instance.h +++ b/drivers/gpu/drm/amd/powerplay/inc/pp_instance.h @@ -25,10 +25,7 @@ #include "hwmgr.h" -#define PP_VALID 0x1F1F1F1F - struct pp_instance { - uint32_t pp_valid; uint32_t chip_family; uint32_t chip_id; bool pm_en;