From patchwork Mon Nov 16 17:36:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324460 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503601ils; Mon, 16 Nov 2020 09:38:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGu1IOtBeuDmjzjV27rM8oOfvdB6pFpdRIJgR6G9gPoCkcZNCZHrBYV1R2u/DVRGNU/x39 X-Received: by 2002:a63:1822:: with SMTP id y34mr288774pgl.218.1605548286359; Mon, 16 Nov 2020 09:38:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548286; cv=none; d=google.com; s=arc-20160816; b=YC1oW5pCcDkh6Rt8Z3R+ikqEAwFWzrTKE+G/fVhKDPf6kJsqXs5eTQNs3oPlUK6vL1 8JYiAURl2WPHTacLZUB0xv1qG3RnWXZP/sXxX3jL6OcYI7TVbGSI6e+iKYuO179s/Jwn KCiFKynkcrfa10gJKpXEYcCZotlQ4pmTFDxiOpXlUUuK2qhatQEnruqAPJ7s1PYvg89i CrE0ARgeZoGeP82x/6fAHL5Fe2FfuCOj4+1zxrabBmNMk+aOO+24koDnPaZlDWmCnEa1 udJ1WzU9VQXVNo0DjFa8NZFh1uMTqOYhAyo2+mAfRhly7fx7W1YzJxsipgDU9MUyIDJv sX8g== 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=dszNSZ4KRAEvQnahZgBeVuqnFBLnNLjexlhj+sdWBMw=; b=eB1cEUwomjWowqzieftHmCMTGs2OCQor8f6i/e72p1a/M+6JXfLWChQpe2D/2kiLjl gTGQ5up07JRgiuJ+vqKqZFmwmy64BciKzvETLhlC9uDeRqJtQxbYxLB8xt7lQ+ZpgVbI rvAFVtmbCxHE0C8348zpyJd59WsawGg9zv7oSVC/Wg3zp807Bdedh649TvO4CeD5n21P kYNAdaWsjSmfsyL61YdV7wLKNyIEjVhvMna6WlvmBM88AIQWaCTCOoe3LS7XHwRY6+kJ +bLkjRBnDHt/2wV+P3S1IvHgS2wBBRQGtcxZ+mejLLk34bLMJH+oUx875Gsb0FSAAUCH AuAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=TFBPvHxi; 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 z134si16828418pfc.137.2020.11.16.09.38.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:06 -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=TFBPvHxi; 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 B7BBD6E9A0; Mon, 16 Nov 2020 17:37:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1C1D96E04A for ; Mon, 16 Nov 2020 17:37:48 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id d12so19598652wrr.13 for ; Mon, 16 Nov 2020 09:37:48 -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=a/Zj5V7ntHFWoK7hDL0KY4UUjT17GXd4P0At2oNvDPk=; b=TFBPvHxiNg0J66sXloeHlwrOB5eWbndg3GWxnxNUY/l85QSylm74QsaOu6c9V0sLmG gsrnImQVGr/vzI1O7BgbeoRNaysARDN0yLvRIL+qaCWtSVIL3Dki7e9FEDW8asTZVwZ6 +KbfAcOKEr1hxQUuXN22cD2h5KNqAixBIbRYq2Qf8CZUofHYwO2YGcYYuXget9TsJXwS sSWUlQBWfMX4tksJumaQpklKT/jTnTL3slInD2HfyyF2gVExiphw0nn20uXiUWBwEc4T 9naALP835/24p4ry/5XCk+jssfHvQcCihUPctJQpGv51yNSp70AKMXPK/mHf3HRNuU1n 5s4g== 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=a/Zj5V7ntHFWoK7hDL0KY4UUjT17GXd4P0At2oNvDPk=; b=Kqur1M6ogquHgl9CvSoO7VfLnzWkEJZN+N9GvBGtKkrdaYAe8ou3WxnZqhB0nEzrqY xVHjSAfQsFjCWcmGoagbjUfRCmmkaCuZpzre7+y1pRuJHBjdZlEGuazncPV28kSWk7t4 pbI88ztEfKvfnfElKGk+dbCohr2wVVunE3CSeND7mJPmfedRTVQlceeG0z+b/TLLbxu2 uIKP2HEpHvVlMXwi+hW4MaXNGWDxomQX1gYOZ2iRkVXyv1vn40CDmyBzCmfq8VCXfM9p H7DSOj3BLFJnFJEWRXFxYxc7qCLW/Dokj7yMablxS1Tqee3Om2o5ommGJCRly9REsopN Ytcw== X-Gm-Message-State: AOAM531k14k+uzsX0puK8Wd0dP3IaLiJ2fChWRG6P4xUIWhaSRCOZepf +/WEL8wPWM0g1siT4O/5kdU47w== X-Received: by 2002:adf:e512:: with SMTP id j18mr21789945wrm.390.1605548266827; Mon, 16 Nov 2020 09:37:46 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:46 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 31/43] drm/radeon/cik: Move 'si_*()'s prototypes to shared header Date: Mon, 16 Nov 2020 17:36:48 +0000 Message-Id: <20201116173700.1830487-32-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, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/si.c:4186:6: warning: no previous prototype for ‘si_vram_gtt_location’ [-Wmissing-prototypes] 4186 | void si_vram_gtt_location(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si.c:5186:6: warning: no previous prototype for ‘si_init_uvd_internal_cg’ [-Wmissing-prototypes] 5186 | void si_init_uvd_internal_cg(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si.c:5801:6: warning: no previous prototype for ‘si_rlc_reset’ [-Wmissing-prototypes] 5801 | void si_rlc_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/cik.c | 4 +--- drivers/gpu/drm/radeon/si.h | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index ae020ad7b3185..cef0f3111cd3a 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -40,6 +40,7 @@ #include "radeon_asic.h" #include "radeon_audio.h" #include "radeon_ucode.h" +#include "si.h" #define SH_MEM_CONFIG_GFX_DEFAULT \ ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED) @@ -127,9 +128,6 @@ MODULE_FIRMWARE("radeon/mullins_mec.bin"); MODULE_FIRMWARE("radeon/mullins_rlc.bin"); MODULE_FIRMWARE("radeon/mullins_sdma.bin"); -extern void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); -extern void si_rlc_reset(struct radeon_device *rdev); -extern void si_init_uvd_internal_cg(struct radeon_device *rdev); static u32 cik_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh); extern int cik_sdma_resume(struct radeon_device *rdev); extern void cik_sdma_enable(struct radeon_device *rdev, bool enable); diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h index a1751ae560f02..f483a64d17050 100644 --- a/drivers/gpu/drm/radeon/si.h +++ b/drivers/gpu/drm/radeon/si.h @@ -25,8 +25,12 @@ #define __SI_H__ struct radeon_device; +struct radeon_mc; int si_mc_load_microcode(struct radeon_device *rdev); u32 si_gpu_check_soft_reset(struct radeon_device *rdev); +void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); +void si_rlc_reset(struct radeon_device *rdev); +void si_init_uvd_internal_cg(struct radeon_device *rdev); #endif /* __SI_H__ */