From patchwork Wed Feb 5 15:39:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11366461 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E9269139A for ; Wed, 5 Feb 2020 15:40:20 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id C7D5720730 for ; Wed, 5 Feb 2020 15:40:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fRjabsYo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C7D5720730 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A8C6E89C13; Wed, 5 Feb 2020 15:40:11 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yw1-xc42.google.com (mail-yw1-xc42.google.com [IPv6:2607:f8b0:4864:20::c42]) by gabe.freedesktop.org (Postfix) with ESMTPS id C3EC489BF4; Wed, 5 Feb 2020 15:40:10 +0000 (UTC) Received: by mail-yw1-xc42.google.com with SMTP id b81so2691829ywe.9; Wed, 05 Feb 2020 07:40:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=18PoEPWuFM2KYsBe3wCA6P7dSJZNgZDnsgACDtqLcBc=; b=fRjabsYoK+Gy0jnQqVmuyA7LWZcmg/JIqUwD/Gal/luY1lmeNdgPDqxh5Uj9b3twtL wDKDOAfckPWn/+8MIgv8+KR635GcDyZmtTKXnJ0ueS8ktFwE74OYGUG0g19aWPlOJ2kQ 4OIcEjBSzwwcWjPQ6Ag/U1aXrCarRdh++l/QUa+F8Z5ZKj26u5Bdm32dFEA4Dv/eoNOK lkXgWbtHd3uC7JA3TvCND4dGSfCcDf4cdS7QlmIfggVF3TP1dbZf9bhQERF49+z3AIIi Djo1ydRGdw8Tu0jsW8vydimH4DXNIDrZLPJuXFtVcmyM9gwv88MF1PXdN1uUMqFhIrMD w3IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=18PoEPWuFM2KYsBe3wCA6P7dSJZNgZDnsgACDtqLcBc=; b=L7jaSYPVPs4HEBU/p1B53geTXkj0tWXmWjP7T9we12TdjIgETQVsDJEZb6Rk4lKM1R h70BDAAGxfMt2Isbi56XU71VG7wGu1UkMD7u5Xs34IoWilm7jGZ6o7L+9oPau0T5usFI kFot19y5zHoodL3equdRy5Yyhi5SplbXnGNhaL8j+8fnF3glazS9h5/fbQUorJtPYvQB gv/H9g7Za59Fnkv9W88oiHnqUgl1uZ3CXT39giL7TFolBl/PcvfAV0wh/Xpw/brtTn1t ry4fy5dSj0IjmxNp8TZGasiUdyjw9j7fXgEp/VNWBcZ37ZBy+iTDP97ty4vnXX9SEGJ3 WIzg== X-Gm-Message-State: APjAAAVWva4tR7J/hNR+mKHaX7jbQaioMgnHamxOLOjsp3N5SiOHFHxJ CYJMnI2O+vMn3/hzGjeGKLJ5AARR X-Google-Smtp-Source: APXvYqxYX576j9aUzNj97r6A/lC8JEIo57EwOzsXf/aDvjHfMlbPVD5V3Gu1T9aOC70PjAd1AIqIUw== X-Received: by 2002:a25:6b52:: with SMTP id o18mr29508776ybm.167.1580917209780; Wed, 05 Feb 2020 07:40:09 -0800 (PST) Received: from tr4.amd.com (atlvpn.amd.com. [165.204.84.11]) by smtp.gmail.com with ESMTPSA id q185sm61256ywh.61.2020.02.05.07.40.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2020 07:40:09 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 01/15] drm/amdgpu: rename amdgpu_debugfs_preempt_cleanup Date: Wed, 5 Feb 2020 10:39:46 -0500 Message-Id: <20200205154000.536145-2-alexander.deucher@amd.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200205154000.536145-1-alexander.deucher@amd.com> References: <20200205154000.536145-1-alexander.deucher@amd.com> MIME-Version: 1.0 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: Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" to amdgpu_debugfs_fini. It will be used for other things in the future. Acked-by: Christian König Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c index f24ed9a1a3e5..58b5e1b4f814 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c @@ -1229,7 +1229,7 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev) ARRAY_SIZE(amdgpu_debugfs_list)); } -void amdgpu_debugfs_preempt_cleanup(struct amdgpu_device *adev) +void amdgpu_debugfs_fini(struct amdgpu_device *adev) { debugfs_remove(adev->debugfs_preempt); } @@ -1239,7 +1239,7 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev) { return 0; } -void amdgpu_debugfs_preempt_cleanup(struct amdgpu_device *adev) { } +void amdgpu_debugfs_fini(struct amdgpu_device *adev) { } int amdgpu_debugfs_regs_init(struct amdgpu_device *adev) { return 0; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h index f289d28ad6b2..b382527e359a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h @@ -34,7 +34,7 @@ struct amdgpu_debugfs { int amdgpu_debugfs_regs_init(struct amdgpu_device *adev); void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev); int amdgpu_debugfs_init(struct amdgpu_device *adev); -void amdgpu_debugfs_preempt_cleanup(struct amdgpu_device *adev); +void amdgpu_debugfs_fini(struct amdgpu_device *adev); int amdgpu_debugfs_add_files(struct amdgpu_device *adev, const struct drm_info_list *files, unsigned nfiles); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 8df7727815cb..3b09897eb1e9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3228,7 +3228,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev) amdgpu_ucode_sysfs_fini(adev); if (IS_ENABLED(CONFIG_PERF_EVENTS)) amdgpu_pmu_fini(adev); - amdgpu_debugfs_preempt_cleanup(adev); + amdgpu_debugfs_fini(adev); if (amdgpu_discovery && adev->asic_type >= CHIP_NAVI10) amdgpu_discovery_fini(adev); }