[PATCH] drm/amdgpu: decline max_me for mec2_fw remove in renoir/arcturus

[Zhu, Changfeng]

[AMD Official Use Only - Internal Distribution Only]

Thanks,Ray.

BR,
Changfeng.

-----Original Message-----
From: Huang, Ray <Ray.Huang at amd.com> 
Sent: Thursday, February 25, 2021 1:42 PM
To: Zhu, Changfeng <Changfeng.Zhu at amd.com>
Cc: amd-gfx at lists.freedesktop.org; Clements, John <John.Clements at amd.com>
Subject: Re: [PATCH] drm/amdgpu: decline max_me for mec2_fw remove in renoir/arcturus

On Wed, Feb 24, 2021 at 05:10:55PM +0800, Zhu, Changfeng wrote:
> From: changzhu <Changfeng.Zhu at amd.com>
> 
> From: Changfeng <Changfeng.Zhu at amd.com>
> 
> The value of max_me in amdgpu_gfx_rlc_setup_cp_table should reduce to 
> 4 when mec2_fw is removed on asic renoir/arcturus. Or it will cause 
> kernel NULL pointer when modprobe driver.
> 
> Change-Id: I268610e85f6acd9200478d0ab1518349ff81469b
> Signed-off-by: Changfeng <Changfeng.Zhu at amd.com>

Reviewed-by: Huang Rui <ray.huang at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c 
> b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index 2f56adebbb31..300a07227597 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -1890,7 +1890,10 @@ static void gfx_v9_0_enable_lbpw(struct 
> amdgpu_device *adev, bool enable)
>  
>  static int gfx_v9_0_cp_jump_table_num(struct amdgpu_device *adev)  {
> -	return 5;
> +	if (gfx_v9_0_load_mec2_fw_bin_support(adev))
> +		return 5;
> +	else
> +		return 4;
>  }
>  
>  static int gfx_v9_0_rlc_init(struct amdgpu_device *adev)
> --
> 2.17.1
>