[PATCH] drm/amdgpu/irq: check if nbio funcs exist

Zhang, Hawking Hawking.Zhang at amd.com
Mon Sep 2 00:21:33 UTC 2019


Reviewed-by: Hawking Zhang <Hawking.Zhang at amd.com>

Sent from my iPhone

> On Sep 1, 2019, at 13:39, Alex Deucher <alexdeucher at gmail.com> wrote:
> 
> We need to check if the nbios funcs exist before
> checking the individual pointers.
> 
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> index 3e49aa1465e2..0782f9153b60 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> @@ -156,10 +156,12 @@ irqreturn_t amdgpu_irq_handler(int irq, void *arg)
>     * register to check whether the interrupt is triggered or not, and properly
>     * ack the interrupt if it is there
>     */
> -    if (adev->nbio.funcs->handle_ras_controller_intr_no_bifring)
> +    if (adev->nbio.funcs &&
> +        adev->nbio.funcs->handle_ras_controller_intr_no_bifring)
>        adev->nbio.funcs->handle_ras_controller_intr_no_bifring(adev);
> 
> -    if (adev->nbio.funcs->handle_ras_err_event_athub_intr_no_bifring)
> +    if (adev->nbio.funcs &&
> +        adev->nbio.funcs->handle_ras_err_event_athub_intr_no_bifring)
>        adev->nbio.funcs->handle_ras_err_event_athub_intr_no_bifring(adev);
> 
>    return ret;
> -- 
> 2.20.1
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx


More information about the amd-gfx mailing list