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: 11898261 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.6 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 B868FC388F9 for ; Wed, 11 Nov 2020 18:36:18 +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 46D09205CB for ; Wed, 11 Nov 2020 18:36:18 +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="P1O53+g6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 46D09205CB 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 5336A6E0BC; Wed, 11 Nov 2020 18:36:14 +0000 (UTC) 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-Google-Smtp-Source: ABdhPJzfsayKXlu3vNEjxdNAa52H0jflpazf6xD3rLA1ezErQxUB0fVmYwEirbaixq6+caFEAJ67Xw== 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=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/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[] = {