From mboxrd@z Thu Jan 1 00:00:00 1970 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 52C8FC77B7E for ; Thu, 25 May 2023 15:53:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241847AbjEYPxT (ORCPT ); Thu, 25 May 2023 11:53:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241833AbjEYPwq (ORCPT ); Thu, 25 May 2023 11:52:46 -0400 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE3C6195 for ; Thu, 25 May 2023 08:52:37 -0700 (PDT) Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-5341737d7aeso1566902a12.2 for ; Thu, 25 May 2023 08:52:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685029957; x=1687621957; 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=7rVaUtme+EMgdLDqkT+0xJV+Z1WpGr8J4+UhWtVcjr8=; b=IvUB2IKXdPVzS5BHfvNthVBhxLC614xiN9wuIVEsKpqc1sdU2CVUrIYrj3r6tqujTX F3CVgK0ZbMwTucYdyQPx3X/ff411RAhSLG/vO/b+hJpLobzQSlBLoLuslMCn/hv91N3i AaJE9RtBh/wqPaSk7mLBnNqR+WhHs9sfwhB2WPeWfbQEprGfGpz6xUXwnemLMb7co5Nn KMI5V0296BHn7TijqODaERxEfhtHVC/Tb3jYa2AXbWjvmZRNNAaCK7xe+fLbnWxebTCc 1WngHtTOP2scTVVWs19ADnOWMzOQoKkacKdlvcAEYti9dTduIBqxtvADOiHZsS+4emR/ zPWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685029957; x=1687621957; 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=7rVaUtme+EMgdLDqkT+0xJV+Z1WpGr8J4+UhWtVcjr8=; b=JQvE62K5pNwTvEwt9HPII3F5maPCwp48JNPRDGBxL61CCQwVnOS4sNpc5IB1GwiHDA sQn80bC8XwQXCvR2n5PLVVHrndFdL4R9HQVG0vaZElB8UV85pWxkI6AfEb8qe/qb6h7X QeC0uVfRClOU6ud+q0jl2npmUSmyTKMjmedIiU+QYJZATjDKj8ksqPuhoFyOx09il2ie wTkqzherp9P9GxMT7XzgIcA4UGmFIwrQ/7558B0lw42oIl5Ky6w0+/NBimyFyvu7jh3F I9GePXcZogE03sviDhp68bhiBXcXN58ei6D3ra31FmL7wuIXnHTEM6nJGybiRmbfIEwB Rspg== X-Gm-Message-State: AC+VfDzOBOREvdDAUz4WDfRyYdbJhoVWTgB7qbxWwY+36QZEmxXNh6JP 5CU8EHoKzRALhADFlYO3AGw= X-Google-Smtp-Source: ACHHUZ5W7kiapIeT1AGeBpVKPigYmydXD2YhEImUqgogV9Ej++7d8rBHc9rIoGANlsYWGfUDQyb6OQ== X-Received: by 2002:a17:902:e852:b0:1a9:5aef:1aea with SMTP id t18-20020a170902e85200b001a95aef1aeamr2316030plg.66.1685029957214; Thu, 25 May 2023 08:52:37 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:4a00:61b:48ed:72ab:435b]) by smtp.gmail.com with ESMTPSA id 9-20020a170902c10900b001a5fccab02dsm1598335pli.177.2023.05.25.08.52.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 08:52:36 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: Rob Clark , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Shashank Sharma , Tvrtko Ursulin , =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= , Dave Airlie , Neil Armstrong , amd-gfx@lists.freedesktop.org (open list:RADEON and AMDGPU DRM DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] drm/amdgpu: Remove duplicate fdinfo fields Date: Thu, 25 May 2023 08:52:25 -0700 Message-Id: <20230525155227.560094-2-robdclark@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230525155227.560094-1-robdclark@gmail.com> References: <20230525155227.560094-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Clark Some of the fields that are handled by drm_show_fdinfo() crept back in when rebasing the patch. Remove them again. Fixes: 376c25f8ca47 ("drm/amdgpu: Switch to fdinfo helper") Signed-off-by: Rob Clark --- drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c index 13d7413d4ca3..a93e5627901a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c @@ -80,23 +80,20 @@ void amdgpu_show_fdinfo(struct drm_printer *p, struct drm_file *file) amdgpu_ctx_mgr_usage(&fpriv->ctx_mgr, usage); /* * ****************************************************************** * For text output format description please see drm-usage-stats.rst! * ****************************************************************** */ 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); drm_printf(p, "amd-evicted-vram:\t%llu KiB\n", stats.evicted_vram/1024UL); drm_printf(p, "amd-evicted-visible-vram:\t%llu KiB\n", stats.evicted_visible_vram/1024UL); drm_printf(p, "amd-requested-vram:\t%llu KiB\n", -- 2.40.1