From patchwork Fri Feb 7 19:50:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11371063 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 A9005109A for ; Fri, 7 Feb 2020 19:51:19 +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 8788B217BA for ; Fri, 7 Feb 2020 19:51:19 +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="XTHdaXyR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8788B217BA 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 3424A6FD69; Fri, 7 Feb 2020 19:51:09 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qv1-xf44.google.com (mail-qv1-xf44.google.com [IPv6:2607:f8b0:4864:20::f44]) by gabe.freedesktop.org (Postfix) with ESMTPS id 458556FD62; Fri, 7 Feb 2020 19:51:08 +0000 (UTC) Received: by mail-qv1-xf44.google.com with SMTP id y2so161139qvu.13; Fri, 07 Feb 2020 11:51:08 -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=6tp8lbkNZ4vvovr7+zUqpsvLjCLpUqj6oN6SSSy5BNA=; b=XTHdaXyRMooLO9PCRIIvNA3nZpRTjJPokIgNRzV/Vr/k3yhVCfeAf/gI/3iJwkSp8Z SJCPMWz+RRfaTF9F7j8aWpHjB3SoAVCvatENdBwGyumQpSDdo4YEXr89OSgAFuPA2fv+ NTMSbkm2mahon0l0RoMr595iN4AQ0Mp0McPkAF9NX3+9/mmhccHKeki1tI+K+t9ifUlj aPMEZsTpqM8bswNElAgDIHmlbE/rjH0mc9mG8ZQExLZCUidw6bDSCylP+JgYBqf6XriT Ci/upospPyDB5J2C7tiRTbu5Oy3QocyS4nt7LywPSzGsPKYm9iwUdzSwqjyHuH58+J+L EXvw== 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=6tp8lbkNZ4vvovr7+zUqpsvLjCLpUqj6oN6SSSy5BNA=; b=l7xbpbnZf6+fyqg2dakn9ouagGzmf8HLcAaizsBjxo4INrXEIao/DWCJ9+7EvPJIEP s2b7CBtpB6JsSqYls6REQMASjdJTcsff7PPwuJ5Of5nm+EUH1KZCccdefh23ixKhjvTl +C7yHpOY9W0NLSxQm/MVL5ZOxS5uzzE5zo0YYrA4ZFBEC+HJG+B0tdq/Q0Z3x8YX2WfM NgVhgsowMLyssvwKiGX34rO4vtlfia1PdjcX8lQZa732JyImS/BTwEXmUjjEmBUCYcnS VxryAzQB5Gc23XZPIivZBZX6/d+GHME9j6qnoUOEEC5R0DFruaGmHEK6/MHAOg0lLXbT YsVA== X-Gm-Message-State: APjAAAWjtBg+Tw7vc6H3wRaGJ+3d2sv9rHd4j50r+g2qG7HGtnU0evh9 FJG4dNG1MYCr67JEbPyjBRz1j/r3 X-Google-Smtp-Source: APXvYqzq+Pf4rTp6584dAGIQmvuyHazMjhgHHqxhlpB4+yHq1tZwSGb36+eTiJoloEmBWVIkqZn5Hg== X-Received: by 2002:ad4:55e8:: with SMTP id bu8mr20149qvb.61.1581105067061; Fri, 07 Feb 2020 11:51:07 -0800 (PST) Received: from localhost.localdomain ([71.219.59.120]) by smtp.gmail.com with ESMTPSA id w16sm1752226qkj.135.2020.02.07.11.51.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 11:51:06 -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: Fri, 7 Feb 2020 14:50:44 -0500 Message-Id: <20200207195058.2354-2-alexander.deucher@amd.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200207195058.2354-1-alexander.deucher@amd.com> References: <20200207195058.2354-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 7cbb6d358ee1..4cf1c2d261ca 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3260,7 +3260,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); }