On Tue, Apr 4, 2017 at 4:50 PM, Alex Xie <AlexBin.Xie at amd.com> wrote:
> Change-Id: I1266af0697146369c9fb720b241bfa02280571c9
> Signed-off-by: Alex Xie <AlexBin.Xie at amd.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++
> drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 ------
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index 86fba1a..02ee712 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1905,12 +1905,14 @@ void amdgpu_program_register_sequence(struct amdgpu_device *adev,
> bool amdgpu_has_atpx_dgpu_power_cntl(void);
> bool amdgpu_is_atpx_hybrid(void);
> bool amdgpu_atpx_dgpu_req_power_for_displays(void);
> +bool amdgpu_has_atpx(void);
> #else
> static inline void amdgpu_register_atpx_handler(void) {}
> static inline void amdgpu_unregister_atpx_handler(void) {}
> static inline bool amdgpu_has_atpx_dgpu_power_cntl(void) { return false; }
> static inline bool amdgpu_is_atpx_hybrid(void) { return false; }
> static inline bool amdgpu_atpx_dgpu_req_power_for_displays(void) { return false; }
> +static inline bool amdgpu_has_atpx(void) { return false; }
> #endif
>
> /*
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index a2f2b7f..f8d8636 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> @@ -36,12 +36,6 @@
> #include <linux/pm_runtime.h>
> #include "amdgpu_amdkfd.h"
>
> -#if defined(CONFIG_VGA_SWITCHEROO)
> -bool amdgpu_has_atpx(void);
> -#else
> -static inline bool amdgpu_has_atpx(void) { return false; }
> -#endif
> -
> /**
> * amdgpu_driver_unload_kms - Main unload function for KMS.
> *
> --
> 1.9.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
