From 1c9e2a60714961f7bf10c45d38f9c6788a730d76 Mon Sep 17 00:00:00 2001 From: Rex Zhu Date: Thu, 28 Sep 2017 16:12:51 +0800 Subject: [PATCH 1934/4131] 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. Change-Id: I7d158845b26434734b1766800f9c2cb37f209701 Reviewed-by: Alex Deucher Signed-off-by: Rex Zhu --- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 3 +-- drivers/gpu/drm/amd/powerplay/inc/pp_instance.h | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c index e443699..5d498a8 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 25fb146..7d1eec5 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; -- 2.7.4