[PATCH] drm/amdgpu: remove DRM_AMD_POWERPLAY

Edward O'Callaghan funfunctor at folklore1984.net
Thu Sep 29 00:13:14 UTC 2016


Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net>

On 09/29/2016 06:42 AM, Alex Deucher wrote:
> Powerplay is no longer optional after the recently cleanups
> 
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/Kconfig            |  1 -
>  drivers/gpu/drm/amd/amdgpu/Makefile           |  4 ----
>  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c       |  2 --
>  drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 13 +------------
>  drivers/gpu/drm/amd/powerplay/Kconfig         |  6 ------
>  5 files changed, 1 insertion(+), 25 deletions(-)
>  delete mode 100644 drivers/gpu/drm/amd/powerplay/Kconfig
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig
> index 53cf397..61360e2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/Kconfig
> +++ b/drivers/gpu/drm/amd/amdgpu/Kconfig
> @@ -32,5 +32,4 @@ config DRM_AMDGPU_GART_DEBUGFS
>  	  Selecting this option creates a debugfs file to inspect the mapped
>  	  pages. Uses more memory for housekeeping, enable only for debugging.
>  
> -source "drivers/gpu/drm/amd/powerplay/Kconfig"
>  source "drivers/gpu/drm/amd/acp/Kconfig"
> diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile
> index 9ec262d..248a05d0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/Makefile
> +++ b/drivers/gpu/drm/amd/amdgpu/Makefile
> @@ -111,14 +111,10 @@ amdgpu-$(CONFIG_VGA_SWITCHEROO) += amdgpu_atpx_handler.o
>  amdgpu-$(CONFIG_ACPI) += amdgpu_acpi.o
>  amdgpu-$(CONFIG_MMU_NOTIFIER) += amdgpu_mn.o
>  
> -ifneq ($(CONFIG_DRM_AMD_POWERPLAY),)
> -
>  include $(FULL_AMD_PATH)/powerplay/Makefile
>  
>  amdgpu-y += $(AMD_POWERPLAY_FILES)
>  
> -endif
> -
>  obj-$(CONFIG_DRM_AMDGPU)+= amdgpu.o
>  
>  CFLAGS_amdgpu_trace_points.o := -I$(src)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 28c6ea8..728e8ca 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -174,7 +174,6 @@ module_param_named(sched_jobs, amdgpu_sched_jobs, int, 0444);
>  MODULE_PARM_DESC(sched_hw_submission, "the max number of HW submissions (default 2)");
>  module_param_named(sched_hw_submission, amdgpu_sched_hw_submission, int, 0444);
>  
> -#ifdef CONFIG_DRM_AMD_POWERPLAY
>  MODULE_PARM_DESC(powerplay, "Powerplay component (1 = enable, 0 = disable, -1 = auto (default))");
>  module_param_named(powerplay, amdgpu_powerplay, int, 0444);
>  
> @@ -183,7 +182,6 @@ module_param_named(powercontainment, amdgpu_powercontainment, int, 0444);
>  
>  MODULE_PARM_DESC(ppfeaturemask, "all power features enabled (default))");
>  module_param_named(ppfeaturemask, amdgpu_pp_feature_mask, int, 0444);
> -#endif
>  
>  MODULE_PARM_DESC(sclkdeepsleep, "SCLK Deep Sleep (1 = enable (default), 0 = disable)");
>  module_param_named(sclkdeepsleep, amdgpu_sclk_deep_sleep_en, int, 0444);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
> index 68ad241..7532ff8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
> @@ -42,7 +42,6 @@ static int amdgpu_powerplay_init(struct amdgpu_device *adev)
>  	amd_pp = &(adev->powerplay);
>  
>  	if (adev->pp_enabled) {
> -#ifdef CONFIG_DRM_AMD_POWERPLAY
>  		struct amd_pp_init *pp_init;
>  
>  		pp_init = kzalloc(sizeof(struct amd_pp_init), GFP_KERNEL);
> @@ -55,7 +54,6 @@ static int amdgpu_powerplay_init(struct amdgpu_device *adev)
>  		pp_init->device = amdgpu_cgs_create_device(adev);
>  		ret = amd_powerplay_init(pp_init, amd_pp);
>  		kfree(pp_init);
> -#endif
>  	} else {
>  		amd_pp->pp_handle = (void *)adev;
>  
> @@ -97,7 +95,6 @@ static int amdgpu_pp_early_init(void *handle)
>  	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>  	int ret = 0;
>  
> -#ifdef CONFIG_DRM_AMD_POWERPLAY
>  	switch (adev->asic_type) {
>  	case CHIP_POLARIS11:
>  	case CHIP_POLARIS10:
> @@ -120,9 +117,6 @@ static int amdgpu_pp_early_init(void *handle)
>  		adev->pp_enabled = false;
>  		break;
>  	}
> -#else
> -	adev->pp_enabled = false;
> -#endif
>  
>  	ret = amdgpu_powerplay_init(adev);
>  	if (ret)
> @@ -144,12 +138,11 @@ static int amdgpu_pp_late_init(void *handle)
>  		ret = adev->powerplay.ip_funcs->late_init(
>  					adev->powerplay.pp_handle);
>  
> -#ifdef CONFIG_DRM_AMD_POWERPLAY
>  	if (adev->pp_enabled && adev->pm.dpm_enabled) {
>  		amdgpu_pm_sysfs_init(adev);
>  		amdgpu_dpm_dispatch_task(adev, AMD_PP_EVENT_COMPLETE_INIT, NULL, NULL);
>  	}
> -#endif
> +
>  	return ret;
>  }
>  
> @@ -162,10 +155,8 @@ static int amdgpu_pp_sw_init(void *handle)
>  		ret = adev->powerplay.ip_funcs->sw_init(
>  					adev->powerplay.pp_handle);
>  
> -#ifdef CONFIG_DRM_AMD_POWERPLAY
>  	if (adev->pp_enabled)
>  		adev->pm.dpm_enabled = true;
> -#endif
>  
>  	return ret;
>  }
> @@ -216,7 +207,6 @@ static int amdgpu_pp_hw_fini(void *handle)
>  
>  static void amdgpu_pp_late_fini(void *handle)
>  {
> -#ifdef CONFIG_DRM_AMD_POWERPLAY
>  	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>  
>  	if (adev->pp_enabled) {
> @@ -227,7 +217,6 @@ static void amdgpu_pp_late_fini(void *handle)
>  	if (adev->powerplay.ip_funcs->late_fini)
>  		adev->powerplay.ip_funcs->late_fini(
>  			  adev->powerplay.pp_handle);
> -#endif
>  }
>  
>  static int amdgpu_pp_suspend(void *handle)
> diff --git a/drivers/gpu/drm/amd/powerplay/Kconfig b/drivers/gpu/drm/amd/powerplay/Kconfig
> deleted file mode 100644
> index af38033..0000000
> --- a/drivers/gpu/drm/amd/powerplay/Kconfig
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -config DRM_AMD_POWERPLAY
> -	bool  "Enable AMD powerplay component"
> -	depends on DRM_AMDGPU
> -	default n
> -	help
> -	  select this option will enable AMD powerplay component.
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20160929/13804951/attachment.sig>


More information about the amd-gfx mailing list