From patchwork Wed Feb 5 15:39:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11366475 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 5DC3B139A for ; Wed, 5 Feb 2020 15:40:37 +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 3CAE720730 for ; Wed, 5 Feb 2020 15:40:37 +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="ECfgHskL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3CAE720730 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 0CB0A6E9B5; Wed, 5 Feb 2020 15:40:20 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yw1-xc43.google.com (mail-yw1-xc43.google.com [IPv6:2607:f8b0:4864:20::c43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4627A6F615; Wed, 5 Feb 2020 15:40:19 +0000 (UTC) Received: by mail-yw1-xc43.google.com with SMTP id f204so2687042ywc.10; Wed, 05 Feb 2020 07:40:19 -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=aG4tWD4Bf63nrdqVyzzXgsS9Nnk8tFLF0JhSz+Or+5U=; b=ECfgHskLmaXsNYSv+MjjVFTRpOlgi/ojYPNEnX2SIxhw6y09JOspu2C29YeLlvR6++ 2oJA6vFQcDPR9dzQV3Do4GS1LBLqpdZZBOpCHoxO/K7/OIePub2JAt/N9BV6lIjV1Y6B CnTpIOC2SFz3g+ma0V8MUMRUQKJdEtgDzgCVnY8GR37iow27nRluTl8vsqdv8OGNxIWv d3yMvIYXmVI2nVE5GzpdZsGKICUDhxxt2RSYnmNX6OGstaJfJnn1N3Iosv7LMMDLd+tN X1ZcWORfsVLRpAd23SFvm8Q7Ydn7PcDR0lS3kYoe6BauzGsI6irp3s5zWbWciIbcwiNi /cLg== 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=aG4tWD4Bf63nrdqVyzzXgsS9Nnk8tFLF0JhSz+Or+5U=; b=nkYmZQTR3LZAh261nsEUaHVj7fG3jcfEnftp8V9IYygEfAcjkk9MsI6Veww0cry9y+ 2xp5S96njH6xw2ZAX+fdI+729cJqUK2qslr4zumi4UZsuJ9qBvWar1kwZi1sDu2VKPoX zx59GD7mDO9lhmt7kKcwM0WG5QEsdNmg+ek2TVw8FX3/Xz2UyfCeAPhWiP/gJfoL1wxO Jq6nzbFmG86L4OV5HIIT1kes6uPGru0Lm6ES7lydHUpmoAPXpesOfJFdQHOvFFDMzaRc dTANntNITSngsjW8uqMDPK1s2XCGVPizqz3TlHZn6MczNtqHQRnf0lNM04ybmdpTCH+R 0GKw== X-Gm-Message-State: APjAAAVdk4fl/Q0lFWesqJGKuHjshCrbl6bIRMcWt9psi5aGEUfjKoSX vZZSJ4t3IxLOzDstHkRYyvFM1PeP X-Google-Smtp-Source: APXvYqw1RdLUprCAgQ+o5Tdwr6daV+5bxevxjuBibiJArC6L8VRXJ010+Bc+tQfMEaNf9VXCICmXWA== X-Received: by 2002:a81:30a:: with SMTP id 10mr10591751ywd.162.1580917216860; Wed, 05 Feb 2020 07:40:16 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2020 07:40:16 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 08/15] drm/amdgpu/firmware: move debugfs init into core amdgpu debugfs Date: Wed, 5 Feb 2020 10:39:53 -0500 Message-Id: <20200205154000.536145-9-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" In order to remove the load and unload drm callbacks, we need to reorder the init sequence to move all the drm debugfs file handling. Do this for firmware. 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_device.c | 4 ---- 2 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 7721f1416cdb..5bf43f20ec30 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c @@ -1256,6 +1256,10 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev) if (r) DRM_ERROR("registering register debugfs failed (%d).\n", r); + r = amdgpu_debugfs_firmware_init(adev); + if (r) + DRM_ERROR("registering firmware debugfs failed (%d).\n", r); + return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_list, ARRAY_SIZE(amdgpu_debugfs_list)); } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index d84a61e18bf8..4dc7145368fc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3091,10 +3091,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, } else adev->ucode_sysfs_en = true; - r = amdgpu_debugfs_firmware_init(adev); - if (r) - DRM_ERROR("registering firmware debugfs failed (%d).\n", r); - r = amdgpu_debugfs_init(adev); if (r) DRM_ERROR("Creating debugfs files failed (%d).\n", r);