AMD General

Looks good. Series is

Reviewed-by: Kent Russell <[email protected]>

Kent

> -----Original Message-----
> From: amd-gfx <[email protected]> On Behalf Of Alex
> Deucher
> Sent: July 7, 2026 11:42 AM
> To: [email protected]
> Cc: Deucher, Alexander <[email protected]>
> Subject: [PATCH 30/30] drm/amdgpu/gfx12.1: drop all BUG()s
>
> There's no need to crash the kernel for these cases.
>
> Signed-off-by: Alex Deucher <[email protected]>
> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
> index b73f2c7d88be5..cefc2d03f0c69 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
> @@ -891,8 +891,7 @@ static int gfx_v12_1_gpu_early_init(struct
> amdgpu_device *adev)
>               adev->gfx.config.sc_earlyz_tile_fifo_size = 0x4C0;
>               break;
>       default:
> -             BUG();
> -             break;
> +             return -EINVAL;
>       }
>
>       return 0;
> @@ -3671,13 +3670,16 @@ static u64 gfx_v12_1_ring_get_rptr_compute(struct
> amdgpu_ring *ring)
>
>  static u64 gfx_v12_1_ring_get_wptr_compute(struct amdgpu_ring *ring)
>  {
> +     struct amdgpu_device *adev = ring->adev;
>       u64 wptr;
>
>       /* XXX check if swapping is necessary on BE */
> -     if (ring->use_doorbell)
> +     if (ring->use_doorbell) {
>               wptr = atomic64_read((atomic64_t *)ring->wptr_cpu_addr);
> -     else
> -             BUG();
> +     } else {
> +             dev_warn(adev->dev, "gfx_v12_1_ring_get_wptr_compute()
> requires doorbell!\n");
> +             wptr = 0;
> +     }
>       return wptr;
>  }
>
> @@ -3691,7 +3693,7 @@ static void gfx_v12_1_ring_set_wptr_compute(struct
> amdgpu_ring *ring)
>                            ring->wptr);
>               WDOORBELL64(ring->doorbell_index, ring->wptr);
>       } else {
> -             BUG(); /* only DOORBELL method supported on gfx12 now */
> +             dev_warn(adev->dev, "gfx_v12_1_ring_set_wptr_compute()
> requires doorbell!\n");
>       }
>  }
>
> --
> 2.55.0

Reply via email to