From patchwork Sat Nov 25 20:52:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Adri=C3=A1n_Larumbe?= X-Patchwork-Id: 169798 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp2151443vqx; Sat, 25 Nov 2023 12:56:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IGUacpaInNP2N2MM4OqrCELYOOsuYJh6Yb0Msby2R0DF9Ge8e14hscke8wNI3MDWRs3mnV7 X-Received: by 2002:a92:ce42:0:b0:35c:9915:634e with SMTP id a2-20020a92ce42000000b0035c9915634emr2195854ilr.2.1700945761956; Sat, 25 Nov 2023 12:56:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700945761; cv=none; d=google.com; s=arc-20160816; b=NSyOrzC/9EOmg1XVqjFaEvnyjaGbnj3mTmfqZq49gAXUCjXkf/+W6rYxIRpt5l9us+ wlAzzQXeAG8PuqPtGshrapJ/W8Xu9p8Q4x6turbUERiGWGMFOaeAxFJElOUz+y2AZm/M XSOQDuPK8y/Iuh+2hiRmT2vPYcxNZqg/ajLUKWFSRulLavhWQ+IXw75PhrCtDSnMGyZd YgtmMiDQ40pCR71A949zduafyrNALChcjMgSiwUv4BNio7WA4UcM6CYmDVrnZpqR2h0b qm70/EbkZ7P/TgGMP9IyqF9IkFwqZdodpBr4IPL+R4WULtkI949OiBXW1yEZ2AmYpWh2 hzvg== 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=9SqntmNABX2PjTKybG9y8+BdzA5qkp65j8GlIHJsJxs=; fh=cSHm+nVwN8cjRRKF1iYWd4A94Bvv8YZ/kWIZ7P1vH1U=; b=dlQo9AEcrfYqVFSutwHSUPpYF+Cy15BGw+oJ3dyfrAyf0kVsz2EbpYslpFdMjTgOh8 1towWPipkLqjrRmFY3akZPY2NLgPvX1sw58BNONFDCye2ogBOkKgd9f6eVmClLGLU5Hq Q4/1ju8TYa+pl0aHLQEFrbtsFIsDrP4Yan8u7+9mhtO2tiXfOeIWX9jc9BPHOYkyhFCw lBTwalMf5nc6Tek37UNqG5I6ZMyQM1oI7ceNAsfSW9g2RKcgNPSbOZxchfLchRFChqUT pyf5TudfxMdDNvgP+GNV3hm6G6RkZNjYshkgnPFy85z0uu9/7u41eHhoNAzOQ6OePsA+ W23A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=SBuySs8g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id l12-20020a170903244c00b001cfa577f85dsi3959910pls.360.2023.11.25.12.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 12:56:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=SBuySs8g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 04845805557B; Sat, 25 Nov 2023 12:55:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230185AbjKYUzh (ORCPT + 99 others); Sat, 25 Nov 2023 15:55:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230021AbjKYUzf (ORCPT ); Sat, 25 Nov 2023 15:55:35 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1723411D for ; Sat, 25 Nov 2023 12:55:42 -0800 (PST) Received: from sobremesa.fritz.box (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: alarumbe) by madras.collabora.co.uk (Postfix) with ESMTPSA id 32E106602F30; Sat, 25 Nov 2023 20:55:40 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1700945740; bh=UCnojBz357ehFcHJCdupwHygUfwmTRP1P4SkpuCnJmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SBuySs8gmpXp1f5nRNwaMV9TqS56Xb9Ss5nuXB9Mooj9F/tlXqBYWyPMXXwxNhJwz wLAxH/nw+MhDUi4yHBnw5QlKpmYquscX1iirdz6UFZgVJDmv2eS6wSTrD+7hIEaB88 pzRjyf7GY6JKc1ugLE1hxSYklw5fyJLXD+5g4Lsze8a5T6orkdJJQcun3SRAYEV+g0 2rAtRih/5RUys73ZVedlZ0haETz+V3cGctiR6l2+VbpR5SNeGS40dYmo/iN3r1L91K ClHtipM5mnkCWfsv0jN+cgzFs2assJT+W64XiYlYOuM3EXQNn4xCKr5i6cnabMjtU2 GfgaVOuvmiChQ== From: =?utf-8?q?Adri=C3=A1n_Larumbe?= To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , =?utf-8?q?Adri=C3=A1n_Larumbe?= , AngeloGioacchino Del Regno Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com Subject: [PATCH 1/2] drm/panfrost: Consider dma-buf imported objects as resident Date: Sat, 25 Nov 2023 20:52:02 +0000 Message-ID: <20231125205438.375407-2-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231125205438.375407-1-adrian.larumbe@collabora.com> References: <20231125205438.375407-1-adrian.larumbe@collabora.com> MIME-Version: 1.0 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 agentk.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 (agentk.vger.email [0.0.0.0]); Sat, 25 Nov 2023 12:55:59 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783570903519057627 X-GMAIL-MSGID: 1783570903519057627 A GEM object constructed from a dma-buf imported sgtable should be regarded as being memory resident, because the dma-buf API mandates backing storage to be allocated when attachment succeeds. Signed-off-by: Adrián Larumbe Fixes: 9ccdac7aa822 ("drm/panfrost: Add fdinfo support for memory stats") Reported-by: Boris Brezillon Reviewed-by: Steven Price --- drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panfrost/panfrost_gem.c index 0cf64456e29a..d47b40b82b0b 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem.c +++ b/drivers/gpu/drm/panfrost/panfrost_gem.c @@ -200,7 +200,7 @@ static enum drm_gem_object_status panfrost_gem_status(struct drm_gem_object *obj struct panfrost_gem_object *bo = to_panfrost_bo(obj); enum drm_gem_object_status res = 0; - if (bo->base.pages) + if (bo->base.base.import_attach || bo->base.pages) res |= DRM_GEM_OBJECT_RESIDENT; if (bo->base.madv == PANFROST_MADV_DONTNEED) From patchwork Sat Nov 25 20:52:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Adri=C3=A1n_Larumbe?= X-Patchwork-Id: 169799 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp2151706vqx; Sat, 25 Nov 2023 12:56:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IFNJK3VKDbqOXBq3B2aAQ+U+obkjO51awZgJFuRQ4Nyrb7WvIb4n75A08PfdRTdMS8psZlM X-Received: by 2002:a05:6808:128c:b0:3b8:4aff:90f0 with SMTP id a12-20020a056808128c00b003b84aff90f0mr10252691oiw.35.1700945811862; Sat, 25 Nov 2023 12:56:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700945811; cv=none; d=google.com; s=arc-20160816; b=oCQpnNkyDk/QAwtKA+DVJ1WlPaoBWR3J5cnMnl4JbCQ9k5/R8mRfTO+8czzly3p82v kcG9QbsymNsVi3QrV2W3GPe4SyxXKIodign8Fo/AUpOoPppi6mJgypjMjHFfggrClIrl TGLPwiPnMbCscRvl4g4ntVB8RP2O3xlXrbQPO4Kko5VM7qIdxPuipc4cz97goXKVLbpf qB3a+Qip2B83JNtOh12Px7SReXhZi6VYnx9tr6Oee3t2VFefTI6r4Yl8nxW3nuJBwX7W vDpXIfA8W37QKa0wI7KzFHq0/5nt6spKS2rpcdzsyI7V24sKdvUK21h3pNp/oQekk6mC gc9w== 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=um5Z2mqfi4A+FwINOBpCWzo3MsuIEyPAJ3HgH/MZJY4=; fh=cSHm+nVwN8cjRRKF1iYWd4A94Bvv8YZ/kWIZ7P1vH1U=; b=nbqjgSnG6soCEmZVufGgTVeWsVQDjE0bYc3f7niyNI1XD9lQEUYeg3KcgC/btImJpA VfodWLwyRUDaachLbfndJM1uPHeuRy7A3A6C2xRfKvIbgcnF1/OI++Pmqd5BYsTTFoWI VvBrMC+kaeYUYqy0IPkKKev+Z/5Q94WbVwMe/Pzl7K1S8aCQskB8qjg0EVBZ6Ial9N+I pjbgmtnDu4qWdk9SJzNNTJNWHiE3zmrkE0NYi7Q+hAAPKo0pquVE2r5yekFX/mapC6sR KOZKSsB80r2eX1991Pem0jUZWhdSfXCqyRcY5omVhWUI29kfbHWXrzhVy1+GcHZAkUdl dA5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=QqDguSoy; 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id h13-20020a63df4d000000b00578d0b680a8si6629810pgj.824.2023.11.25.12.56.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 12:56:51 -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=QqDguSoy; 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 D3256805B206; Sat, 25 Nov 2023 12:56:02 -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 S232237AbjKYUzm (ORCPT + 99 others); Sat, 25 Nov 2023 15:55:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230119AbjKYUzg (ORCPT ); Sat, 25 Nov 2023 15:55:36 -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 4CC69C5 for ; Sat, 25 Nov 2023 12:55:43 -0800 (PST) Received: from sobremesa.fritz.box (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: alarumbe) by madras.collabora.co.uk (Postfix) with ESMTPSA id 0FDB86602F32; Sat, 25 Nov 2023 20:55:41 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1700945741; bh=2dXYtao9TZWcdBl3k4zc+aQA5XUgHlJliolV8pPR8qk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QqDguSoypAvohoEiqUIfqDMcbjY6Mz+CUOn0D5Qrj5w4vP5RTyyVjGAa4xUzfVzOL DLedTETPPju5QjU9S8JBbtVVwIlvmuqNvrSexyDiomC+XyP5HoRhpBr3zRK89NyS8Y zKcXp7aIj6Ta1dfQAr7/A5LrefMXIj7HjrX34CTENWj88aJu6dO59jVSGQbpJtn+vt MhLDm/klf43sv4z/UzJW/KCcir0UGgs8v6PFbTuav/YMvuq7s3TRdAtOKpBERuNXqQ ZSaOhFCIbOxBn7KBNqyqF188SkFlNMAEQ1tlpbY57+RvkPRrAVXp2OhHjt3atEqdIL 75B7b2qMOc9Eg== From: =?utf-8?q?Adri=C3=A1n_Larumbe?= To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , =?utf-8?q?Adri=C3=A1n_Larumbe?= , AngeloGioacchino Del Regno Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com Subject: [PATCH 2/2] drm/panfrost: Fix incorrect updating of current device frequency Date: Sat, 25 Nov 2023 20:52:03 +0000 Message-ID: <20231125205438.375407-3-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231125205438.375407-1-adrian.larumbe@collabora.com> References: <20231125205438.375407-1-adrian.larumbe@collabora.com> MIME-Version: 1.0 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]); Sat, 25 Nov 2023 12:56:04 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783570955638216161 X-GMAIL-MSGID: 1783570955638216161 It was noticed when setting the Panfrost's DVFS device to the performant governor, GPU frequency as reported by fdinfo had dropped to 0 permamently. There are two separate issues causing this behaviour: - Not initialising the device's current_frequency variable to its original value during device probe(). - Updating said variable in Panfrost devfreq's get_dev_status() rather than after the new OPP's frequency had been retrieved in target(), which meant the old frequency would be assigned instead. Signed-off-by: Adrián Larumbe Fixes: f11b0417eec2 ("drm/panfrost: Add fdinfo support GPU load metrics") Reviewed-by: Steven Price --- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c index f59c82ea8870..2d30da38c2c3 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c @@ -29,14 +29,20 @@ static void panfrost_devfreq_update_utilization(struct panfrost_devfreq *pfdevfr static int panfrost_devfreq_target(struct device *dev, unsigned long *freq, u32 flags) { + struct panfrost_device *ptdev = dev_get_drvdata(dev); struct dev_pm_opp *opp; + int err; opp = devfreq_recommended_opp(dev, freq, flags); if (IS_ERR(opp)) return PTR_ERR(opp); dev_pm_opp_put(opp); - return dev_pm_opp_set_rate(dev, *freq); + err = dev_pm_opp_set_rate(dev, *freq); + if (!err) + ptdev->pfdevfreq.current_frequency = *freq; + + return err; } static void panfrost_devfreq_reset(struct panfrost_devfreq *pfdevfreq) @@ -58,7 +64,6 @@ static int panfrost_devfreq_get_dev_status(struct device *dev, spin_lock_irqsave(&pfdevfreq->lock, irqflags); panfrost_devfreq_update_utilization(pfdevfreq); - pfdevfreq->current_frequency = status->current_frequency; status->total_time = ktime_to_ns(ktime_add(pfdevfreq->busy_time, pfdevfreq->idle_time)); @@ -164,6 +169,14 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) panfrost_devfreq_profile.initial_freq = cur_freq; + /* + * We could wait until panfrost_devfreq_target() to set this value, but + * since the simple_ondemand governor works asynchronously, there's a + * chance by the time someone opens the device's fdinfo file, current + * frequency hasn't been updated yet, so let's just do an early set. + */ + pfdevfreq->current_frequency = cur_freq; + /* * Set the recommend OPP this will enable and configure the regulator * if any and will avoid a switch off by regulator_late_cleanup()