Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp5850515rwr; Mon, 1 May 2023 11:46:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5W2KEMVtDuFQJx+XdARoCBiPKVkC/V8tUzSeVrQLvzEXJzvJbOOdbGpnvJZAR/EJDiWEBQ X-Received: by 2002:a05:6a20:1616:b0:ee:f5a4:c064 with SMTP id l22-20020a056a20161600b000eef5a4c064mr17971764pzj.62.1682966782636; Mon, 01 May 2023 11:46:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682966782; cv=none; d=google.com; s=arc-20160816; b=q7VvXz0yJVL51G57b9QTcDROy01CbdjUE7gJkSoIpEK2caN/db4eZqsneruViJ56cb M0bBcvR7kWAmMZT7g0PCS3dDqCQd+sMcLboYY4rhjupzI/AO8mF1Rc7NKhnMMZjCDvzH 4e8EKLQL44+3810APTD1a1W7Z2an+//y7hfoqrDxd6Bgsv270skltu1crLwqXxUxR3Zk JgQvgKe9Tzw4Z1VXGvy3erkc5rWLSn+nsIgZNN0jP+PdnF3ELumbH1BsCiPv3RMtH3lJ Yq37rRPE0XsbmaxGjuJjEYhvH5u44Ohm6o3PGrGf4bwAgkX0WVJ1RBMYsAeTuhXMGZdq k5aA== 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=BrobCNYvIO66ZrJzqOwGa4WzVcqoiyRGGqDniTZ33q0=; b=mhGZWY+hhOe+DP6i9dLwgJLG2YOIYnfkWRz+Dz3PJRDn60tjPBaARmUEUmW9QlOoVV tYVmhE5zWlPkbUeo6CLGEHJrqWt0H/gi3A32lpKVNKOK5GPaBRYi/W8L6MSEWsa8lqlP BSV5ML9VjyvCZUus+HlZi7WSlFTVsc7pqymZ9yzyyHiPEx5rCWha4raPGi3ggC7Vz2ic URDguRgZ4Zww11CNPqUQ2YOObPqyawRfjqirtDWNNPUNcrgp42XSA+D2nXhlV61SX8lb P/HTKP6j7UyABmumRfhArd5FlmHZqs4GWRFSYWQQuj8lW53LZ+el6yzefze+L3bOR8py /klA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=nQZi0sQq; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w4-20020a656944000000b00518706a93f1si28178006pgq.361.2023.05.01.11.46.08; Mon, 01 May 2023 11:46: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=@gmail.com header.s=20221208 header.b=nQZi0sQq; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231995AbjEASp1 (ORCPT + 99 others); Mon, 1 May 2023 14:45:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232590AbjEASpV (ORCPT ); Mon, 1 May 2023 14:45:21 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 581C8C6 for ; Mon, 1 May 2023 11:45:18 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-63b8b19901fso3327013b3a.3 for ; Mon, 01 May 2023 11:45:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682966718; x=1685558718; 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=BrobCNYvIO66ZrJzqOwGa4WzVcqoiyRGGqDniTZ33q0=; b=nQZi0sQq4ckcKQAakrJrAYwM2qpWTzMOGY25ybF5XoFHveOEdeFrrvUPSbHI2Xlx7R cHon4s8hkO1Elfp2amnk1wO0PbuNGbIqKM+5rhvQOSasvEBp49O95vSOohPzR5GEUgIM cYWa3fgUPvzPfxvCtbdKg2R6eElfkNG7WudgFBpVnfs2P/z9rZim0tQI+UOYZ2aMK69v Ze95OQB+63Vr/RwmUPYBjumlzPKi7MtQWrhHGGwdlo/L4ruC0F5MohJxQnNnpYZfj0z9 huAhyjHaGComSFCZEEQzFyrWIa1Z0gw2o7oB/bVrLrerqIuAkgLG3jVf9x3HCGkRRlcZ g7JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682966718; x=1685558718; 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=BrobCNYvIO66ZrJzqOwGa4WzVcqoiyRGGqDniTZ33q0=; b=UJVM7stmIlgW5Qk1lPxqPxV02DJq4kKBHZ3N1l9YFBrgvlxQsVxjdRtBkqdTFkh/Z3 VNrsIekkyspa2DgxZu8nsLdSlTo9iUyji3MDGbbGsPmnrZ6NDGM7Xz6zPkDwg9dPH9+C AdpPAwKZrq1RbjnjCiaIkqqSpboYtsim7Gqt1CBnpe8/QRvf+wDVtvG7NnDyoFWgyjYB +LxThXC3BltILlRi4Zg3IrHsxfbyyDmKLfFZHxfd4sdh9o1pjn4Uo7zLkR0XWj+9mjSJ gWgkrtzMrgg+L96QpMCyEHBtw7VS3G/y4rHecl3JNjhUAQiFJtZzTbODA2vRquGXuQrK LEYg== X-Gm-Message-State: AC+VfDzlMdbYc4dEfgtkVna1KUsKpC42HlJs1M+oKPHK2CRjozh/CVpU RoHPbolWS9ZZfbKLB+PuJgI= X-Received: by 2002:a05:6a00:15c5:b0:636:f899:46a0 with SMTP id o5-20020a056a0015c500b00636f89946a0mr21949327pfu.15.1682966717801; Mon, 01 May 2023 11:45:17 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:4a00:61b:48ed:72ab:435b]) by smtp.gmail.com with ESMTPSA id m30-20020a62a21e000000b0063aa1763146sm20735822pff.17.2023.05.01.11.45.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 May 2023 11:45:17 -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 , Alex Deucher , "Pan, Xinhui" , David Airlie , Mario Limonciello , Hawking Zhang , =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= , Guchun Chen , YiPeng Chai , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Jim Cromie , 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 v3 4/9] drm/amdgpu: Switch to fdinfo helper Date: Mon, 1 May 2023 11:44:50 -0700 Message-Id: <20230501184502.1620335-5-robdclark@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501184502.1620335-1-robdclark@gmail.com> References: <20230501184502.1620335-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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 From: Rob Clark Signed-off-by: Rob Clark Reviewed-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 16 ++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index f5ffca24def4..6c0e0c614b94 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2745,21 +2745,21 @@ static const struct file_operations amdgpu_driver_kms_fops = { .flush = amdgpu_flush, .release = drm_release, .unlocked_ioctl = amdgpu_drm_ioctl, .mmap = drm_gem_mmap, .poll = drm_poll, .read = drm_read, #ifdef CONFIG_COMPAT .compat_ioctl = amdgpu_kms_compat_ioctl, #endif #ifdef CONFIG_PROC_FS - .show_fdinfo = amdgpu_show_fdinfo + .show_fdinfo = drm_show_fdinfo, #endif }; int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv) { struct drm_file *file; if (!filp) return -EINVAL; @@ -2800,20 +2800,21 @@ static const struct drm_driver amdgpu_kms_driver = { DRIVER_SYNCOBJ_TIMELINE, .open = amdgpu_driver_open_kms, .postclose = amdgpu_driver_postclose_kms, .lastclose = amdgpu_driver_lastclose_kms, .ioctls = amdgpu_ioctls_kms, .num_ioctls = ARRAY_SIZE(amdgpu_ioctls_kms), .dumb_create = amdgpu_mode_dumb_create, .dumb_map_offset = amdgpu_mode_dumb_mmap, .fops = &amdgpu_driver_kms_fops, .release = &amdgpu_driver_release_kms, + .show_fdinfo = amdgpu_show_fdinfo, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = amdgpu_gem_prime_import, .gem_prime_mmap = drm_gem_prime_mmap, .name = DRIVER_NAME, .desc = DRIVER_DESC, .date = DRIVER_DATE, .major = KMS_DRIVER_MAJOR, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c index 99a7855ab1bc..c2fdd5e448d1 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] = { [AMDGPU_HW_IP_COMPUTE] = "compute", [AMDGPU_HW_IP_DMA] = "dma", [AMDGPU_HW_IP_UVD] = "dec", [AMDGPU_HW_IP_VCE] = "enc", [AMDGPU_HW_IP_UVD_ENC] = "enc_1", [AMDGPU_HW_IP_VCN_DEC] = "dec", [AMDGPU_HW_IP_VCN_ENC] = "enc", [AMDGPU_HW_IP_VCN_JPEG] = "jpeg", }; -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 = f->private_data; struct amdgpu_device *adev = drm_to_adev(file->minor->dev); struct amdgpu_fpriv *fpriv = file->driver_priv; struct amdgpu_vm *vm = &fpriv->vm; uint64_t vram_mem = 0, gtt_mem = 0, cpu_mem = 0; ktime_t usage[AMDGPU_HW_IP_NUM]; uint32_t bus, dev, fn, domain; unsigned int hw_ip; int ret; @@ -79,25 +78,22 @@ void amdgpu_show_fdinfo(struct seq_file *m, struct file *f) amdgpu_bo_unreserve(vm->root.bo); amdgpu_ctx_mgr_usage(&fpriv->ctx_mgr, usage); /* * ****************************************************************** * For text output format description please see drm-usage-stats.rst! * ****************************************************************** */ - 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", vram_mem/1024UL); - seq_printf(m, "drm-memory-gtt: \t%llu KiB\n", gtt_mem/1024UL); - seq_printf(m, "drm-memory-cpu: \t%llu KiB\n", cpu_mem/1024UL); + drm_printf(p, "pasid:\t%u\n", fpriv->vm.pasid); + drm_printf(p, "drm-memory-vram:\t%llu KiB\n", vram_mem/1024UL); + drm_printf(p, "drm-memory-gtt: \t%llu KiB\n", gtt_mem/1024UL); + drm_printf(p, "drm-memory-cpu: \t%llu KiB\n", cpu_mem/1024UL); for (hw_ip = 0; hw_ip < AMDGPU_HW_IP_NUM; ++hw_ip) { if (!usage[hw_ip]) continue; - 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/amd/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 #include "amdgpu_sync.h" #include "amdgpu_ring.h" #include "amdgpu_ids.h" 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); #endif -- 2.39.2