From patchwork Tue Nov 10 19:31:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 322882 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp500809ils; Tue, 10 Nov 2020 11:32:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzs+Pt/RXwK0IakGlLEgerY0143Vwl8TYDUfLjexWdS2M6sygR8HRrTMiuIK6hLdfrsrnaL X-Received: by 2002:a63:c644:: with SMTP id x4mr18797720pgg.421.1605036737244; Tue, 10 Nov 2020 11:32:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605036737; cv=none; d=google.com; s=arc-20160816; b=SIlwyPxpBMZZI8ggXLm/eHbuej0A0fkpBTHuRtlaCEapfcy+HWPbm6VJBVGurJEGNc bBPoKgw4xc42mX7pNecMz/8I42e9kBafZBFc2NlDc0jwlbIHCp9+tqHKGM5jP84eJvEQ RbjUbqwdpiHOCgExhorunvqSTHmENJyOlzGuBt3CoQtiSNUI5L7N/IvVJHI/s14y9yuR tbFZ50et3OCt6OpTudCWflp4NbMpTPqA+1MGxLF89ksPaT+/TwpwICgQsrRu/3+BWrFH zuNVKWYB7Qq3pLRCyJd8+GpkVFOHRlk3jFxVHl06LU0xyNEC93YgzIlex37S17xn6kdl bwNw== 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=LfmLFo2NsTWN7yalG1nMNqwrAIJV98aVEB0EsyztJL8=; b=H1ELofMF/05WBc8tgyZWnnkS+4UBoJQumJJeE6DuMviS0r4Qccdz3Vu7eoNBwGHGGv 9duiKualAvPy+zJfF8T/vvHOPpl12ALIC+ieBRgnPgypN+AdcGdlgQeUx4/K5sN7zzUw y9NNPEtAnajbsDJuHwWyLcgy67H/rFA8ofS5FtlJ53TYDhlR74huCYxCSO/L9lbKZbJ0 BmLNQUtxQv9g/cZ8qftkol3b3elUOhZgOdZapHSUk820en7XVdxNxYR+IjwruoUBO2S2 ctFM+yV/PoRJ+1O3rhgq0GEULYoxx4nNOg9kTCklNCgYW1frQIX7k7YglAyFUbu4/QNj VhXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=s94k4AAR; 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 f13si12489156plj.104.2020.11.10.11.32.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:32:17 -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=s94k4AAR; 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 78E3489BEC; Tue, 10 Nov 2020 19:32:08 +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 B04B889C2C for ; Tue, 10 Nov 2020 19:31:52 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id b8so14011142wrn.0 for ; Tue, 10 Nov 2020 11:31: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=ty8003+O/JEDF7pP5AXz413pW2AvyhRU/ye41tnDsWk=; b=s94k4AARJMH88KYy14FAytQBhgRQtu3mTNFlcsB9Kqq5TY/VRHY5hI6N3PgVumpWdO im8vg1vZ+ZGC4yz6nlyQVcIYavBOHzzaQ65IxiTxlo/sCRUAeiG0edibCz2eH2Sw5kcl +bTTJZsFaKgNRG8vnbHC3bbw1UkR9F5edeItMAxcHDr+m1Ztq6tSrnR38WlZWCfzw3j5 NUnTWNVeu2Y3zuFuQthNbDIC9JSOTFNtR2T/9D3K5HYaluTauVShQqzHnTC5+zf/pinF U3rUsgYEZRkTe4oHAdvU4xBCIHJTQITkiYwAbNvLwNkPoFU+2A5y8hDQDVcOCTBVEcWf fHSw== 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=ty8003+O/JEDF7pP5AXz413pW2AvyhRU/ye41tnDsWk=; b=aXXtEuJf2qV1+eTxhspRtJN0AopPrF4bbXsdqCVqHMGAvwJ1nT4g4St5r5qHiDtWAF gb3lhBtBrncqxhIFOdDGkRaqajFhaMepGyQszUovI6UXWKqpQ2VE2Nyoaso7oqq0nICE cQP7PeVsnCNY2gPIYKbUZx0I8i9Nnc6QujCqc/2oINaBJe0ttR0V+V6Z36aRyj+Q7Ee4 WU2T7gklwyv6+846GkK4bn6bwwRnNdkBIu9Qw+mPbyevDu9f+so3SwGVYtwrH0yRRs7k z8LoUN2vkv8gjtqkCfKcfqPAhm+7TGvEJ7nZaKXDl4B4DCJjxKExjwZx6iEas6qJSeF0 CZ9g== X-Gm-Message-State: AOAM532JEXwJl0ybmgumKXLCtirOr4eafhSBO3W517c6Qt0AmH4SV5Ss rlD50Xsaidf1Wyz39Z/4GYVlUw== X-Received: by 2002:a5d:62c3:: with SMTP id o3mr13434790wrv.300.1605036711258; Tue, 10 Nov 2020 11:31:51 -0800 (PST) Received: from dell.default ([91.110.221.139]) by smtp.gmail.com with ESMTPSA id 30sm17635335wrs.84.2020.11.10.11.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:31:50 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 28/30] drm/radeon/evergreen: Move 'cayman_*()'s prototypes to shared header Date: Tue, 10 Nov 2020 19:31:10 +0000 Message-Id: <20201110193112.988999-29-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201110193112.988999-1-lee.jones@linaro.org> References: <20201110193112.988999-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/ni.c:1378:6: warning: no previous prototype for ‘cayman_cp_int_cntl_setup’ [-Wmissing-prototypes] 1378 | void cayman_cp_int_cntl_setup(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/ni.c:1732:5: warning: no previous prototype for ‘cayman_gpu_check_soft_reset’ [-Wmissing-prototypes] 1732 | u32 cayman_gpu_check_soft_reset(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 | 5 +---- drivers/gpu/drm/radeon/ni.c | 1 + drivers/gpu/drm/radeon/ni.h | 36 ++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 drivers/gpu/drm/radeon/ni.h diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index efb19c445e48f..28830f4ef95e3 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 "ni.h" #include "rv770.h" #include "evergreen.h" #include "evergreen_blit_shaders.h" @@ -215,10 +216,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); -extern void cayman_cp_int_cntl_setup(struct radeon_device *rdev, - int ring, u32 cp_int_cntl); -extern void cayman_vm_decode_fault(struct radeon_device *rdev, - u32 status, u32 addr); void cik_init_cp_pg_table(struct radeon_device *rdev); extern u32 si_get_csb_size(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 1c9030a4631b8..ab7bd30802176 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -33,6 +33,7 @@ #include "cayman_blit_shaders.h" #include "clearstate_cayman.h" #include "evergreen.h" +#include "ni.h" #include "ni_reg.h" #include "nid.h" #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/ni.h b/drivers/gpu/drm/radeon/ni.h new file mode 100644 index 0000000000000..bb03ac702b1cc --- /dev/null +++ b/drivers/gpu/drm/radeon/ni.h @@ -0,0 +1,36 @@ +/* ni.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 __NI_H__ +#define __NI_H__ + +void cayman_cp_int_cntl_setup(struct radeon_device *rdev, + int ring, u32 cp_int_cntl); +void cayman_vm_decode_fault(struct radeon_device *rdev, + u32 status, u32 addr); + +#endif /* __NI_H__ */