From patchwork Mon Nov 16 17:36:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324454 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503468ils; Mon, 16 Nov 2020 09:37:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsSwVxmVfAETu79ViK8gGDtpatV26vgDOqLZtzC9jK9GLC5wWDhglWq7RJDYPhGblNnZSI X-Received: by 2002:aa7:985d:0:b029:196:2b65:1db9 with SMTP id n29-20020aa7985d0000b02901962b651db9mr10362159pfq.58.1605548277545; Mon, 16 Nov 2020 09:37:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548277; cv=none; d=google.com; s=arc-20160816; b=YeXgaZpygs4FOTyltp1nXxy72u+njMOPPobg1K/KxH9oGYfHAQejMwqo8LhYZ3vyts rg7xoXvoX/Pf6calY6twIgWxmENg4QYUr07nJzEXy/B/vc9YNLbwLmN+wlL03AsTnV7z NSXBJhO2I0AplHS/eabHThsdwbcvJYjrBfE4pSO6IMwDy+LpMhb3kb2+mSqCxj21sW8s JVt4HpInDS4bGcEwmtSJ61TtNPX3RLEwvq1T+HPfiWs8Ex4eb9vDzPQTjLz2omGYITO1 D4eAtcuHEh+daJjXT77GD99cw6OM0ybbVhcX6P613jgFhkG1MyQxgUTWQ5HOZmOTEiFG r4cQ== 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=S+/y8l9QuSYjodldnlU6z9Lfojyj476Sm1ILh+vhcO8=; b=q5b+LM3y+wAIr+kGKsJ1zM9Sb/Hc5m39kK5NbX6OXYxPh7vV/KO/tbnjeswoP3OlJ0 xJ6IKuLVW2n6MveSZb5GNxAYpSJcP1BSCBwLxNCDEMAnXz5lxbAhaQelUDkCGJVugTs+ 3rxY15RjfI9HpRkrLrGmvGqmNWfa879fs5/8Us1cp/4WuS4b4m37xDGdmlft+zP6GNKL 5keTgAhbXXNQDrlS7enky6OIfovaaUZYdKGAti6rXtmSn6n/ijJmmuWjl+6xoBPahn3u Zu3/rWChRPPKwI1e0lMZ28bd3B5lTtBYO8/ddopuJpuMSrArBrH6Zg/J9dqlsiOrrRDN xTEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=CdtQ5VOj; 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 r16si14773887pgv.552.2020.11.16.09.37.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:57 -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=CdtQ5VOj; 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 CFF136E067; Mon, 16 Nov 2020 17:37:52 +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 1713B6E064 for ; Mon, 16 Nov 2020 17:37:52 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id c9so15315wml.5 for ; Mon, 16 Nov 2020 09:37:52 -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=P+jve5cvTFEXukD009ehQU3PqTcAXFynBtan2SGSyic=; b=CdtQ5VOj6GNmI+pVSbK8iXPk9zYqd+dkBXz0oNCMhVjailBPgrsFVQpacvXB/WYg19 gzhUcmBF8H+J7KjFL7KvzmoLPoenb9qFD6KVc7PvQU8cBB/snaOKMeK/N/dn7gNjFcfx TdsEHf61jmaky/RM1r3Mo2K/0M8AegoDlQ77EXQogA+MkGp7qtoAN2le5QjgqDt6c1lE aWyz76mSfCM45dm0sDsun/E22uYtgtiohNphQuWYFfz5xS2MNbbCv1K8xD6jWsQ0SjwN AY2o5IrCP1vFjmpfS6VoAVK8OSAw86fyD0GzPWP9cErsWQ9j69lI9JmI7HNDRF9wEfWp ZFjw== 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=P+jve5cvTFEXukD009ehQU3PqTcAXFynBtan2SGSyic=; b=KlMuAWUWEojaatP4e7DSFKFw2RmHLMYxZNz6ZMsoaiqceVNCqVDMg4ieqk+qc7wMLo mGB0eYrxlvdJGwYQi93SUnolYSj5yEVFdX9X6RKhtFdFOkCN4lVBP6go8OecGYWFTMFB +Xw1uoNiP0ieS85bArUaXiYQWfXpUTj9SzqwAjn3zBb1LA03ipwdjBLSkMwYwoi0zBkX eJ3TqfSRUK6QfmMqYfRw/aS80QEqVZwrdePG68UTGKQD9GKpojuFrBfH/5uQZ/xuXkKS pBYIqKxq9k2VnzbDjOa4cZ0Qi5yWLxMSKyMIqA3p/HcGugaKs5uoWTDZT1jP6UCAhjsN yZ5A== X-Gm-Message-State: AOAM5325fxHBcmvYUwsJqEKKrORpg4okqZg9h2hD4PovhrGRASZq6PQz 905pI0bwe5RU9FX2pkb0jbfdkg== X-Received: by 2002:a1c:96cb:: with SMTP id y194mr21701wmd.62.1605548270778; Mon, 16 Nov 2020 09:37:50 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:50 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 34/43] drm/radeon/evergreen: Move 'si_get_csb_*()'s prototypes to shared header Date: Mon, 16 Nov 2020 17:36:51 +0000 Message-Id: <20201116173700.1830487-35-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/si.c:5678:5: warning: no previous prototype for ‘si_get_csb_size’ [-Wmissing-prototypes] 5678 | u32 si_get_csb_size(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si.c:5710:6: warning: no previous prototype for ‘si_get_csb_buffer’ [-Wmissing-prototypes] 5710 | void si_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/evergreen.c | 3 +-- drivers/gpu/drm/radeon/si.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 8fb0b8c3db5b5..4575e448e59df 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -41,6 +41,7 @@ #include "radeon_asic.h" #include "radeon_audio.h" #include "radeon_ucode.h" +#include "si.h" #define DC_HPDx_CONTROL(x) (DC_HPD1_CONTROL + (x * 0xc)) #define DC_HPDx_INT_CONTROL(x) (DC_HPD1_INT_CONTROL + (x * 0xc)) @@ -218,8 +219,6 @@ 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 si_get_csb_size(struct radeon_device *rdev); -extern void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); extern u32 cik_get_csb_size(struct radeon_device *rdev); extern void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h index f483a64d17050..310c58376f927 100644 --- a/drivers/gpu/drm/radeon/si.h +++ b/drivers/gpu/drm/radeon/si.h @@ -32,5 +32,7 @@ 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); +u32 si_get_csb_size(struct radeon_device *rdev); +void si_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); #endif /* __SI_H__ */