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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E2EFBC6FD1D for ; Tue, 4 Apr 2023 19:29:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A90D10E77F; Tue, 4 Apr 2023 19:29:50 +0000 (UTC) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F7F589208 for ; Tue, 4 Apr 2023 19:29:48 +0000 (UTC) Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-930bc91df7bso104986166b.1 for ; Tue, 04 Apr 2023 12:29:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; t=1680636586; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:from:to:cc :subject:date:message-id:reply-to; bh=WDcTKrSrAsaj76X8vZNhTOKwZlbAEf+GAzZ3pjuCyAQ=; b=Ol0ruIFnZEpOldPCfGXZ2Eh69uloYVAw/FuSGVLaFXPWzhtEdjV/vTYpvc2/tlusAN Esw5Ypb9zST5aKRpSwbYRWgepey+rYqxBlQs4VJwgQkO5imOOMJrHsikSI82uqJau6ld n8EhpL85qWu8+SjnrNM1FveFWCANo5waYyRgY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680636586; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WDcTKrSrAsaj76X8vZNhTOKwZlbAEf+GAzZ3pjuCyAQ=; b=aYv2XJZ7ier1p7/CIytkb7ebuUSiIF+ATt2PccHmEkjIrA6iRpJ6RYxxPf/maG+iPk X4qf/DRHS04nF/fjb1Y6b3gapqwRAv37siBKkxCZdixh0mJmNj1mIYhFyd7h5rpbStUe Zcm6dzvWhoHKrv89n2ohfdwH5s5J5GbQFpFUTDIUtmF+r4Q4qnG6AyduXEp3dGxMjoRL t19Y8RSSUO6dvupKI1wMfsuNvgk5pLACyhyPDni9+WZUL9zTsYaE/GEr7VEn8dKoX3No vxGFMTEdAxWj1Fp8DNF5yUxJIUc2XFlFUpcLH/patdyA6E5Il1O0qwBfTR/dPzIuU4k8 ZvwA== X-Gm-Message-State: AAQBX9c4GdIvnErmKOK4sB/Y4pm+ZwPM/JRluVDZu9FItiiN2AyKTC/f Sbi1h+jhE5CQS2zIDzqiULUXWW3FLFGINUNSoWc= X-Google-Smtp-Source: AKy350atpPkCeg8shFO6LeLPLzLvxHIcMiua2klFWE3sYLdfZXfh4Wl4O0CiLXC2ZxC5k/umZYmeHg== X-Received: by 2002:a17:906:114:b0:947:f415:db23 with SMTP id 20-20020a170906011400b00947f415db23mr728899eje.1.1680636586708; Tue, 04 Apr 2023 12:29:46 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-33.fiber7.init7.net. [212.51.149.33]) by smtp.gmail.com with ESMTPSA id xc2-20020a170907074200b00947a6d84fefsm6123349ejb.75.2023.04.04.12.29.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 12:29:46 -0700 (PDT) Date: Tue, 4 Apr 2023 21:29:44 +0200 From: Daniel Vetter To: yq882255@163.com Subject: Re: [PATCH 1/3] Revert "drm/lima: add show_fdinfo for drm usage stats" Message-ID: Mail-Followup-To: yq882255@163.com, dri-devel@lists.freedesktop.org, Erico Nunes , Lucas Stach , Stephen Rothwell , Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , David Airlie , lima@lists.freedesktop.org, linux-kernel@vger.kernel.org, Qiang Yu References: <20230404002601.24136-1-yq882255@163.com> <20230404002601.24136-2-yq882255@163.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230404002601.24136-2-yq882255@163.com> X-Operating-System: Linux phenom 6.1.0-7-amd64 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Rothwell , lima@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Qiang Yu , Erico Nunes Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Apr 04, 2023 at 08:25:59AM +0800, yq882255@163.com wrote: > 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 A bit an aside, but it feels like a lot more of the fdinfo scheduler code should be common, and not just the minimal timekeeping? Just a thought for the next round. -Daniel > --- > 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_drv.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_ioctls[] = { > DRM_IOCTL_DEF_DRV(LIMA_CTX_FREE, lima_ioctl_ctx_free, DRM_RENDER_ALLOW), > }; > > -static void lima_drm_driver_show_fdinfo(struct seq_file *m, struct file *filp) > -{ > - struct drm_file *file = filp->private_data; > - struct drm_device *dev = file->minor->dev; > - struct lima_device *ldev = to_lima_dev(dev); > - struct lima_drm_priv *priv = file->driver_priv; > - struct lima_ctx_mgr *ctx_mgr = &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 = 0; i < lima_pipe_num; i++) { > - struct lima_sched_pipe *pipe = &ldev->pipe[i]; > - struct drm_gpu_scheduler *sched = &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 = { > - .owner = THIS_MODULE, > - DRM_GEM_FOPS, > - .show_fdinfo = lima_drm_driver_show_fdinfo, > -}; > +DEFINE_DRM_GEM_FOPS(lima_drm_driver_fops); > > /* > * Changelog: > -- > 2.25.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch