From patchwork Mon Nov 16 17:36:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324472 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503819ils; Mon, 16 Nov 2020 09:38:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJymr44S06sskWwsr4lr/EwIeDoPI0RS6Mqot8Oa6+MMrfaTF3btw/n4opmqY8WKNIA5B+id X-Received: by 2002:a17:90a:80c6:: with SMTP id k6mr16662123pjw.73.1605548305202; Mon, 16 Nov 2020 09:38:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548305; cv=none; d=google.com; s=arc-20160816; b=fnucUXTTLFoqoOH3pZd7KLY/8yijYvcoF7K5n1YtkdIQdR58HCbA8oeQN8lqDvD8UA lWGcHVdVLHRfXax32vX10y6bjOO4xXpM+qzpTdUdZ19XdKVaGhmDX23Gl+TH32ghK+o8 9i07Y1v4a5U6iqOyKBaCiMfpo5mcDre/SA580zixJagqRUGryvSNO5jonrtclgxXPrRf pQWzmSfHl6Jll+gKDfDiZXRMirGKhp6rjMQLGDd+oWx8wcpHPOU+v5rbbTSa+86Hci37 rVDgyy4pkDfj5m/I46KZGnGoioFTwussPheWsRQnz5JK/tmKwIysmgB+TsqHQElGsgAo QSFA== 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=m+GXDzjEcA8pProwI+NmE47oVZ5BGao7ylp4CE/Vap0=; b=BLbi6/biXA3N/hXFtyoSunffJ7s13pZ/2zvXpxkx7MjlbKhnKnLpfk0MRkTOM8Ivr/ xsIBh7FZZ/aWb2hLwwenU/Y+FHL+vbPrPT2rt0xhPo90PuvUyskGu71Psl3Q1uGW66F2 Jw6fEn/tlEI5Qjr8FflBpLymZ7aSEf++i5GiNaPwF/49aavCsU9u1Bgds/Hmolr+EBEA H/atTWW2d+kwNp43JnIW3bQ3+o9dfwCQfWPG8rUuVfR3qUABxkDnN5m9Gqe0ThXjiUTl L3r9tQFjmBvAo4+5AkjLt8vuz8qX9TLSJXubQe0DkQJ+GeGr+S0wWIcC4ZOOSBdq1ZhZ oi3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="kH1BKC//"; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id d6si10890427pgd.118.2020.11.16.09.38.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="kH1BKC//"; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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 275F96E075; Mon, 16 Nov 2020 17:38:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id 980FA6E8E7 for ; Mon, 16 Nov 2020 17:37:54 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id m125so22430wmm.3 for ; Mon, 16 Nov 2020 09:37:54 -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=RFkz09HHg8XjVV8DdlQiV5ZmST/9B9izgfFwLsHrImI=; b=kH1BKC//wSZb3AKFDqYNzlpJHp967MUaPmKrCtKH4g9gvuaOhCFOB+bqmmVsBfJp6Y IRFKDFJr0NyQzl1AeiqaSKli+a3YmpMGqWEGze33mB487RpiarUWtucYnXzoWoqpwd7A qx5TQJV2CDRomdZE8xN48p2tGpBgTnkL7Myt/S49GRT4zyEP2KYH/BnX8zmnLGjZnHeK n9uQD8axbidJE2t3gHCmX1lIn++JBHCYOpFyy2kau/q16LLE7DV2v4Ahl/3kMiCJKU76 i60I5VMbQWJkSXUxtjztOUlRblW0zJ9D5hN7FE9Ht1Xh7QJwe0MrDRErQqC/6CA+M+BP u8RA== 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=RFkz09HHg8XjVV8DdlQiV5ZmST/9B9izgfFwLsHrImI=; b=CBiXu74zWo/sMAAzX1DcqN0RO8IMMOB8xuXVRTK1e2lI1E/3Pqz+pkxh2v8PGmq2sA 6va9pAlRyzI8/e5DJqotFLyuIxFaUL2WxiebxAlKFymRyuGqCwnB+ZVlzTK5dyNE73On VhdmfWniBhW5MHxDQl+YI0mrNBCVv5YSle6qwkgMR8V4NOQik9jge+eQuwKmrRvWnWV7 2XjsqGhVT/tbNXVbYZnAnNcjyk7j8gGXRYjoWFFDOlaK0W7D15ISBkCUAljOh3wdWu1S 6ht4+57X7ZkSNoLCAwEfO49eWGb4/JcdzLp4PvyQWWkSCc+XEJTRToJUB+pn8QeOj/KR ohUg== X-Gm-Message-State: AOAM530J9rp3NsgvFX74H69WLz/B+oA5eiDPTAuVkoUQ0eeD9Eqytm9B KO62riBhdUJ7ENT2Ns8OzxPtyA== X-Received: by 2002:a1c:c203:: with SMTP id s3mr16953543wmf.77.1605548273156; Mon, 16 Nov 2020 09:37:53 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:52 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 36/43] drm/radeon/evergreen: Move 'cik_*()'s prototypes to shared header Date: Mon, 16 Nov 2020 17:36:53 +0000 Message-Id: <20201116173700.1830487-37-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201116173700.1830487-1-lee.jones@linaro.org> References: <20201116173700.1830487-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 4575e448e59df..8e9e88bf1f43d 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[] = {