drm/amd/pp: Simplify the create of powerplay instance

use adev as input parameter to create powerplay instance
directly. delete cgs wrap layer for power play create.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index 72c9a7e2c373a610d75594eae948c3a6cbcbe356..9d6e1b08e148fe4ceeb01051f9d4d6fc303a0549 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -42,27 +42,6 @@ struct amdgpu_cgs_device {
        struct amdgpu_device *adev =                                    \
                ((struct amdgpu_cgs_device *)cgs_device)->adev
 
-static void *amdgpu_cgs_register_pp_handle(struct cgs_device *cgs_device,
-                       int (*call_back_func)(struct amd_pp_init *, void **))
-{
-       CGS_FUNC_ADEV;
-       struct amd_pp_init pp_init;
-       struct amd_powerplay *amd_pp;
-
-       if (call_back_func == NULL)
-               return NULL;
-
-       amd_pp = &(adev->powerplay);
-       pp_init.chip_family = adev->family;
-       pp_init.chip_id = adev->asic_type;
-       pp_init.pm_en = (amdgpu_dpm != 0 && !amdgpu_sriov_vf(adev)) ? true : false;
-       pp_init.feature_mask = amdgpu_pp_feature_mask;
-       pp_init.device = cgs_device;
-       if (call_back_func(&pp_init, &(amd_pp->pp_handle)))
-               return NULL;
-
-       return adev->powerplay.pp_handle;
-}
 
 static int amdgpu_cgs_alloc_gpu_mem(struct cgs_device *cgs_device,
                                    enum cgs_gpu_mem_type type,
@@ -1233,7 +1212,6 @@ static const struct cgs_ops amdgpu_cgs_ops = {
        .is_virtualization_enabled = amdgpu_cgs_is_virtualization_enabled,
        .enter_safe_mode = amdgpu_cgs_enter_safe_mode,
        .lock_grbm_idx = amdgpu_cgs_lock_grbm_idx,
-       .register_pp_handle = amdgpu_cgs_register_pp_handle,
        .set_temperature_range = amdgpu_cgs_set_temperature_range,
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index 5f5aa5fddc169355077a4e61665563c087d860f5..5c2e2d5dc1ee2ba6e0916a1abdfdd8ed53bdbeda 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@ -94,9 +94,7 @@ static int amdgpu_pp_early_init(void *handle)
        }
 
        if (adev->powerplay.ip_funcs->early_init)
-               ret = adev->powerplay.ip_funcs->early_init(
-                                       amd_pp->cgs_device ? amd_pp->cgs_device :
-                                       amd_pp->pp_handle);
+               ret = adev->powerplay.ip_funcs->early_init(adev);
 
        return ret;
 }

diff --git a/drivers/gpu/drm/amd/include/cgs_common.h b/drivers/gpu/drm/amd/include/cgs_common.h
index 98cf4cebff17ced74d652b3942ad357fb4c6d2d9..e5b4823d8ec1f4c5648084013f8f7955f263dd17 100644 (file)
--- a/drivers/gpu/drm/amd/include/cgs_common.h
+++ b/drivers/gpu/drm/amd/include/cgs_common.h
@@ -424,10 +424,6 @@ typedef int (*cgs_enter_safe_mode)(struct cgs_device *cgs_device, bool en);
 
 typedef void (*cgs_lock_grbm_idx)(struct cgs_device *cgs_device, bool lock);
 
-struct amd_pp_init;
-typedef void* (*cgs_register_pp_handle)(struct cgs_device *cgs_device,
-                       int (*call_back_func)(struct amd_pp_init *, void **));
-
 typedef int (*cgs_set_temperature_range)(struct cgs_device *cgs_device,
                                        int min_temperature,
                                        int max_temperature);
@@ -467,7 +463,6 @@ struct cgs_ops {
        cgs_is_virtualization_enabled_t is_virtualization_enabled;
        cgs_enter_safe_mode enter_safe_mode;
        cgs_lock_grbm_idx lock_grbm_idx;
-       cgs_register_pp_handle register_pp_handle;
        cgs_set_temperature_range set_temperature_range;
 };
 
@@ -547,8 +542,6 @@ struct cgs_device
 
 #define cgs_lock_grbm_idx(cgs_device, lock) \
                CGS_CALL(lock_grbm_idx, cgs_device, lock)
-#define cgs_register_pp_handle(cgs_device, call_back_func) \
-               CGS_CALL(register_pp_handle, cgs_device, call_back_func)
 
 #define cgs_set_temperature_range(dev, min_temp, max_temp)     \
        CGS_CALL(set_temperature_range, dev, min_temp, max_temp)

diff --git a/drivers/gpu/drm/amd/include/kgd_pp_interface.h b/drivers/gpu/drm/amd/include/kgd_pp_interface.h
index 22c2fa30731fab40a5aa4bfae891852948926025..666a9e343270000f5ea205c490afb33ecbe76f67 100644 (file)
--- a/drivers/gpu/drm/amd/include/kgd_pp_interface.h
+++ b/drivers/gpu/drm/amd/include/kgd_pp_interface.h
@@ -136,14 +136,6 @@ enum amd_pp_task {
        AMD_PP_TASK_MAX
 };
 
-struct amd_pp_init {
-       struct cgs_device *device;
-       uint32_t chip_family;
-       uint32_t chip_id;
-       bool pm_en;
-       uint32_t feature_mask;
-};
-
 enum PP_SMC_POWER_PROFILE {
        PP_SMC_POWER_PROFILE_FULLSCREEN3D = 0x0,
        PP_SMC_POWER_PROFILE_POWERSAVING  = 0x1,

diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
index 376ed2dd52c7e66d5f4d736d80dd602d4be021f7..4e87cfc129b44e54d67932afc8914b7bbe263dfe 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
@@ -29,6 +29,7 @@
 #include "amd_powerplay.h"
 #include "pp_instance.h"
 #include "power_state.h"
+#include "amdgpu.h"
 
 #define PP_DPM_DISABLED 0xCCCC
 
@@ -52,28 +53,30 @@ static inline int pp_check(struct pp_instance *handle)
        return 0;
 }
 
-static int amd_powerplay_create(struct amd_pp_init *pp_init,
-                               void **handle)
+static int amd_powerplay_create(struct amdgpu_device *adev)
 {
        struct pp_instance *instance;
 
-       if (pp_init == NULL || handle == NULL)
+       if (adev == NULL)
                return -EINVAL;
 
        instance = kzalloc(sizeof(struct pp_instance), GFP_KERNEL);
        if (instance == NULL)
                return -ENOMEM;
 
-       instance->chip_family = pp_init->chip_family;
-       instance->chip_id = pp_init->chip_id;
-       instance->pm_en = pp_init->pm_en;
-       instance->feature_mask = pp_init->feature_mask;
-       instance->device = pp_init->device;
+       instance->chip_family = adev->family;
+       instance->chip_id = adev->asic_type;
+       instance->pm_en = (amdgpu_dpm != 0 && !amdgpu_sriov_vf(adev)) ? true : false;
+       instance->feature_mask = amdgpu_pp_feature_mask;
+       instance->device = adev->powerplay.cgs_device;
        mutex_init(&instance->pp_lock);
-       *handle = instance;
+
+       adev->powerplay.pp_handle = instance;
+
        return 0;
 }
 
+
 static int amd_powerplay_destroy(void *handle)
 {
        struct pp_instance *instance = (struct pp_instance *)handle;
@@ -93,11 +96,14 @@ static int pp_early_init(void *handle)
 {
        int ret;
        struct pp_instance *pp_handle = NULL;
+       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-       pp_handle = cgs_register_pp_handle(handle, amd_powerplay_create);
+       ret = amd_powerplay_create(adev);
 
-       if (!pp_handle)
-               return -EINVAL;
+       if (ret != 0)
+               return ret;
+
+       pp_handle = adev->powerplay.pp_handle;
 
        ret = hwmgr_early_init(pp_handle);
        if (ret)

diff --git a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
index 152e70db4a81f1e126e081f4c5d4212c40d37436..fe36659654169dc735098b6bc9468c322d98a488 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
@@ -30,6 +30,6 @@
 #include "cgs_common.h"
 #include "dm_pp_interface.h"
 #include "kgd_pp_interface.h"
-
+#include "amdgpu.h"
 
 #endif /* _AMD_POWERPLAY_H_ */