On 01/12/2023 10:40, AngeloGioacchino Del Regno wrote:
> In preparation for adding a IRQ synchronization mechanism for PM suspend
> add gpu_irq and mmu_irq variables to struct panfrost_device and change
> functions panfrost_gpu_init() and panfrost_mmu_init() to use those.
> 
> Signed-off-by: AngeloGioacchino Del Regno 
> <angelogioacchino.delre...@collabora.com>

Reviewed-by: Steven Price <steven.pr...@arm.com>

Although this now makes the job IRQ look out of place - I'm not sure why
we have the struct panfrost_job_slot as a separately allocated structure
either. Anyway - that's irrelevant to this patch!

Steve

> ---
>  drivers/gpu/drm/panfrost/panfrost_device.h |  2 ++
>  drivers/gpu/drm/panfrost/panfrost_gpu.c    | 10 +++++-----
>  drivers/gpu/drm/panfrost/panfrost_mmu.c    | 10 +++++-----
>  3 files changed, 12 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h 
> b/drivers/gpu/drm/panfrost/panfrost_device.h
> index 0fc558db6bfd..54a8aad54259 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_device.h
> +++ b/drivers/gpu/drm/panfrost/panfrost_device.h
> @@ -94,6 +94,8 @@ struct panfrost_device {
>       struct device *dev;
>       struct drm_device *ddev;
>       struct platform_device *pdev;
> +     int gpu_irq;
> +     int mmu_irq;
>  
>       void __iomem *iomem;
>       struct clk *clock;
> diff --git a/drivers/gpu/drm/panfrost/panfrost_gpu.c 
> b/drivers/gpu/drm/panfrost/panfrost_gpu.c
> index bd41617c5e4b..7adc4441fa14 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_gpu.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_gpu.c
> @@ -454,7 +454,7 @@ void panfrost_gpu_power_off(struct panfrost_device *pfdev)
>  
>  int panfrost_gpu_init(struct panfrost_device *pfdev)
>  {
> -     int err, irq;
> +     int err;
>  
>       err = panfrost_gpu_soft_reset(pfdev);
>       if (err)
> @@ -469,11 +469,11 @@ int panfrost_gpu_init(struct panfrost_device *pfdev)
>  
>       dma_set_max_seg_size(pfdev->dev, UINT_MAX);
>  
> -     irq = platform_get_irq_byname(to_platform_device(pfdev->dev), "gpu");
> -     if (irq < 0)
> -             return irq;
> +     pfdev->gpu_irq = 
> platform_get_irq_byname(to_platform_device(pfdev->dev), "gpu");
> +     if (pfdev->gpu_irq < 0)
> +             return pfdev->gpu_irq;
>  
> -     err = devm_request_irq(pfdev->dev, irq, panfrost_gpu_irq_handler,
> +     err = devm_request_irq(pfdev->dev, pfdev->gpu_irq, 
> panfrost_gpu_irq_handler,
>                              IRQF_SHARED, KBUILD_MODNAME "-gpu", pfdev);
>       if (err) {
>               dev_err(pfdev->dev, "failed to request gpu irq");
> diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c 
> b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> index 846dd697c410..ac4296c1e54b 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> @@ -753,13 +753,13 @@ static irqreturn_t panfrost_mmu_irq_handler_thread(int 
> irq, void *data)
>  
>  int panfrost_mmu_init(struct panfrost_device *pfdev)
>  {
> -     int err, irq;
> +     int err;
>  
> -     irq = platform_get_irq_byname(to_platform_device(pfdev->dev), "mmu");
> -     if (irq < 0)
> -             return irq;
> +     pfdev->mmu_irq = 
> platform_get_irq_byname(to_platform_device(pfdev->dev), "mmu");
> +     if (pfdev->mmu_irq < 0)
> +             return pfdev->mmu_irq;
>  
> -     err = devm_request_threaded_irq(pfdev->dev, irq,
> +     err = devm_request_threaded_irq(pfdev->dev, pfdev->mmu_irq,
>                                       panfrost_mmu_irq_handler,
>                                       panfrost_mmu_irq_handler_thread,
>                                       IRQF_SHARED, KBUILD_MODNAME "-mmu",

Reply via email to