From patchwork Mon Nov 16 17:36:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11909921 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77F22C64E7C for ; Mon, 16 Nov 2020 17:37:29 +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 3B53022370 for ; Mon, 16 Nov 2020 17:37:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="hTWZaiHU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B53022370 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org 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 0C2A46E057; Mon, 16 Nov 2020 17:37:20 +0000 (UTC) Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 41D9A6E04A for ; Mon, 16 Nov 2020 17:37:18 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id b6so19642498wrt.4 for ; Mon, 16 Nov 2020 09:37:18 -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=uEdGEUBcwEa3ohTuW8AeQ9rcZ1jBGC5RhjVmwh26pbA=; b=hTWZaiHU5fA5ZEMniy8xudnbSwhiny/zhSVePhdiq89nhCPAqFfplsSB+RtBDA9Swn juht6Ir7HpAMfXv4ScFXAsNlO84L9fi8UKMVHx0469PTgEnG7RU+JC3CcpdCemKIZXx8 vm6UZT1j4n7/Za58lJeoGRUQL0XZbOjAfrAjAnTcihGjkQt0n2vkQzHJkumvOskI0GMu wCvk4wvT0a9BK+yMiaMCGStDtdCsu92UEgPHSneLHt3Val2FZknJqkH7U9a/Pvg627BP zikms0bVWuvecz6aP5XLhupjyFpePbGYDowsuDLp91S09GlZeFTh1psutp5sMF3tqsVc I5Dw== 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=uEdGEUBcwEa3ohTuW8AeQ9rcZ1jBGC5RhjVmwh26pbA=; b=c0joRIKOaHfWgEnq8SBKyFufjC1ASo1v8NET66hcp8Y5BagWhyPOkwjtH9XlPArNBT XHZ9bayArr26rCMLzbV9B9f0o6bom5wlJ83QO48FD/pNiT8NM+0PrF7sf+BZMJbiLvHd iaYgQzTj9mxySNBbp+bJERYk6n7fV6el6muI4JLXkc59xKyfsgRAbjWcm0c+M5x0+5Co DjxjfsG2VX0Duvf+qFD4b/8We+HCSdCJ22/zrHdviYkySyMDv/wamwbUyDgHOsTX0jU7 lStvvFHGIo3rcs3CffdYBSZ7eX7AZ1BMfRSbfu90aF3wz1P6nuDmEcw53GOShvibNnMN 3SMg== X-Gm-Message-State: AOAM530QGURIAVxYTkCecesHp9acyYh+ZUVZX3+iD+4TrXtG23LKT7b3 8X4QJDS+oq1QgPLmfr9vXxUgqA== X-Google-Smtp-Source: ABdhPJxK86tNpaYZzkU5H14VhFrpzSs1zfiylnszNRxTdZ68f+BxhRrbvIkmhcTtIF49DCVZzT3W1A== X-Received: by 2002:a5d:4ec2:: with SMTP id s2mr20423096wrv.258.1605548236915; Mon, 16 Nov 2020 09:37:16 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:16 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 09/43] drm/radeon/rv770: Move 'rv770_set_clk_bypass_mode' prototype to shared location Date: Mon, 16 Nov 2020 17:36:26 +0000 Message-Id: <20201116173700.1830487-10-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=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/rv770.c:1138:6: warning: no previous prototype for ‘rv770_set_clk_bypass_mode’ [-Wmissing-prototypes] 1138 | void rv770_set_clk_bypass_mode(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~ 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 | 2 +- drivers/gpu/drm/radeon/r600.c | 2 +- drivers/gpu/drm/radeon/rv770.c | 1 + drivers/gpu/drm/radeon/rv770.h | 35 ++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/radeon/rv770.h diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 1f2acca437abd..9a1e240b07234 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 "rv770.h" #include "evergreen_blit_shaders.h" #include "evergreen_reg.h" #include "evergreend.h" @@ -223,7 +224,6 @@ 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); -extern void rv770_set_clk_bypass_mode(struct radeon_device *rdev); static const u32 evergreen_golden_registers[] = { diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 12a918335ac7b..f09b6dc5cbeb3 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -40,6 +40,7 @@ #include "atom.h" #include "avivod.h" #include "r600d.h" +#include "rv770.h" #include "radeon.h" #include "radeon_asic.h" #include "radeon_audio.h" @@ -112,7 +113,6 @@ void r600_fini(struct radeon_device *rdev); void r600_irq_disable(struct radeon_device *rdev); static void r600_pcie_gen2_enable(struct radeon_device *rdev); extern int evergreen_rlc_resume(struct radeon_device *rdev); -extern void rv770_set_clk_bypass_mode(struct radeon_device *rdev); /* * Indirect registers accessor diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 21f653ae1e1bb..88e29ebaad467 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -39,6 +39,7 @@ #include "radeon_asic.h" #include "radeon_audio.h" #include "rv770d.h" +#include "rv770.h" #define R700_PFP_UCODE_SIZE 848 #define R700_PM4_UCODE_SIZE 1360 diff --git a/drivers/gpu/drm/radeon/rv770.h b/drivers/gpu/drm/radeon/rv770.h new file mode 100644 index 0000000000000..a3f2bb44979fe --- /dev/null +++ b/drivers/gpu/drm/radeon/rv770.h @@ -0,0 +1,35 @@ +/* radeon_rv770.h -- Private header for radeon driver -*- linux-c -*- + * + * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 2000 VA Linux Systems, Inc., Fremont, California. + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + +#ifndef __RADEON_RV770_H__ +#define __RADEON_RV770_H__ + +struct radeon_device; + +void rv770_set_clk_bypass_mode(struct radeon_device *rdev); + +#endif /* __RADEON_RV770_H__ */