[PATCH 12/18] drm/amdgpu: fix GFX6 variables for sid.h cleanup

[Alex Deucher]

On Mon, Mar 17, 2025 at 2:08 AM Alexandre Demers
<alexandre.f.demers at gmail.com> wrote:
>

Please include a patch description.  Is this just whitespace changes?

Alex

> Signed-off-by: Alexandre Demers <alexandre.f.demers at gmail.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> index 5f85c3b63971..f34980c79a7e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> @@ -1731,10 +1731,14 @@ static void gfx_v6_0_constants_init(struct amdgpu_device *adev)
>         gfx_v6_0_get_cu_info(adev);
>         gfx_v6_0_config_init(adev);
>
> -       WREG32(mmCP_QUEUE_THRESHOLDS, ((0x16 << CP_QUEUE_THRESHOLDS__ROQ_IB1_START__SHIFT) |
> -                                      (0x2b << CP_QUEUE_THRESHOLDS__ROQ_IB2_START__SHIFT)));
> -       WREG32(mmCP_MEQ_THRESHOLDS, (0x30 << CP_MEQ_THRESHOLDS__MEQ1_START__SHIFT) |
> -                                   (0x60 << CP_MEQ_THRESHOLDS__MEQ2_START__SHIFT));
> +       WREG32(mmCP_QUEUE_THRESHOLDS,
> +               ((0x16 << CP_QUEUE_THRESHOLDS__ROQ_IB1_START__SHIFT) |
> +               (0x2b << CP_QUEUE_THRESHOLDS__ROQ_IB2_START__SHIFT)));
> +
> +       /* set HW defaults for 3D engine */
> +       WREG32(mmCP_MEQ_THRESHOLDS,
> +               (0x30 << CP_MEQ_THRESHOLDS__MEQ1_START__SHIFT) |
> +               (0x60 << CP_MEQ_THRESHOLDS__MEQ2_START__SHIFT));
>
>         sx_debug_1 = RREG32(mmSX_DEBUG_1);
>         WREG32(mmSX_DEBUG_1, sx_debug_1);
> --
> 2.48.1
>