From nobody Sun Apr 19 12:23:37 2026 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 6783FC76196 for ; Tue, 4 Apr 2023 00:28:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231863AbjDDA2I (ORCPT ); Mon, 3 Apr 2023 20:28:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229576AbjDDA2G (ORCPT ); Mon, 3 Apr 2023 20:28:06 -0400 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.215]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D8F1F2139 for ; Mon, 3 Apr 2023 17:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=hTfRX v529POZONG3xBGKc0eFtpS/ui6QZ+0V2eow3Mc=; b=hPAd1bgUfHSivH0xEBrN0 DwRPcFE88IyUrLF5SGIVNXNdkh7ejxHXxTQZM/5W9eJw8sLG3dcZ2yWUjU8oexEh nqYUKKegFA2uIpfFnOopiVgvNASPFH5cR+bN3NdUSDvr/aUxusJs+ynIE4MYmuhF jErHxOVjTUxG5kwWTqdVwE= Received: from yuq-Aspire-4738G.lan (unknown [116.225.76.16]) by zwqz-smtp-mta-g3-0 (Coremail) with SMTP id _____wBHK4Tkbitk8woAAg--.8076S3; Tue, 04 Apr 2023 08:27:25 +0800 (CST) From: yq882255@163.com To: dri-devel@lists.freedesktop.org Cc: Erico Nunes , Lucas Stach , Stephen Rothwell , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , David Airlie , Daniel Vetter , lima@lists.freedesktop.org, linux-kernel@vger.kernel.org, Qiang Yu Subject: [PATCH 1/3] Revert "drm/lima: add show_fdinfo for drm usage stats" Date: Tue, 4 Apr 2023 08:25:59 +0800 Message-Id: <20230404002601.24136-2-yq882255@163.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230404002601.24136-1-yq882255@163.com> References: <20230404002601.24136-1-yq882255@163.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wBHK4Tkbitk8woAAg--.8076S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Aw45KrWDWw4Uuw4DKFyxuFg_yoW8Zr1DpF sxA3y2yrWxAr4UWwnrA34DuryaqasrZayfur18Gwna9Fn0vryjgFW5tr1xZrW5Jry7A3Za qr4qkry7CF1Ik3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j-F4_UUUUU= X-Originating-IP: [116.225.76.16] X-CM-SenderInfo: d1tymjqsvvqiywtou0bp/1tbiVhJHGlqzxIGuZQAAs+ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Qiang Yu This reverts commit 4a66f3da99dcb4dcbd28544110636b50adfb0f0d. This is due to the depend commit has been reverted on upstream: baad10973fdb ("Revert "drm/scheduler: track GPU active time per entity"") Signed-off-by: Qiang Yu Acked-by: Emil Velikov --- drivers/gpu/drm/lima/lima_drv.c | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_dr= v.c index 3420875d6fc6..f456a471216b 100644 --- a/drivers/gpu/drm/lima/lima_drv.c +++ b/drivers/gpu/drm/lima/lima_drv.c @@ -261,36 +261,7 @@ static const struct drm_ioctl_desc lima_drm_driver_ioc= tls[] =3D { DRM_IOCTL_DEF_DRV(LIMA_CTX_FREE, lima_ioctl_ctx_free, DRM_RENDER_ALLOW), }; =20 -static void lima_drm_driver_show_fdinfo(struct seq_file *m, struct file *f= ilp) -{ - struct drm_file *file =3D filp->private_data; - struct drm_device *dev =3D file->minor->dev; - struct lima_device *ldev =3D to_lima_dev(dev); - struct lima_drm_priv *priv =3D file->driver_priv; - struct lima_ctx_mgr *ctx_mgr =3D &priv->ctx_mgr; - u64 usage[lima_pipe_num]; - - lima_ctx_mgr_usage(ctx_mgr, usage); - - /* - * For a description of the text output format used here, see - * Documentation/gpu/drm-usage-stats.rst. - */ - seq_printf(m, "drm-driver:\t%s\n", dev->driver->name); - seq_printf(m, "drm-client-id:\t%u\n", priv->id); - for (int i =3D 0; i < lima_pipe_num; i++) { - struct lima_sched_pipe *pipe =3D &ldev->pipe[i]; - struct drm_gpu_scheduler *sched =3D &pipe->base; - - seq_printf(m, "drm-engine-%s:\t%llu ns\n", sched->name, usage[i]); - } -} - -static const struct file_operations lima_drm_driver_fops =3D { - .owner =3D THIS_MODULE, - DRM_GEM_FOPS, - .show_fdinfo =3D lima_drm_driver_show_fdinfo, -}; +DEFINE_DRM_GEM_FOPS(lima_drm_driver_fops); =20 /* * Changelog: --=20 2.25.1 From nobody Sun Apr 19 12:23:37 2026 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 679B1C761AF for ; Tue, 4 Apr 2023 00:28:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231916AbjDDA2L (ORCPT ); Mon, 3 Apr 2023 20:28:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230263AbjDDA2H (ORCPT ); Mon, 3 Apr 2023 20:28:07 -0400 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.215]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 011D7213F for ; Mon, 3 Apr 2023 17:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=dkwlJ rv/HwXOkWnbktnPm5QOg/s8D7WVohsVnr4l+Xg=; b=ZoMXU/ESqwVV5EXmWxmyC cIGeTFBe5OnOkQ8fqZM0Vz20Ubia7geC8A2pbp3VVYjr1DXAMn6EZIPWANVJBn1Y ONxtXmNpJMF8Od+qXWiUBmdhK3NpYlfqDV3g7OfPea3foyeM8kaag6smqAvJsT5x LEIb//a2WrUPpHZqgYWLg0= Received: from yuq-Aspire-4738G.lan (unknown [116.225.76.16]) by zwqz-smtp-mta-g3-0 (Coremail) with SMTP id _____wBHK4Tkbitk8woAAg--.8076S4; Tue, 04 Apr 2023 08:27:25 +0800 (CST) From: yq882255@163.com To: dri-devel@lists.freedesktop.org Cc: Erico Nunes , Lucas Stach , Stephen Rothwell , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , David Airlie , Daniel Vetter , lima@lists.freedesktop.org, linux-kernel@vger.kernel.org, Qiang Yu Subject: [PATCH 2/3] Revert "drm/lima: allocate unique id per drm_file" Date: Tue, 4 Apr 2023 08:26:00 +0800 Message-Id: <20230404002601.24136-3-yq882255@163.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230404002601.24136-1-yq882255@163.com> References: <20230404002601.24136-1-yq882255@163.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wBHK4Tkbitk8woAAg--.8076S4 X-Coremail-Antispam: 1Uf129KBjvJXoWxWr48Zr47JF4fJw4Utw1UJrb_yoW5Cr4UpF s8AFW2yrW8JF42g34DAa4DZF1Yy3WDtayfuw1UGwna9rn0yryjgas5tryUZFy5tryxC3Wf tw4DGFy8ZF12kw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jTeHDUUUUU= X-Originating-IP: [116.225.76.16] X-CM-SenderInfo: d1tymjqsvvqiywtou0bp/1tbiGBJHGlv2lhcz+QAAsx Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Qiang Yu This reverts commit 87767de835edf527b879a363d518c33da68adb81. This is due to the depend commit has been reverted on upstream: baad10973fdb ("Revert "drm/scheduler: track GPU active time per entity"") Signed-off-by: Qiang Yu Acked-by: Emil Velikov --- drivers/gpu/drm/lima/lima_device.h | 3 --- drivers/gpu/drm/lima/lima_drv.c | 12 ------------ drivers/gpu/drm/lima/lima_drv.h | 1 - 3 files changed, 16 deletions(-) diff --git a/drivers/gpu/drm/lima/lima_device.h b/drivers/gpu/drm/lima/lima= _device.h index 71b2db60d161..41b9d7b4bcc7 100644 --- a/drivers/gpu/drm/lima/lima_device.h +++ b/drivers/gpu/drm/lima/lima_device.h @@ -106,9 +106,6 @@ struct lima_device { struct lima_dump_head dump; struct list_head error_task_list; struct mutex error_task_list_lock; - - struct xarray active_contexts; - u32 next_context_id; }; =20 static inline struct lima_device * diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_dr= v.c index f456a471216b..39cab4a55f57 100644 --- a/drivers/gpu/drm/lima/lima_drv.c +++ b/drivers/gpu/drm/lima/lima_drv.c @@ -218,11 +218,6 @@ static int lima_drm_driver_open(struct drm_device *dev= , struct drm_file *file) if (!priv) return -ENOMEM; =20 - err =3D xa_alloc_cyclic(&ldev->active_contexts, &priv->id, priv, - xa_limit_32b, &ldev->next_context_id, GFP_KERNEL); - if (err < 0) - goto err_out0; - priv->vm =3D lima_vm_create(ldev); if (!priv->vm) { err =3D -ENOMEM; @@ -242,9 +237,6 @@ static int lima_drm_driver_open(struct drm_device *dev,= struct drm_file *file) static void lima_drm_driver_postclose(struct drm_device *dev, struct drm_f= ile *file) { struct lima_drm_priv *priv =3D file->driver_priv; - struct lima_device *ldev =3D to_lima_dev(dev); - - xa_erase(&ldev->active_contexts, priv->id); =20 lima_ctx_mgr_fini(&priv->ctx_mgr); lima_vm_put(priv->vm); @@ -396,8 +388,6 @@ static int lima_pdev_probe(struct platform_device *pdev) ldev->dev =3D &pdev->dev; ldev->id =3D (enum lima_gpu_id)of_device_get_match_data(&pdev->dev); =20 - xa_init_flags(&ldev->active_contexts, XA_FLAGS_ALLOC); - platform_set_drvdata(pdev, ldev); =20 /* Allocate and initialize the DRM device. */ @@ -456,8 +446,6 @@ static int lima_pdev_remove(struct platform_device *pde= v) struct lima_device *ldev =3D platform_get_drvdata(pdev); struct drm_device *ddev =3D ldev->ddev; =20 - xa_destroy(&ldev->active_contexts); - sysfs_remove_bin_file(&ldev->dev->kobj, &lima_error_state_attr); =20 drm_dev_unregister(ddev); diff --git a/drivers/gpu/drm/lima/lima_drv.h b/drivers/gpu/drm/lima/lima_dr= v.h index e49b7ab651d0..c738d288547b 100644 --- a/drivers/gpu/drm/lima/lima_drv.h +++ b/drivers/gpu/drm/lima/lima_drv.h @@ -20,7 +20,6 @@ struct lima_sched_task; struct drm_lima_gem_submit_bo; =20 struct lima_drm_priv { - int id; struct lima_vm *vm; struct lima_ctx_mgr ctx_mgr; }; --=20 2.25.1 From nobody Sun Apr 19 12:23:37 2026 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 3A285C76188 for ; Tue, 4 Apr 2023 00:28:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231974AbjDDA2Y (ORCPT ); Mon, 3 Apr 2023 20:28:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231932AbjDDA2W (ORCPT ); Mon, 3 Apr 2023 20:28:22 -0400 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A9FFD269A for ; Mon, 3 Apr 2023 17:28:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=oHJPC R5cDiaiV1FVOQomyGkFxYiM5RTm2vP75G8m934=; b=AJwp/yjE8nyI2OIK7Covx bwdcNUJb/fGnr2nv6u7iimNpp4h8H0eoeIlogehKVhEDc61yMg+AuuUbi+Lc1fRN LHUOHSSKy/LA5j9HiC9MNnutLqHIU7ofxzCWxcCzwaPeJ5rLETit7GqN0ndGMmMh OtGhFGULFmCOwxZDAdHACs= Received: from yuq-Aspire-4738G.lan (unknown [116.225.76.16]) by zwqz-smtp-mta-g3-0 (Coremail) with SMTP id _____wBHK4Tkbitk8woAAg--.8076S5; Tue, 04 Apr 2023 08:27:25 +0800 (CST) From: yq882255@163.com To: dri-devel@lists.freedesktop.org Cc: Erico Nunes , Lucas Stach , Stephen Rothwell , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , David Airlie , Daniel Vetter , lima@lists.freedesktop.org, linux-kernel@vger.kernel.org, Qiang Yu Subject: [PATCH 3/3] Revert "drm/lima: add usage counting method to ctx_mgr" Date: Tue, 4 Apr 2023 08:26:01 +0800 Message-Id: <20230404002601.24136-4-yq882255@163.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230404002601.24136-1-yq882255@163.com> References: <20230404002601.24136-1-yq882255@163.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wBHK4Tkbitk8woAAg--.8076S5 X-Coremail-Antispam: 1Uf129KBjvJXoWxWr48Zr47Jr43JF1rGryDWrg_yoW5Zr48pF sxJa12yFWxA3WUWayDJ3yDZr13twn0yas5G34kG3ZYvr9YvF40gF4rJF45ZrWYqryxA34I vw4UKr17Ar47t37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jd0edUUUUU= X-Originating-IP: [116.225.76.16] X-CM-SenderInfo: d1tymjqsvvqiywtou0bp/1tbiGBBHGlv2lhcz5AAAsu Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Qiang Yu This reverts commit bccafec957a5c4b22ac29e53a39e82d0a0008348. This is due to the depend commit has been reverted on upstream: baad10973fdb ("Revert "drm/scheduler: track GPU active time per entity"") Signed-off-by: Qiang Yu Acked-by: Emil Velikov --- drivers/gpu/drm/lima/lima_ctx.c | 30 +----------------------------- drivers/gpu/drm/lima/lima_ctx.h | 3 --- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ct= x.c index e008e586fad0..891d5cd5019a 100644 --- a/drivers/gpu/drm/lima/lima_ctx.c +++ b/drivers/gpu/drm/lima/lima_ctx.c @@ -15,7 +15,6 @@ int lima_ctx_create(struct lima_device *dev, struct lima_= ctx_mgr *mgr, u32 *id) if (!ctx) return -ENOMEM; ctx->dev =3D dev; - ctx->mgr =3D mgr; kref_init(&ctx->refcnt); =20 for (i =3D 0; i < lima_pipe_num; i++) { @@ -43,17 +42,10 @@ int lima_ctx_create(struct lima_device *dev, struct lim= a_ctx_mgr *mgr, u32 *id) static void lima_ctx_do_release(struct kref *ref) { struct lima_ctx *ctx =3D container_of(ref, struct lima_ctx, refcnt); - struct lima_ctx_mgr *mgr =3D ctx->mgr; int i; =20 - for (i =3D 0; i < lima_pipe_num; i++) { - struct lima_sched_context *context =3D &ctx->context[i]; - struct drm_sched_entity *entity =3D &context->base; - - mgr->elapsed_ns[i] +=3D entity->elapsed_ns; - + for (i =3D 0; i < lima_pipe_num; i++) lima_sched_context_fini(ctx->dev->pipe + i, ctx->context + i); - } kfree(ctx); } =20 @@ -107,23 +99,3 @@ void lima_ctx_mgr_fini(struct lima_ctx_mgr *mgr) xa_destroy(&mgr->handles); mutex_destroy(&mgr->lock); } - -void lima_ctx_mgr_usage(struct lima_ctx_mgr *mgr, u64 usage[lima_pipe_num]) -{ - struct lima_ctx *ctx; - unsigned long id; - - for (int i =3D 0; i < lima_pipe_num; i++) - usage[i] =3D mgr->elapsed_ns[i]; - - mutex_lock(&mgr->lock); - xa_for_each(&mgr->handles, id, ctx) { - for (int i =3D 0; i < lima_pipe_num; i++) { - struct lima_sched_context *context =3D &ctx->context[i]; - struct drm_sched_entity *entity =3D &context->base; - - usage[i] +=3D entity->elapsed_ns; - } - } - mutex_unlock(&mgr->lock); -} diff --git a/drivers/gpu/drm/lima/lima_ctx.h b/drivers/gpu/drm/lima/lima_ct= x.h index 6068863880eb..74e2be09090f 100644 --- a/drivers/gpu/drm/lima/lima_ctx.h +++ b/drivers/gpu/drm/lima/lima_ctx.h @@ -12,7 +12,6 @@ struct lima_ctx { struct kref refcnt; struct lima_device *dev; - struct lima_ctx_mgr *mgr; struct lima_sched_context context[lima_pipe_num]; atomic_t guilty; =20 @@ -24,7 +23,6 @@ struct lima_ctx { struct lima_ctx_mgr { struct mutex lock; struct xarray handles; - u64 elapsed_ns[lima_pipe_num]; }; =20 int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32= *id); @@ -33,6 +31,5 @@ struct lima_ctx *lima_ctx_get(struct lima_ctx_mgr *mgr, u= 32 id); void lima_ctx_put(struct lima_ctx *ctx); void lima_ctx_mgr_init(struct lima_ctx_mgr *mgr); void lima_ctx_mgr_fini(struct lima_ctx_mgr *mgr); -void lima_ctx_mgr_usage(struct lima_ctx_mgr *mgr, u64 usage[lima_pipe_num]= ); =20 #endif --=20 2.25.1