From patchwork Tue Aug 8 22:22:38 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: 133007 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2498846vqr; Tue, 8 Aug 2023 18:26:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFggWAu+f96kVhGnmi3H4htb8GIvS+46rln0KJsH7F/BaCMd6EAkW78sbh+PZdhnCN4J+kS X-Received: by 2002:a17:907:2bef:b0:98e:419b:4cbc with SMTP id gv47-20020a1709072bef00b0098e419b4cbcmr943210ejc.12.1691544382197; Tue, 08 Aug 2023 18:26:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691544382; cv=none; d=google.com; s=arc-20160816; b=sVhFxH1Ra5GYwFbYK80WDYcbi6UZfmQ8/GQMy4vabgFvCz2nceZbZU8YpLBmBT90vh TFVQCoaq6xzeGaJFXzQfp1WPCcIB5iXGNepFPU1pNR4k5w+JKQ9+eY7tniy+48xnIbdk YVkimYil7Sp3McWlSKjlAtzXUlebG3e5RlP1xFVNLx2mmxkyatICSlRyev1VmPjfWpJE +gaBlfRcmzQdLaE/nfbPyN9sIKAHgVPlDzSBGwhrM1gCQPkMZaJFgfADcTO3jfUzSF4u 79+nKECrvgD5k4VPFxXmgFWeDiZdhdzY7rJ97k+fBxQUgFadUVXcvdMKKshYQAet6zNC MgZQ== 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=qwqZc1XnKZpIqASbLjTb/iGe/e+jCxE+gxW/UePpAj4=; fh=jTZlfToejVP9K6WGLDoCB0WYtlDlMsbqPouG9kgNlE4=; b=CUIWU1KhnFq4W7pkq3BYnCLgSkfqrkWyb0rlqTIBEEwjv87mgFsZfD2aqmAdt422g+ 65Na2ot5pE6rkz+/dK71QtmAngP5YV5j0hnS2kuvDX3Gbut4QMejv48kHfK4L1fk2RNI 5RCwmp7sWvYihpED5JRtSlC7TMoOceTIxwewpz/635CQxIMjTlF+B9ECEpoz3NNig4S0 aRoo8SooLsihiBn3Th2io1QW3dpbAgDtIOuRkdxjogoL3ctN4Yj0mXOMIlMn+/QQ1jNA Y7wcIh96z65jp4zbPjdoRfh/wJCOdMdgrXFgF6uNPezRXBHkBY1S93wBtFMAyOAYBH1Z CksQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Ss2K4UtK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hh14-20020a170906a94e00b0099bd0f172b0si8046108ejb.1036.2023.08.08.18.25.59; Tue, 08 Aug 2023 18:26:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Ss2K4UtK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229921AbjHHWW4 (ORCPT + 99 others); Tue, 8 Aug 2023 18:22:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229379AbjHHWWv (ORCPT ); Tue, 8 Aug 2023 18:22:51 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C97AE72 for ; Tue, 8 Aug 2023 15:22:50 -0700 (PDT) Received: from localhost.localdomain (unknown [IPv6:2a02:8010:65b5:0:1ac0:4dff:feee:236a]) (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 0032266071EF; Tue, 8 Aug 2023 23:22:48 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1691533369; bh=V+UHC/f4Z5437d2s+qeZfNk0n0XPSuDIfTrta5KSWQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ss2K4UtKaSfC7DWP5xWNlq2YiQ6T+2XuKYnpPJ7HAbbXifZ2eyWVIAG8Jo8JrMzRf agiygiOaaXM/O9ej8/g04M2zv9KO7pEMXLcEnOLyFVLosKqO5WvuYBaz16iQqfU97P F6V7nJfBUJxZQhDLA3oVdj+xWus2xZBvrQG/Uxwpq3AwCfYdINLWLovcmEs/UAfG96 67TZ3pzJ/xQshwHB0VC5expf0X7MFff8uWjENf948gv66CV1uNyxo7yFSK9ebKy82r JDJFAYoUlHpc8mHi0cN714Oy8hTjVcrfcY26fOkC62FERgHOIk+RDKBfwXn0I3HAIN ZozHBhkeb3urw== From: =?utf-8?q?Adri=C3=A1n_Larumbe?= To: robh@kernel.org, steven.price@arm.com, airlied@gmail.com, daniel@ffwll.ch Cc: dri-devel@lists.freedesktop.org, kernel@collabora.com, linux-kernel@vger.kernel.org, adrian.larumbe@collabora.com Subject: [PATCH 1/2] drm/panfrost: Add fdinfo support to Panfrost Date: Tue, 8 Aug 2023 23:22:38 +0100 Message-ID: <20230808222240.1016623-2-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230808222240.1016623-1-adrian.larumbe@collabora.com> References: <20230808222240.1016623-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,URIBL_BLOCKED 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773712842230949316 X-GMAIL-MSGID: 1773712842230949316 We calculate the amount of time the GPU spends on a job with ktime samples, and then add it to the cumulative total for the open DRM file, which is what will be eventually exposed through the 'fdinfo' DRM file descriptor. Signed-off-by: Adrián Larumbe --- drivers/gpu/drm/panfrost/panfrost_device.c | 12 ++++++++ drivers/gpu/drm/panfrost/panfrost_device.h | 10 +++++++ drivers/gpu/drm/panfrost/panfrost_drv.c | 32 +++++++++++++++++++++- drivers/gpu/drm/panfrost/panfrost_job.c | 6 ++++ drivers/gpu/drm/panfrost/panfrost_job.h | 3 ++ 5 files changed, 62 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index fa1a086a862b..67a5e894d037 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -401,6 +401,18 @@ void panfrost_device_reset(struct panfrost_device *pfdev) panfrost_job_enable_interrupts(pfdev); } +struct drm_info_gpu panfrost_device_get_counters(struct panfrost_device *pfdev, + struct panfrost_file_priv *panfrost_priv) +{ + struct drm_info_gpu gpu_info; + + gpu_info.engine = panfrost_priv->elapsed_ns; + gpu_info.cycles = panfrost_priv->elapsed_ns * clk_get_rate(pfdev->clock); + gpu_info.maxfreq = clk_get_rate(pfdev->clock); + + return gpu_info; +} + static int panfrost_device_resume(struct device *dev) { struct panfrost_device *pfdev = dev_get_drvdata(dev); diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h index b0126b9fbadc..4621a2ece1bb 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -141,6 +141,14 @@ struct panfrost_file_priv { struct drm_sched_entity sched_entity[NUM_JOB_SLOTS]; struct panfrost_mmu *mmu; + + uint64_t elapsed_ns; +}; + +struct drm_info_gpu { + unsigned long long engine; + unsigned long long cycles; + unsigned int maxfreq; }; static inline struct panfrost_device *to_panfrost_device(struct drm_device *ddev) @@ -172,6 +180,8 @@ int panfrost_unstable_ioctl_check(void); int panfrost_device_init(struct panfrost_device *pfdev); void panfrost_device_fini(struct panfrost_device *pfdev); void panfrost_device_reset(struct panfrost_device *pfdev); +struct drm_info_gpu panfrost_device_get_counters(struct panfrost_device *pfdev, + struct panfrost_file_priv *panfrost_priv); extern const struct dev_pm_ops panfrost_pm_ops; diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index a2ab99698ca8..65fdc0e4c7cb 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -3,6 +3,7 @@ /* Copyright 2019 Linaro, Ltd., Rob Herring */ /* Copyright 2019 Collabora ltd. */ +#include "drm/drm_file.h" #include #include #include @@ -267,6 +268,7 @@ static int panfrost_ioctl_submit(struct drm_device *dev, void *data, job->requirements = args->requirements; job->flush_id = panfrost_gpu_get_latest_flush_id(pfdev); job->mmu = file_priv->mmu; + job->priv = file_priv; slot = panfrost_job_get_slot(job); @@ -523,7 +525,34 @@ static const struct drm_ioctl_desc panfrost_drm_driver_ioctls[] = { PANFROST_IOCTL(MADVISE, madvise, DRM_RENDER_ALLOW), }; -DEFINE_DRM_GEM_FOPS(panfrost_drm_driver_fops); + +static void panfrost_gpu_show_fdinfo(struct panfrost_device *pfdev, + struct panfrost_file_priv *panfrost_priv, + struct drm_printer *p) +{ + struct drm_info_gpu gpu_info; + + gpu_info = panfrost_device_get_counters(pfdev, panfrost_priv); + + drm_printf(p, "drm-engine-gpu:\t%llu ns\n", gpu_info.engine); + drm_printf(p, "drm-cycles-gpu:\t%llu\n", gpu_info.cycles); + drm_printf(p, "drm-maxfreq-gpu:\t%u Hz\n", gpu_info.maxfreq); +} + +static void panfrost_show_fdinfo(struct drm_printer *p, struct drm_file *file) +{ + struct drm_device *dev = file->minor->dev; + struct panfrost_device *pfdev = dev->dev_private; + + panfrost_gpu_show_fdinfo(pfdev, file->driver_priv, p); + +} + +static const struct file_operations panfrost_drm_driver_fops = { + .owner = THIS_MODULE, + DRM_GEM_FOPS, + .show_fdinfo = drm_show_fdinfo, +}; /* * Panfrost driver version: @@ -535,6 +564,7 @@ static const struct drm_driver panfrost_drm_driver = { .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ, .open = panfrost_open, .postclose = panfrost_postclose, + .show_fdinfo = panfrost_show_fdinfo, .ioctls = panfrost_drm_driver_ioctls, .num_ioctls = ARRAY_SIZE(panfrost_drm_driver_ioctls), .fops = &panfrost_drm_driver_fops, diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c index dbc597ab46fb..d0063cac9f72 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -157,6 +157,11 @@ static struct panfrost_job * panfrost_dequeue_job(struct panfrost_device *pfdev, int slot) { struct panfrost_job *job = pfdev->jobs[slot][0]; + job->priv->elapsed_ns += + ktime_to_ns(ktime_sub(ktime_get(), job->start_time)); + + /* Reset in case the job has to be requeued */ + job->start_time = 0; WARN_ON(!job); pfdev->jobs[slot][0] = pfdev->jobs[slot][1]; @@ -233,6 +238,7 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) subslot = panfrost_enqueue_job(pfdev, js, job); /* Don't queue the job if a reset is in progress */ if (!atomic_read(&pfdev->reset.pending)) { + job->start_time = ktime_get(); job_write(pfdev, JS_COMMAND_NEXT(js), JS_COMMAND_START); dev_dbg(pfdev->dev, "JS: Submitting atom %p to js[%d][%d] with head=0x%llx AS %d", diff --git a/drivers/gpu/drm/panfrost/panfrost_job.h b/drivers/gpu/drm/panfrost/panfrost_job.h index 8becc1ba0eb9..b4318e476694 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.h +++ b/drivers/gpu/drm/panfrost/panfrost_job.h @@ -32,6 +32,9 @@ struct panfrost_job { /* Fence to be signaled by drm-sched once its done with the job */ struct dma_fence *render_done_fence; + + struct panfrost_file_priv *priv; + ktime_t start_time; }; int panfrost_job_init(struct panfrost_device *pfdev);