Received: by 2002:a05:7412:419a:b0:f3:1519:9f41 with SMTP id i26csp3811754rdh; Tue, 28 Nov 2023 04:46:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IGufZK9F3xx3us/eoRUb052Q5NTMtrIwnOwzO8tfqUcrjkrqiS9mTglGC8wVLXDmzHIUr5/ X-Received: by 2002:a17:90a:1dd:b0:285:9940:1bac with SMTP id 29-20020a17090a01dd00b0028599401bacmr13263392pjd.2.1701175562391; Tue, 28 Nov 2023 04:46:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701175562; cv=none; d=google.com; s=arc-20160816; b=ZQMXTd+d9bB/4TgSvgz7TWKUmdQINv8fxqlAuULIPRzAGPkidWZOp5EUig0cxFOeRJ NLusjk1e99AKaM8DiZZFearA0S6wzc+9VE50EM2O1yoGh+tBvq+FjGQCaP8dhS4X2Mb2 TYs9ihV1lRwWkrM4MCj821dTwSmksvRXU1+3yAbcuraFdtwYT0/1VqKDaM0bPbrAm1Xe XKZ52kh2nLyJb08+oECOFVwDeAdOoliLtf7916DVw92YQ3lEtZyaSyemYa5X7H4J7sSE /BXKXvcMNqVT/tGJKDIRr708oLai2/23p3tuBps7+BCzhEQuPacFZxeUnKw2xCOvhRVc kz1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OCGlz168BgHSOYGDPdA1jt51fcKRHgy2WdJOgK4eAWA=; fh=VZHXHo+vwBqT7vOg4dFYBUvOBDmtIVtwH9XG5mvsu+Q=; b=CVJeiN83kVx9vXOfjrGBfQosPjpw/rMzrQkeoh8m5HG8RE0DhdvhQgSvCQgFbU3ygA ngkzPx+YqLIq+qMEZpsOvJ5G6jyPKTACXakimBVI4NCQAmUCu/2Jg7GtHusABxc2N4Q2 FS4KL0xp2lJJL4rXoM0CyMeonSl64ISqgsCJFe5zexHkxDoLp1lVxX58oJV0IIMVhPjb ayRQlFT0/xAsUPY0mWCUmZBnVCqfg2hFM7BajOzD5LOlHgNokVE3elDSwCQ/A+jbwJrQ I3vb8pKqVIRcbnqi/ZJQO+JFQwNoICAPyDfK9cpQoFQ/TDBHrF3Ysj+U1XRJi5h4/QUt c/hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Ay8pftW9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Return-Path: Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id go14-20020a17090b03ce00b00280664dd1f4si11771459pjb.9.2023.11.28.04.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 04:46:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Ay8pftW9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 1A22380AD508; Tue, 28 Nov 2023 04:45:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344421AbjK1MpR (ORCPT + 99 others); Tue, 28 Nov 2023 07:45:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344682AbjK1MpO (ORCPT ); Tue, 28 Nov 2023 07:45:14 -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 807BDD51 for ; Tue, 28 Nov 2023 04:45:20 -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 2FAE766072E7; Tue, 28 Nov 2023 12:45:18 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701175519; bh=ZMbtd9WMiupIkiGjSbJtW0qTs1q9H3A+O0vlIJhbcWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ay8pftW9nEj5jELP6u1hSJNKi7DxYPH+ekBVtWYd0QA11aqkkpyerpACMcAlKyXmX tFbXDMpnh3MSTceU3YAxlKZtI5ELVV/nEenPgwvTEeEdJVY4mEbxfvEtNvIcI2fzRy mEqpNr5lFN2eVE6hjVbyOkMsQ5iorXRFC/yZ69/8uX76lbDSIZYhBDQGsr/PJih7iA P7kj7HA8DngAvRRuLu5uMHxOEGuP1Ee6ETOn21WeC36ogFb4uTg32zp3wCGMkQzzvG yamOoYZOXVAHhtlGeVOmcAcK1ARCOm8Ye8mg8OV0Y+7d3V7M9BBBkRiwmvt2DcF6tf 3hyGpjpfMH5sg== 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 v2 2/3] drm/panfrost: Add gpu_irq, mmu_irq to struct panfrost_device Date: Tue, 28 Nov 2023 13:45:09 +0100 Message-ID: <20231128124510.391007-3-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231128124510.391007-1-angelogioacchino.delregno@collabora.com> References: <20231128124510.391007-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 28 Nov 2023 04:45:42 -0800 (PST) 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 --- 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", -- 2.42.0