[PATCH] Revert "drm/amdgpu/gfx11: enable gfx pipe1 hardware support"

[Pierre-Eric Pelloux-Prayer]

Thanks Alex, the patch is:

      Acked-by: Pierre-Eric Pelloux-Prayer 
<pierre-eric.pelloux-prayer at amd.com>


Le 31/05/2024 à 19:42, Alex Deucher a écrit :
> This reverts commit 269226a8fdf2cac0e03920f9ba0d670a056af3d6.
>
> Pierre-Eric reported problems with this on his navi33.  Revert
> for now until we understand what is going wrong.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> Cc: Pierre-eric.Pelloux-prayer at amd.com
> ---
>   drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> index 72676bfbac8c..bf05ff77feb8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> @@ -50,7 +50,7 @@
>   #include "nbio_v4_3.h"
>   #include "mes_v11_0.h"
>   
> -#define GFX11_NUM_GFX_RINGS		2
> +#define GFX11_NUM_GFX_RINGS		1
>   #define GFX11_MEC_HPD_SIZE	2048
>   
>   #define RLCG_UCODE_LOADING_START_ADDRESS	0x00002000L
> @@ -1526,7 +1526,7 @@ static int gfx_v11_0_sw_init(void *handle)
>   	case IP_VERSION(11, 0, 2):
>   	case IP_VERSION(11, 0, 3):
>   		adev->gfx.me.num_me = 1;
> -		adev->gfx.me.num_pipe_per_me = 2;
> +		adev->gfx.me.num_pipe_per_me = 1;
>   		adev->gfx.me.num_queue_per_pipe = 1;
>   		adev->gfx.mec.num_mec = 2;
>   		adev->gfx.mec.num_pipe_per_mec = 4;
> @@ -1537,7 +1537,7 @@ static int gfx_v11_0_sw_init(void *handle)
>   	case IP_VERSION(11, 5, 0):
>   	case IP_VERSION(11, 5, 1):
>   		adev->gfx.me.num_me = 1;
> -		adev->gfx.me.num_pipe_per_me = 2;
> +		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;