From patchwork Wed Nov 11 18:35:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324138 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623095ils; Wed, 11 Nov 2020 10:36:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKw+9oeHjyQVbCZwO9QRr3HcuxClRKXRmC9bW66a/uOjwckX6xEOh/UhBNC6jVtQBTmsvr X-Received: by 2002:a62:8cc1:0:b029:18b:32bf:8e29 with SMTP id m184-20020a628cc10000b029018b32bf8e29mr25143754pfd.42.1605119779074; Wed, 11 Nov 2020 10:36:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119779; cv=none; d=google.com; s=arc-20160816; b=x2DDiEkWuf3dfqMrQXV5XAdQ+rbOEyEBppCArVkNuJIBr4Fb0gMUMz14KkjA6HMNfj 2wlo2RcDTCyCriLSEapkLd7z9ZqJ9d7YOeVxxd8fzYyhaNh3Pz1jQ/re46nyZE5avvGa VMiQ0jaseDce5g0mjbe7a0/gHgES2gSAyrvC3y02/VIwXupNb0N+vwyXixnR2RLN7ZPK GQJBVapgSLs5RrAhH+jVnnPadEaoe7PFsjW5NKD8iFhvMzbm1d0RvzuGfF8WdZo5nRqh hUpwo362R4GquVrNyI4DI7WRb/0FpTJzepd4a8bXsGNwHHsWfBuOBvc11+l4jFKkfTbp c7xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=JI7TKyOzeoh2eIJPt36/OVbuRdrl9pZvQ3Ry0HyFJS8=; b=H8boNKe8IlWY4N8fLY1yflF8WqMe/3TNJb6MaJMsYIAJWhl9+aSzh2Mm9rHrwu+OTy zKPTpEaK7WT8gFmNXsPfZyfLqQCDu4Ldy4c2H2f6KGSb4LII95D/Q0N3qEdHvMRNHlLn oGhhn+SLbx63UUkStPsSeUoP+c7ifPlan4yH0zuwUd9WOaz0qlg4MxLBWFv1iwjXeaSq Jmu5//OSRclxTJgdDOvDXlfugLaJP/1wxA92ZWJGbM4ae2TY58GJo0eyMKKRU/Wiamvs sDYjojQYJM2WNfrh0104MRArA9gMCnR8dPYfh//abBYnvBfQ91QDTuyUNqUqf2G/tefj 6wRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=P1O53+g6; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id l5si2495405pjq.107.2020.11.11.10.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=P1O53+g6; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5336A6E0BC; Wed, 11 Nov 2020 18:36:14 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 624326E0C8 for ; Wed, 11 Nov 2020 18:36:10 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id a3so3235256wmb.5 for ; Wed, 11 Nov 2020 10:36:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jXZJEO8V1+GfDNFYh0xMC5OCmgkAkp7ogIzPc700bj4=; b=P1O53+g6xCjn0HVbg+2LcTzi/TxNj9Kba5GMdJ54vcSns9ORtCgzS6wEcq8rV+SHzZ OQ1b7VoYUb67TSeIhw45K8NzFZYOxVXUj/3/XAwpmpXZzZgun6sh53tHnV0m3MwhEVi7 a8XsVZN+PctNbvLAE3nukCVgBfi8sC7HP+uDeqJM7QJ3DRUQjaLK1IZ3wj+wtoOryBfm zscGpu1poXcuw9zuyJATHdJTAr6LIveeSn7QUjgghiHeKeHImZqEkMvSpim4SIsglgT1 IY1JEaNFiwaMbrDH/ed1/K+ood3SkdVDbDrUnDY//QjQCZfqIshJSbIBdDUxXdDV8xCu zr6g== 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=jXZJEO8V1+GfDNFYh0xMC5OCmgkAkp7ogIzPc700bj4=; b=lMnHnMNkiOcws9xOw3xFRNVBbwJYqFILyY5/1aBloj5qKGhIum1bTazOtP6NKQHqZ4 4Up/whqCKQh56OugNCaiGblSvmd0iThUUIaGwlutikQorqYPTkcwbecniSt+O3OMvqCx UbwUcWYkPnZaYAktZz3qPiVMiWGILlMarYjHP454xSKKx+2S++/b58Sy2AWny9j0uoaO D+JnkDtay7KVmV6ydlr5LmY5rwRpjIFuUyNKgE3HcTcFnPy+/EWdm+eJISDlqHOFKlht boXUYjEeID63tIzzuxbhZP5SeqK++iK0iVmcDWCMdpaxHZbqKuxAuvTUUvwH3uyXVuXq vwTQ== X-Gm-Message-State: AOAM532tEEeOC469Cpk1qHi5/pY9sIkyRhXoTWB6jR/nlv/SELrARPp/ BH2vQz2gPoi0tuvdfJYKhPzjGw== X-Received: by 2002:a1c:ac03:: with SMTP id v3mr4489776wme.9.1605119768967; Wed, 11 Nov 2020 10:36:08 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:08 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 14/19] drm/radeon/evergreen: Move 'cik_*()'s prototypes to shared header Date: Wed, 11 Nov 2020 18:35:40 +0000 Message-Id: <20201111183545.1756994-15-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201111183545.1756994-1-lee.jones@linaro.org> References: <20201111183545.1756994-1-lee.jones@linaro.org> 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: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , =?utf-8?q?Christian_K=C3=B6?= =?utf-8?q?nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/cik.c:6413:6: warning: no previous prototype for ‘cik_init_cp_pg_table’ [-Wmissing-prototypes] 6413 | void cik_init_cp_pg_table(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik.c:6670:5: warning: no previous prototype for ‘cik_get_csb_size’ [-Wmissing-prototypes] 6670 | u32 cik_get_csb_size(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/cik.c:6702:6: warning: no previous prototype for ‘cik_get_csb_buffer’ [-Wmissing-prototypes] 6702 | void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer) | ^~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/cik.h | 3 +++ drivers/gpu/drm/radeon/evergreen.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.h b/drivers/gpu/drm/radeon/cik.h index 6630b9da9e7aa..420207d19de52 100644 --- a/drivers/gpu/drm/radeon/cik.h +++ b/drivers/gpu/drm/radeon/cik.h @@ -30,5 +30,8 @@ void cik_exit_rlc_safe_mode(struct radeon_device *rdev); int ci_mc_load_microcode(struct radeon_device *rdev); void cik_update_cg(struct radeon_device *rdev, u32 block, bool enable); u32 cik_gpu_check_soft_reset(struct radeon_device *rdev); +void cik_init_cp_pg_table(struct radeon_device *rdev); +u32 cik_get_csb_size(struct radeon_device *rdev); +void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); #endif /* __CIK_H__ */ diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index d8ee80ad4ea44..f95b588354274 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -31,6 +31,7 @@ #include "atom.h" #include "avivod.h" +#include "cik.h" #include "ni.h" #include "rv770.h" #include "evergreen.h" @@ -217,10 +218,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev); void evergreen_fini(struct radeon_device *rdev); void evergreen_pcie_gen2_enable(struct radeon_device *rdev); void evergreen_program_aspm(struct radeon_device *rdev); -void cik_init_cp_pg_table(struct radeon_device *rdev); - -extern u32 cik_get_csb_size(struct radeon_device *rdev); -extern void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); static const u32 evergreen_golden_registers[] = {