[PATCH 2/2] drm/amdgpu: correct MEC number for gfx11 APUs

[Liu, Aaron]

[AMD Official Use Only - General]

The series is
Reviewed-by: Aaron Liu <aaron.liu at amd.com>

> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Lang Yu
> Sent: Monday, January 16, 2023 4:20 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: Zhang, Yifan <Yifan1.Zhang at amd.com>; Yu, Lang <Lang.Yu at amd.com>;
> Koenig, Christian <Christian.Koenig at amd.com>; Du, Xiaojian
> <Xiaojian.Du at amd.com>
> Subject: [PATCH 2/2] drm/amdgpu: correct MEC number for gfx11 APUs
>
> There is only one MEC on these APUs.
>
> Signed-off-by: Lang Yu <Lang.Yu at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> index 985fe704203e..dd4e0f337f46 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> @@ -1251,10 +1251,8 @@ static int gfx_v11_0_sw_init(void *handle)
>
>       switch (adev->ip_versions[GC_HWIP][0]) {
>       case IP_VERSION(11, 0, 0):
> -     case IP_VERSION(11, 0, 1):
>       case IP_VERSION(11, 0, 2):
>       case IP_VERSION(11, 0, 3):
> -     case IP_VERSION(11, 0, 4):
>               adev->gfx.me.num_me = 1;
>               adev->gfx.me.num_pipe_per_me = 1;
>               adev->gfx.me.num_queue_per_pipe = 1;
> @@ -1262,6 +1260,15 @@ static int gfx_v11_0_sw_init(void *handle)
>               adev->gfx.mec.num_pipe_per_mec = 4;
>               adev->gfx.mec.num_queue_per_pipe = 4;
>               break;
> +     case IP_VERSION(11, 0, 1):
> +     case IP_VERSION(11, 0, 4):
> +             adev->gfx.me.num_me = 1;
> +             adev->gfx.me.num_pipe_per_me = 1;
> +             adev->gfx.me.num_queue_per_pipe = 1;
> +             adev->gfx.mec.num_mec = 1;
> +             adev->gfx.mec.num_pipe_per_mec = 4;
> +             adev->gfx.mec.num_queue_per_pipe = 4;
> +             break;
>       default:
>               adev->gfx.me.num_me = 1;
>               adev->gfx.me.num_pipe_per_me = 1;
> --
> 2.25.1