drm/panfrost: Add gpu_irq, mmu_irq to struct panfrost_device

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.

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231204114215.54575-3-angelogioacchino.delregno@collabora.com

diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h
index 0fc558db6bfd5713d28e799d1d4e64ea96afbada..54a8aad54259e374ae250b438419124c8bd4d4f3 100644 (file)
--- 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 bd41617c5e4bd5289a6fcdb909a4a783cb90931f..7adc4441fa1474ebd4aa593d5f820768e719ecc3 100644 (file)
--- 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 846dd697c4106b091439c245e09069b691b51705..ac4296c1e54b9c65ba71e59fdaf4ff17778b1c04 100644 (file)
--- 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",