From nobody Thu Dec 18 23:01:35 2025 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 7B57EC7EE2D for ; Wed, 24 May 2023 16:01:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238152AbjEXQBs (ORCPT ); Wed, 24 May 2023 12:01:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238004AbjEXQBM (ORCPT ); Wed, 24 May 2023 12:01:12 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E4B01730 for ; Wed, 24 May 2023 09:00:31 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-64d2467d640so1214470b3a.1 for ; Wed, 24 May 2023 09:00:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684944030; x=1687536030; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fgPqvCuDomCcpddhPDuK2cRaX+7yovp8gvIn/0ROM8o=; b=RWgC+TkHkjKHT+CRTZboyOkJAe0MhVmLlogkcVtrAP5M9V4/3hVzOnHCwy30ZsQ6qW 3F/kk34xKaTJllzDMw/89vq7P3ud/ugGD6xq93Kqnr4s6to/vbTGBQ4SbW3YfYjJ0lgC trdADqdmQWIX58ByAYBJ8gbJUsd+t44HUS1ljf0WXyreJcdN37oNiCdSz2fkw+KjzA/B JMAetRMqJQdmfbNH98iEwu8FCnaoy4EABiyzkc6e0oglk4KbVQWXRlPubMJyeg7XaVhA tcSMxJhtse24tUVk2ITvFpXRciAb7zsVg1H/sKCmg4edZhFIF+yMFNVpUF78+9HniOoQ 9AHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684944030; x=1687536030; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fgPqvCuDomCcpddhPDuK2cRaX+7yovp8gvIn/0ROM8o=; b=TZURJ9nvcw0AgpfyLUdBsV/qAS2dTvSYx6032IQndS99aaAzE6jsLL+u25YLiwU53N 5ImC4T44Psk/yFWIC9eqFUR29zbTLpyXu11CqxvCf4Xu4uUA7FzcUzK6usImLxoDh+7F VyYXZufyosyOG4YTfzB0JVhwmdtVXXE418ZehQ5jEais0po9DfWwuHJv57F7KvzYom3z CM/sSxjoOWErCt8h2UArRRUI4SEXSR75FG2ZKbDVJADcjVS0KY0ndw37io+uYQP4DvjH xgBMhJdHZKttn36XnasF3VrI/80qKPkWETzdbFH4feQaCg0utBShdmvxIxhkA/UBcMD8 ZHcw== X-Gm-Message-State: AC+VfDxn33OsLQidi2CQ4bJ70p9dzPSVMOTcn80wBqbAbQLQ69kUuBv1 lK6ysiEuxUt44lQYYqeWEUM= X-Google-Smtp-Source: ACHHUZ7nmLnzIpMDtOUnPkTfQof/nxgZRpx7CECCrwNmb2fR4ergpfoLMNL7O5fM+bih4y3CQJTGAw== X-Received: by 2002:a05:6a00:14c2:b0:643:59cd:6cad with SMTP id w2-20020a056a0014c200b0064359cd6cadmr4023754pfu.24.1684944030032; Wed, 24 May 2023 09:00:30 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:4a00:61b:48ed:72ab:435b]) by smtp.gmail.com with ESMTPSA id b1-20020aa78101000000b0063b85893633sm7542046pfi.197.2023.05.24.09.00.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 09:00:29 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, Daniel Vetter , Tvrtko Ursulin , Boris Brezillon , Christopher Healy , Emil Velikov , =?UTF-8?q?Christian=20K=C3=B6nig?= , Rob Clark , Dave Airlie , Alex Deucher , "Pan, Xinhui" , David Airlie , =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= , Guchun Chen , Mario Limonciello , YiPeng Chai , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Jim Cromie , Srinivasan Shanmugam , Shashank Sharma , Tvrtko Ursulin , Arunpravin Paneer Selvam , amd-gfx@lists.freedesktop.org (open list:RADEON and AMDGPU DRM DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v5 4/7] drm/amdgpu: Switch to fdinfo helper Date: Wed, 24 May 2023 08:59:34 -0700 Message-Id: <20230524155956.382440-5-robdclark@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524155956.382440-1-robdclark@gmail.com> References: <20230524155956.382440-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Clark v2: Rebase on drm-misc-next Signed-off-by: Rob Clark Reviewed-by: Christian K=C3=B6nig Acked-by: Dave Airlie --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 32 ++++++++++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h | 2 +- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_drv.c index b1ca1ab6d6ad..1b46e7ac7cb0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2740,21 +2740,21 @@ static const struct file_operations amdgpu_driver_k= ms_fops =3D { .flush =3D amdgpu_flush, .release =3D drm_release, .unlocked_ioctl =3D amdgpu_drm_ioctl, .mmap =3D drm_gem_mmap, .poll =3D drm_poll, .read =3D drm_read, #ifdef CONFIG_COMPAT .compat_ioctl =3D amdgpu_kms_compat_ioctl, #endif #ifdef CONFIG_PROC_FS - .show_fdinfo =3D amdgpu_show_fdinfo + .show_fdinfo =3D drm_show_fdinfo, #endif }; =20 int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv) { struct drm_file *file; =20 if (!filp) return -EINVAL; =20 @@ -2795,20 +2795,21 @@ static const struct drm_driver amdgpu_kms_driver = =3D { DRIVER_SYNCOBJ_TIMELINE, .open =3D amdgpu_driver_open_kms, .postclose =3D amdgpu_driver_postclose_kms, .lastclose =3D amdgpu_driver_lastclose_kms, .ioctls =3D amdgpu_ioctls_kms, .num_ioctls =3D ARRAY_SIZE(amdgpu_ioctls_kms), .dumb_create =3D amdgpu_mode_dumb_create, .dumb_map_offset =3D amdgpu_mode_dumb_mmap, .fops =3D &amdgpu_driver_kms_fops, .release =3D &amdgpu_driver_release_kms, + .show_fdinfo =3D amdgpu_show_fdinfo, =20 .prime_handle_to_fd =3D drm_gem_prime_handle_to_fd, .prime_fd_to_handle =3D drm_gem_prime_fd_to_handle, .gem_prime_import =3D amdgpu_gem_prime_import, .gem_prime_mmap =3D drm_gem_prime_mmap, =20 .name =3D DRIVER_NAME, .desc =3D DRIVER_DESC, .date =3D DRIVER_DATE, .major =3D KMS_DRIVER_MAJOR, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_fdinfo.c index c57252f004e8..13d7413d4ca3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c @@ -46,23 +46,22 @@ static const char *amdgpu_ip_name[AMDGPU_HW_IP_NUM] =3D= { [AMDGPU_HW_IP_COMPUTE] =3D "compute", [AMDGPU_HW_IP_DMA] =3D "dma", [AMDGPU_HW_IP_UVD] =3D "dec", [AMDGPU_HW_IP_VCE] =3D "enc", [AMDGPU_HW_IP_UVD_ENC] =3D "enc_1", [AMDGPU_HW_IP_VCN_DEC] =3D "dec", [AMDGPU_HW_IP_VCN_ENC] =3D "enc", [AMDGPU_HW_IP_VCN_JPEG] =3D "jpeg", }; =20 -void amdgpu_show_fdinfo(struct seq_file *m, struct file *f) +void amdgpu_show_fdinfo(struct drm_printer *p, struct drm_file *file) { - struct drm_file *file =3D f->private_data; struct amdgpu_device *adev =3D drm_to_adev(file->minor->dev); struct amdgpu_fpriv *fpriv =3D file->driver_priv; struct amdgpu_vm *vm =3D &fpriv->vm; =20 struct amdgpu_mem_stats stats; ktime_t usage[AMDGPU_HW_IP_NUM]; uint32_t bus, dev, fn, domain; unsigned int hw_ip; int ret; =20 @@ -80,38 +79,37 @@ void amdgpu_show_fdinfo(struct seq_file *m, struct file= *f) amdgpu_bo_unreserve(vm->root.bo); =20 amdgpu_ctx_mgr_usage(&fpriv->ctx_mgr, usage); =20 /* * ****************************************************************** * For text output format description please see drm-usage-stats.rst! * ****************************************************************** */ =20 - seq_printf(m, "pasid:\t%u\n", fpriv->vm.pasid); - seq_printf(m, "drm-driver:\t%s\n", file->minor->dev->driver->name); - seq_printf(m, "drm-pdev:\t%04x:%02x:%02x.%d\n", domain, bus, dev, fn); - seq_printf(m, "drm-client-id:\t%Lu\n", vm->immediate.fence_context); - seq_printf(m, "drm-memory-vram:\t%llu KiB\n", stats.vram/1024UL); - seq_printf(m, "drm-memory-gtt: \t%llu KiB\n", stats.gtt/1024UL); - seq_printf(m, "drm-memory-cpu: \t%llu KiB\n", stats.cpu/1024UL); - seq_printf(m, "amd-memory-visible-vram:\t%llu KiB\n", + drm_printf(p, "pasid:\t%u\n", fpriv->vm.pasid); + drm_printf(p, "drm-driver:\t%s\n", file->minor->dev->driver->name); + drm_printf(p, "drm-pdev:\t%04x:%02x:%02x.%d\n", domain, bus, dev, fn); + drm_printf(p, "drm-client-id:\t%Lu\n", vm->immediate.fence_context); + drm_printf(p, "drm-memory-vram:\t%llu KiB\n", stats.vram/1024UL); + drm_printf(p, "drm-memory-gtt: \t%llu KiB\n", stats.gtt/1024UL); + drm_printf(p, "drm-memory-cpu: \t%llu KiB\n", stats.cpu/1024UL); + drm_printf(p, "amd-memory-visible-vram:\t%llu KiB\n", stats.visible_vram/1024UL); - seq_printf(m, "amd-evicted-vram:\t%llu KiB\n", + drm_printf(p, "amd-evicted-vram:\t%llu KiB\n", stats.evicted_vram/1024UL); - seq_printf(m, "amd-evicted-visible-vram:\t%llu KiB\n", + drm_printf(p, "amd-evicted-visible-vram:\t%llu KiB\n", stats.evicted_visible_vram/1024UL); - seq_printf(m, "amd-requested-vram:\t%llu KiB\n", + drm_printf(p, "amd-requested-vram:\t%llu KiB\n", stats.requested_vram/1024UL); - seq_printf(m, "amd-requested-visible-vram:\t%llu KiB\n", + drm_printf(p, "amd-requested-visible-vram:\t%llu KiB\n", stats.requested_visible_vram/1024UL); - seq_printf(m, "amd-requested-gtt:\t%llu KiB\n", + drm_printf(p, "amd-requested-gtt:\t%llu KiB\n", stats.requested_gtt/1024UL); - for (hw_ip =3D 0; hw_ip < AMDGPU_HW_IP_NUM; ++hw_ip) { if (!usage[hw_ip]) continue; =20 - seq_printf(m, "drm-engine-%s:\t%Ld ns\n", amdgpu_ip_name[hw_ip], + drm_printf(p, "drm-engine-%s:\t%Ld ns\n", amdgpu_ip_name[hw_ip], ktime_to_ns(usage[hw_ip])); } } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h b/drivers/gpu/drm/a= md/amdgpu/amdgpu_fdinfo.h index e86834bfea1d..0398f5a159ef 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h @@ -30,13 +30,13 @@ #include #include #include #include =20 #include "amdgpu_sync.h" #include "amdgpu_ring.h" #include "amdgpu_ids.h" =20 uint32_t amdgpu_get_ip_count(struct amdgpu_device *adev, int id); -void amdgpu_show_fdinfo(struct seq_file *m, struct file *f); +void amdgpu_show_fdinfo(struct drm_printer *p, struct drm_file *file); =20 #endif --=20 2.40.1