On Thu, Mar 22, 2018 at 7:40 AM, Rex Zhu <Rex.Zhu at amd.com> wrote:
> Change-Id: If90e946b915a30e14123f9892f12ddcf6c653095
> Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>
Please include a patch description. E.g.,
Drop cgs wrappers that are no longer uses.
With that fixed:
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 30 ----------------------
> drivers/gpu/drm/amd/include/cgs_common.h | 19 +-------------
> .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 14 ++--------
> drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 2 +-
> 4 files changed, 4 insertions(+), 61 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
> index 71a57b2..1da6c17 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
> @@ -271,18 +271,6 @@ static uint32_t fw_type_convert(struct cgs_device *cgs_device, uint32_t fw_type)
> return result;
> }
>
> -static int amdgpu_cgs_rel_firmware(struct cgs_device *cgs_device, enum cgs_ucode_id type)
> -{
> - CGS_FUNC_ADEV;
> - if ((CGS_UCODE_ID_SMU == type) || (CGS_UCODE_ID_SMU_SK == type)) {
> - release_firmware(adev->pm.fw);
> - adev->pm.fw = NULL;
> - return 0;
> - }
> - /* cannot release other firmware because they are not created by cgs */
> - return -EINVAL;
> -}
> -
> static uint16_t amdgpu_get_firmware_version(struct cgs_device *cgs_device,
> enum cgs_ucode_id type)
> {
> @@ -598,11 +586,6 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
> return 0;
> }
>
> -static int amdgpu_cgs_is_virtualization_enabled(void *cgs_device)
> -{
> - CGS_FUNC_ADEV;
> - return amdgpu_sriov_vf(adev);
> -}
>
> static int amdgpu_cgs_get_active_displays_info(struct cgs_device *cgs_device,
> struct cgs_display_info *info)
> @@ -661,16 +644,6 @@ static int amdgpu_cgs_get_active_displays_info(struct cgs_device *cgs_device,
> return 0;
> }
>
> -
> -static int amdgpu_cgs_notify_dpm_enabled(struct cgs_device *cgs_device, bool enabled)
> -{
> - CGS_FUNC_ADEV;
> -
> - adev->pm.dpm_enabled = enabled;
> -
> - return 0;
> -}
> -
> static const struct cgs_ops amdgpu_cgs_ops = {
> .read_register = amdgpu_cgs_read_register,
> .write_register = amdgpu_cgs_write_register,
> @@ -681,12 +654,9 @@ static int amdgpu_cgs_notify_dpm_enabled(struct cgs_device *cgs_device, bool ena
> .atom_get_cmd_table_revs = amdgpu_cgs_atom_get_cmd_table_revs,
> .atom_exec_cmd_table = amdgpu_cgs_atom_exec_cmd_table,
> .get_firmware_info = amdgpu_cgs_get_firmware_info,
> - .rel_firmware = amdgpu_cgs_rel_firmware,
> .set_powergating_state = amdgpu_cgs_set_powergating_state,
> .set_clockgating_state = amdgpu_cgs_set_clockgating_state,
> .get_active_displays_info = amdgpu_cgs_get_active_displays_info,
> - .notify_dpm_enabled = amdgpu_cgs_notify_dpm_enabled,
> - .is_virtualization_enabled = amdgpu_cgs_is_virtualization_enabled,
> .enter_safe_mode = amdgpu_cgs_enter_safe_mode,
> .lock_grbm_idx = amdgpu_cgs_lock_grbm_idx,
> };
> diff --git a/drivers/gpu/drm/amd/include/cgs_common.h b/drivers/gpu/drm/amd/include/cgs_common.h
> index f2814ae..69109a0e 100644
> --- a/drivers/gpu/drm/amd/include/cgs_common.h
> +++ b/drivers/gpu/drm/amd/include/cgs_common.h
> @@ -235,9 +235,6 @@ typedef int (*cgs_get_firmware_info)(struct cgs_device *cgs_device,
> enum cgs_ucode_id type,
> struct cgs_firmware_info *info);
>
> -typedef int (*cgs_rel_firmware)(struct cgs_device *cgs_device,
> - enum cgs_ucode_id type);
> -
> typedef int(*cgs_set_powergating_state)(struct cgs_device *cgs_device,
> enum amd_ip_block_type block_type,
> enum amd_powergating_state state);
> @@ -250,10 +247,6 @@ typedef int(*cgs_get_active_displays_info)(
> struct cgs_device *cgs_device,
> struct cgs_display_info *info);
>
> -typedef int (*cgs_notify_dpm_enabled)(struct cgs_device *cgs_device, bool enabled);
> -
> -typedef int (*cgs_is_virtualization_enabled_t)(void *cgs_device);
> -
> 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);
> @@ -272,15 +265,11 @@ struct cgs_ops {
> cgs_atom_exec_cmd_table_t atom_exec_cmd_table;
> /* Firmware Info */
> cgs_get_firmware_info get_firmware_info;
> - cgs_rel_firmware rel_firmware;
> /* cg pg interface*/
> cgs_set_powergating_state set_powergating_state;
> cgs_set_clockgating_state set_clockgating_state;
> /* display manager */
> cgs_get_active_displays_info get_active_displays_info;
> - /* notify dpm enabled */
> - cgs_notify_dpm_enabled notify_dpm_enabled;
> - cgs_is_virtualization_enabled_t is_virtualization_enabled;
> cgs_enter_safe_mode enter_safe_mode;
> cgs_lock_grbm_idx lock_grbm_idx;
> };
> @@ -318,14 +307,11 @@ struct cgs_device
>
> #define cgs_get_firmware_info(dev, type, info) \
> CGS_CALL(get_firmware_info, dev, type, info)
> -#define cgs_rel_firmware(dev, type) \
> - CGS_CALL(rel_firmware, dev, type)
> #define cgs_set_powergating_state(dev, block_type, state) \
> CGS_CALL(set_powergating_state, dev, block_type, state)
> #define cgs_set_clockgating_state(dev, block_type, state) \
> CGS_CALL(set_clockgating_state, dev, block_type, state)
> -#define cgs_notify_dpm_enabled(dev, enabled) \
> - CGS_CALL(notify_dpm_enabled, dev, enabled)
> +
>
> #define cgs_get_active_displays_info(dev, info) \
> CGS_CALL(get_active_displays_info, dev, info)
> @@ -335,9 +321,6 @@ struct cgs_device
> CGS_CALL(get_pci_resource, cgs_device, resource_type, size, offset, \
> resource_base)
>
> -#define cgs_is_virtualization_enabled(cgs_device) \
> - CGS_CALL(is_virtualization_enabled, cgs_device)
> -
> #define cgs_enter_safe_mode(cgs_device, en) \
> CGS_CALL(enter_safe_mode, cgs_device, en)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
> index ae2e933..dcceadb 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
> @@ -75,8 +75,7 @@ int phm_set_power_state(struct pp_hwmgr *hwmgr,
>
> int phm_enable_dynamic_state_management(struct pp_hwmgr *hwmgr)
> {
> - int ret = 1;
> - bool enabled;
> + int ret = -EINVAL;;
> PHM_FUNC_CHECK(hwmgr);
>
> if (smum_is_dpm_running(hwmgr)) {
> @@ -87,17 +86,12 @@ int phm_enable_dynamic_state_management(struct pp_hwmgr *hwmgr)
> if (NULL != hwmgr->hwmgr_func->dynamic_state_management_enable)
> ret = hwmgr->hwmgr_func->dynamic_state_management_enable(hwmgr);
>
> - enabled = ret == 0;
> -
> - cgs_notify_dpm_enabled(hwmgr->device, enabled);
> -
> return ret;
> }
>
> int phm_disable_dynamic_state_management(struct pp_hwmgr *hwmgr)
> {
> - int ret = -1;
> - bool enabled;
> + int ret = -EINVAL;
>
> PHM_FUNC_CHECK(hwmgr);
>
> @@ -109,10 +103,6 @@ int phm_disable_dynamic_state_management(struct pp_hwmgr *hwmgr)
> if (hwmgr->hwmgr_func->dynamic_state_management_disable)
> ret = hwmgr->hwmgr_func->dynamic_state_management_disable(hwmgr);
>
> - enabled = ret == 0 ? false : true;
> -
> - cgs_notify_dpm_enabled(hwmgr->device, enabled);
> -
> return ret;
> }
>
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
> index 96a2d01..30ff8a9 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
> @@ -211,7 +211,7 @@ int hwmgr_hw_init(struct pp_hwmgr *hwmgr)
> !hwmgr->pptable_func->pptable_init ||
> !hwmgr->hwmgr_func->backend_init) {
> hwmgr->pm_en = false;
> - cgs_notify_dpm_enabled(hwmgr->device, false);
> + ((struct amdgpu_device *)hwmgr->adev)->pm.dpm_enabled = false;
> pr_info("dpm not supported \n");
> return 0;
> }
> --
> 1.9.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
