From patchwork Fri Feb 7 19:50:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11371077 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 B3104109A for ; Fri, 7 Feb 2020 19:51:36 +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 91B1321741 for ; Fri, 7 Feb 2020 19:51:36 +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="nP4jpFrn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 91B1321741 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 2E51A6FD7E; Fri, 7 Feb 2020 19:51:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7C3A86FD76; Fri, 7 Feb 2020 19:51:14 +0000 (UTC) Received: by mail-qk1-x743.google.com with SMTP id w25so295375qki.3; Fri, 07 Feb 2020 11:51:14 -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=2qKi2lMG7T9Nkk9ZgGR9r/+oG5C3/NSCAfrSVeq2qn4=; b=nP4jpFrna4hHdMCSIT0uPqpJcp6KJfk/DccXLChd1AfhNYT1PfS/yLGFIVNTNO5Dbe dT1mhSBV1WCFIsjnNvcvQQm8s0Pnd3If4xZJDSQi/p3mXP8hos6tByqSqfOOUqJc68jq IZqpSJmuOKYe/fiiUX5osygb+s0FXZM6iu4LK/xyDqEWxhpAooQQ4WuYYjasOvAIz11r /f0VSfZFC+exDpbEp9+VcQ3oGs37OWKbXy/md67KV5FlU8M8lWGcErfIYfWXbweOupna 0GtECSxWuTLel/4YXcC1heUNrTNhWk2z3iwGKuFUI42V9Kn1IeAMNT5WRYue8M1VGM4K Lwag== 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=2qKi2lMG7T9Nkk9ZgGR9r/+oG5C3/NSCAfrSVeq2qn4=; b=dQLacq//ivqieSRkBg/7jGWOCxbPajuFOSwuY8EkxROA6hnZ1BcP7MmywMtsTmhS14 fr9veGEuOZ2U9doPJfeWIVl8cf7YTUWIijJvTI8cvFE9sFT8+HVBGajO6imbY/pHxy7+ aaZtWUMedDBw3bhQ9QQdBJABUXQGrn4AHijcCJD586SfkZ5/8RBDUVcOEQ0NCBDFaM6Z bRm5GPMqeCXPObkWK4R5tUiGTF+g4F06Pyub822L7VMorQlIvrhKSSjr7RmAhiiUDmlh pjcsjBZ8qplkK79GXVWmB5sg7jV4LrxBVQl6ESw/dCxpzyICLfWcLyq1jlRvK8RY7qXN GyKg== X-Gm-Message-State: APjAAAV61Bbu7iXsT4R7kQOPv7jRcSaIxa7uAiDNfHUh2MUvlHtldSmW 3JRCEJHh92UqA31/8ECumWQH4gSp X-Google-Smtp-Source: APXvYqx43FPgLz7YLKSXUzgdqrHaIklpE7bqFk4ve1VwIs4rirwY+slOnoW7EnasL9Wlr663gHMopA== X-Received: by 2002:a37:a915:: with SMTP id s21mr545009qke.112.1581105073417; Fri, 07 Feb 2020 11:51:13 -0800 (PST) Received: from localhost.localdomain ([71.219.59.120]) by smtp.gmail.com with ESMTPSA id w16sm1752226qkj.135.2020.02.07.11.51.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 11:51:13 -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: Fri, 7 Feb 2020 14:50:51 -0500 Message-Id: <20200207195058.2354-9-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" 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 3ec95c11e748..5adf936cf733 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3123,10 +3123,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);