From nobody Tue Dec 16 14:09:01 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E34C6C4167B for ; Fri, 1 Dec 2023 10:40:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378335AbjLAKkg (ORCPT ); Fri, 1 Dec 2023 05:40:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378327AbjLAKka (ORCPT ); Fri, 1 Dec 2023 05:40:30 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A6C1F4 for ; Fri, 1 Dec 2023 02:40:37 -0800 (PST) Received: from IcarusMOD.eternityproject.eu (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id D36D2660739E; Fri, 1 Dec 2023 10:40:34 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701427235; bh=UHGGjWyb9Jp3JfckcC+Y+MAj83qpLoBpUbGcBQKDZUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E2HspznzDqvZveaKtQCiSgbNtBfMVi5xErnFeKQeQWsKSAcFYgQ7R5SOSX3QxSkDY y8WkRuiZ+oZLA2YRoeh2XpgT2Eho8+nCejD6C37b1+KnyOUVMWRXUhNROxOehZ9h6y Ezto/k+yNQqDVxNe8S6COFqRLXDBDhvJJX4kOah/jHPpjp5NgdO7qQU8vAb/8AI0sy F5v6eQeoBIewKj7CuNmNO4QdIJHjs2f+6FZHu/ZMFfcaWB7ESXxZ60cHmn29ohyAnn AGuluZZViuEzmc4zQx1X2lhLGz9HG59Q7Lf1bz0v/L2nkNMvnQBqzeDw3111D4vM5j LZEeWjlX0DWYw== From: AngeloGioacchino Del Regno To: boris.brezillon@collabora.com Cc: robh@kernel.org, steven.price@arm.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, angelogioacchino.delregno@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com, m.szyprowski@samsung.com, krzysztof.kozlowski@linaro.org Subject: [PATCH v3 2/3] drm/panfrost: Add gpu_irq, mmu_irq to struct panfrost_device Date: Fri, 1 Dec 2023 11:40:26 +0100 Message-ID: <20231201104027.35273-3-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231201104027.35273-1-angelogioacchino.delregno@collabora.com> References: <20231201104027.35273-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Boris Brezillon Reviewed-by: Steven Price --- 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/p= anfrost/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; =20 void __iomem *iomem; struct clk *clock; diff --git a/drivers/gpu/drm/panfrost/panfrost_gpu.c b/drivers/gpu/drm/panf= rost/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 *pfd= ev) =20 int panfrost_gpu_init(struct panfrost_device *pfdev) { - int err, irq; + int err; =20 err =3D panfrost_gpu_soft_reset(pfdev); if (err) @@ -469,11 +469,11 @@ int panfrost_gpu_init(struct panfrost_device *pfdev) =20 dma_set_max_seg_size(pfdev->dev, UINT_MAX); =20 - irq =3D platform_get_irq_byname(to_platform_device(pfdev->dev), "gpu"); - if (irq < 0) - return irq; + pfdev->gpu_irq =3D platform_get_irq_byname(to_platform_device(pfdev->dev)= , "gpu"); + if (pfdev->gpu_irq < 0) + return pfdev->gpu_irq; =20 - err =3D devm_request_irq(pfdev->dev, irq, panfrost_gpu_irq_handler, + err =3D devm_request_irq(pfdev->dev, pfdev->gpu_irq, panfrost_gpu_irq_han= dler, 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/panf= rost/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(in= t irq, void *data) =20 int panfrost_mmu_init(struct panfrost_device *pfdev) { - int err, irq; + int err; =20 - irq =3D platform_get_irq_byname(to_platform_device(pfdev->dev), "mmu"); - if (irq < 0) - return irq; + pfdev->mmu_irq =3D platform_get_irq_byname(to_platform_device(pfdev->dev)= , "mmu"); + if (pfdev->mmu_irq < 0) + return pfdev->mmu_irq; =20 - err =3D devm_request_threaded_irq(pfdev->dev, irq, + err =3D devm_request_threaded_irq(pfdev->dev, pfdev->mmu_irq, panfrost_mmu_irq_handler, panfrost_mmu_irq_handler_thread, IRQF_SHARED, KBUILD_MODNAME "-mmu", --=20 2.43.0