[PATCH] drm/amdgpu: set max df perfmon to 4

[Kuehling, Felix]

Reviewed-by: Felix Kuehling <Felix.Kuehling at amd.com>

On 2019-06-20 1:18, Kim, Jonathan wrote:
> fixed df permon to 4 and remove not needed ret
>
> Change-Id: Ia9897612937e652e7f8a09c1d23bb1c0e6f3d8f7
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
>   drivers/gpu/drm/amd/amdgpu/soc15.c  | 1 -
>   2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index b227c956b8a9..c3ed09cd2678 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -732,7 +732,7 @@ struct amd_powerplay {
>   };
>   
>   #define AMDGPU_RESET_MAGIC_NUM 64
> -#define AMDGPU_MAX_DF_PERFMONS 16
> +#define AMDGPU_MAX_DF_PERFMONS 4
>   struct amdgpu_device {
>   	struct device			*dev;
>   	struct drm_device		*ddev;
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 0afbcc80ea61..014549a30446 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -1067,7 +1067,6 @@ static void soc15_doorbell_range_init(struct amdgpu_device *adev)
>   static int soc15_common_hw_init(void *handle)
>   {
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> -	int ret;
>   
>   	/* enable pcie gen2/3 link */
>   	soc15_pcie_gen3_enable(adev);