Received: by 2002:a05:7412:419a:b0:f3:1519:9f41 with SMTP id i26csp351977rdh; Thu, 23 Nov 2023 05:52:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IECLXnqUzTn67vTvAPIqK6Po8uDS/wOUY0nyWQ5yGaBxUoucw8+BA1xSoTEyoDaQueXYPpY X-Received: by 2002:a17:90b:384c:b0:27d:7887:ddc5 with SMTP id nl12-20020a17090b384c00b0027d7887ddc5mr6564139pjb.32.1700747521441; Thu, 23 Nov 2023 05:52:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700747521; cv=none; d=google.com; s=arc-20160816; b=WiFMkY/2QZmkxBKBaiQtcCcr9tJDZK2qJYoA7zunCH8y1THj+3qsoPsaF/UzyHTmwV nA76RoMINWH0ZE9DLZLeVCt9YmPwJAvjNKKm5X2aA4izSBxoI/R3m/EdXnfcXdjNsD7Z KHnhQH0SSNle8+3ARR403k8itCjh8UBZ6Ein3GAT6b4m4boUEIWgjjXYG/nM74v5U/KW igYC2ZmoDGhgXiTy8ntLOWeYN8fibJPQ9i5puYNUZMEwIrgdOxzHnez9rQ9S8/aLxynZ U+1U10bmbS3pBWAcVWvvQK2NfVljI0MsAk055Dc5wmORWWnKV7cbrjJJulXVO/3QN3sr ipNw== 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 :organization:references:in-reply-to:message-id:subject:cc:to:from :date:dkim-signature; bh=zUO/bDi/zNqLJTmQc4xFIIVOfMbXnv1UovbaQVpb5zY=; fh=VwElTOQhLpOBk13wcoNaxveX044TUxFJngCoF/6yyZk=; b=j3rwcR/M/AW2cSTRPyg6lBkzYlaLY7wJmas6Omu8HahVOeVfrA3v3u5abKKjiqLSzj RmAhh4gPo3H8h44TLV74RC7Ll6ACvgvDkNf4WoA78d0MgT11gdLRN9kKQvkTEn0XQvnj zBfb5p74xbS0iHxWU+DAFVCgRcclRomQrv6vQRSpXCTuwGblcFV2dcY45/OZvIoM5mA5 Uz2RxKvHaUWivxfe4cI9tHSjzUhSSgh9TGAkqCvRFF7Be7aMUdDh7TxzuGLi8vFEtYS0 IzAiR0hrtwsGvAKttE4+HGWzQX57LT53KXg0bMRf4kN1a8uVx1f1XlN3ubFBDuztAgeD MDXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=MnkCReTi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id n14-20020a17090ade8e00b002847b85bbeasi1823798pjv.150.2023.11.23.05.52.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 05:52:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=MnkCReTi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 5FC8B8088578; Thu, 23 Nov 2023 05:51:58 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345638AbjKWNvH (ORCPT + 99 others); Thu, 23 Nov 2023 08:51:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345614AbjKWNvF (ORCPT ); Thu, 23 Nov 2023 08:51:05 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1901010C1 for ; Thu, 23 Nov 2023 05:51:09 -0800 (PST) Received: from localhost (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: bbrezillon) by madras.collabora.co.uk (Postfix) with ESMTPSA id 9125266073B7; Thu, 23 Nov 2023 13:51:06 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1700747467; bh=DnXF0OkfH2bcxKLu8PbitJNBwxB6hYevVnIxk2w5rOg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=MnkCReTip92PjzcqXM0YUwuD6pn2ZdqyOpp+pyBYn/CaPkDMbztHNITo/pUQiinpa PDF0Qg8AeDQRR+anHyfExydNABXs4lPr+zcCmWwJ14xqF/5cFeZw7AV8HTVuYzfd7k 6SK+DWyrReXSeogqUKTac4BHw5e7paBAsuHyKwts19hGIdwkno3cMC1B2GK7Z/umFR 84EcrugR9Fex/SSRTgiXfzmmC19HpzAlOW5Vo+8/Xbrt/UVB0n9jEsBhG6n+Shwj/k 1yw92Cr/9DH58GSyt+zbE+Ah2oKgQ6QqdSlFd2MmYFZ63AkjEkaKPA2r0rk5GDVoVr nB4nyYInVryOw== Date: Thu, 23 Nov 2023 14:51:03 +0100 From: Boris Brezillon To: AngeloGioacchino Del Regno Cc: steven.price@arm.com, robh@kernel.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, krzysztof.kozlowski@linaro.org, kernel@collabora.com Subject: Re: [PATCH] drm/panfrost: Ignore core_mask for poweroff and sync interrupts Message-ID: <20231123145103.23b6eac9@collabora.com> In-Reply-To: <5019af46-f5ae-4db5-979e-802b61025ba4@collabora.com> References: <20231123095320.41433-1-angelogioacchino.delregno@collabora.com> <20231123113530.46191ded@collabora.com> <1740797f-f3ae-4868-924a-08d6d731e506@collabora.com> <20231123135933.34d643f7@collabora.com> <5019af46-f5ae-4db5-979e-802b61025ba4@collabora.com> Organization: Collabora X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email 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 (pete.vger.email [0.0.0.0]); Thu, 23 Nov 2023 05:51:58 -0800 (PST) On Thu, 23 Nov 2023 14:24:57 +0100 AngeloGioacchino Del Regno wrote: > >> > >> So, while I agree that it'd be slightly more readable as a diff if those > >> were two different commits I do have reasons against splitting..... > > > > If we just need a quick fix to avoid PWRTRANS interrupts from kicking > > in when we power-off the cores, I think we'd be better off dropping > > GPU_IRQ_POWER_CHANGED[_ALL] from the value we write to GPU_INT_MASK > > at [re]initialization time, and then have a separate series that fixes > > the problem more generically. > > > > But that didn't work: > https://lore.kernel.org/all/d95259b8-10cf-4ded-866c-47cbd2a44f84@linaro.org/ I meant, your 'ignore-core_mask' fix + the 'drop GPU_IRQ_POWER_CHANGED[_ALL] in GPU_INT_MASK' one. So, https://lore.kernel.org/all/4c73f67e-174c-497e-85a5-cb053ce657cb@collabora.com/ + https://lore.kernel.org/all/d95259b8-10cf-4ded-866c-47cbd2a44f84@linaro.org/ > > > ...while this "full" solution worked: > https://lore.kernel.org/all/39e9514b-087c-42eb-8d0e-f75dc620e954@linaro.org/ > > https://lore.kernel.org/all/5b24cc73-23aa-4837-abb9-b6d138b46426@linaro.org/ > > > ...so this *is* a "quick fix" already... :-) It's a half-baked solution for the missing irq-synchronization-on-suspend issue IMHO. I understand why you want it all in one patch that can serve as a fix for 123b431f8a5c ("drm/panfrost: Really power off GPU cores in panfrost_gpu_power_off()"), which is why I'm suggesting to go for an even simpler diff (see below), and then fully address the irq-synhronization-on-suspend issue in a follow-up patchset. --->8--- diff --git a/drivers/gpu/drm/panfrost/panfrost_gpu.c b/drivers/gpu/drm/panfrost/panfrost_gpu.c index 09f5e1563ebd..6e2d7650cc2b 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gpu.c +++ b/drivers/gpu/drm/panfrost/panfrost_gpu.c @@ -78,7 +78,10 @@ int panfrost_gpu_soft_reset(struct panfrost_device *pfdev) } gpu_write(pfdev, GPU_INT_CLEAR, GPU_IRQ_MASK_ALL); - gpu_write(pfdev, GPU_INT_MASK, GPU_IRQ_MASK_ALL); + gpu_write(pfdev, GPU_INT_MASK, + GPU_IRQ_MASK_ERROR | + GPU_IRQ_PERFCNT_SAMPLE_COMPLETED | + GPU_IRQ_CLEAN_CACHES_COMPLETED); /* * All in-flight jobs should have released their cycle @@ -425,11 +428,10 @@ void panfrost_gpu_power_on(struct panfrost_device *pfdev) void panfrost_gpu_power_off(struct panfrost_device *pfdev) { - u64 core_mask = panfrost_get_core_mask(pfdev); int ret; u32 val; - gpu_write(pfdev, SHADER_PWROFF_LO, pfdev->features.shader_present & core_mask); + gpu_write(pfdev, SHADER_PWROFF_LO, pfdev->features.shader_present); ret = readl_relaxed_poll_timeout(pfdev->iomem + SHADER_PWRTRANS_LO, val, !val, 1, 1000); if (ret) @@ -441,7 +443,7 @@ void panfrost_gpu_power_off(struct panfrost_device *pfdev) if (ret) dev_err(pfdev->dev, "tiler power transition timeout"); - gpu_write(pfdev, L2_PWROFF_LO, pfdev->features.l2_present & core_mask); + gpu_write(pfdev, L2_PWROFF_LO, pfdev->features.l2_present); ret = readl_poll_timeout(pfdev->iomem + L2_PWRTRANS_LO, val, !val, 0, 1000); if (ret)