From patchwork Mon Nov 16 17:36:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324470 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503803ils; Mon, 16 Nov 2020 09:38:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJxnnSKvgVtFiNo9Gc0QIz41qK18/X/qeFYiVGU88+zMKMg9928y/05Zp9YckSpKr/WAnY4r X-Received: by 2002:a63:4e49:: with SMTP id o9mr276782pgl.61.1605548302726; Mon, 16 Nov 2020 09:38:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548302; cv=none; d=google.com; s=arc-20160816; b=MbbIHmmGiZe6kRcQpF1sTYSp2J9RyE0j4Pn4lOujIYb9Odcvw7Z0ZwCW5IFyKVLYHo 5cytZZp12r4+9BwfBdo4EF1uugC5IoJksg4W1b4b41FMh4nFJFyl1Hs9Iky3N8Ib/hT8 2Em6JKjVNL7kWShoIAAWlRkE2V5Z5SkRYGMQ7LZwVRhSI2NpsWkBP3f6p4SokBN/a/wN 2HJ7Xz96fC10jQiP9/+PprnZu2DO05Mhn/cvX0bxRVPX3A6rXL+EXM2iUfa3wwIJEfOt DT4GwwooD1Mxy7kXKo/l2+VlbdVUv5IHcEcBBvv/eiesa0bwxB1JP0CqOpuFy1jZYPkF i7+g== 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=Fjzd4nx4c5GsI/X5Epu3UO9DJ8fA3Kfx5njqIfXzWyY=; b=qol+U0zz3YfdbMInVp/OdXCp5UvLjzEd7pUjf6b6mOG88FttcRExaoSE5FWza169N7 IF+hod/5UagrOe95PBAyVp8JDXP8gJHxSYwcuRlepyBU5oWyqcjDjcmpQPKu/E8FvUD7 m46iPEUrlAh0DRhdPwboIJLUdjk5VVBoGCwNOg9sRL5jg+wHTPtjKHyZOX76s3vA5RDs gWY7LLeSI4YU+CTv0qPws5cyDwZzR1p4lsarptU2FmzCfEvyFZM6Gt+D10CNdV+X/atY z8O+7dAGRbtlDjkb6ZbNZFRELiH2tRwngLfGCh7m3U92C9ehT7AM5FLa7iwtt0qBbB87 BkCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=vwvgWAZG; 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 fs22si20904pjb.55.2020.11.16.09.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:22 -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=vwvgWAZG; 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 6750E6E044; Mon, 16 Nov 2020 17:38:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id 377926E08E for ; Mon, 16 Nov 2020 17:37:33 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id s8so19609738wrw.10 for ; Mon, 16 Nov 2020 09:37:33 -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=bDrg++qLU9iWkSFdQ/o4AXQ/+Fr9yLOD8f+3Y4A/s60=; b=vwvgWAZGXD4csTPpegSaVxc/aaIE61/wEIzVAf+2aIeheouwTAKWMFK5gbwrQjoQUC YdTFhAt1VDsys1Z/ImgXTKOzBc2AWRzQVNoMrWf1hMFn3oqRe39Y+qv/7ftRdB5RjrwM qeKk/P7e1p2zk6ZSTnPYROFWXqlzY0IdYWlMrmnPef+a1Kj2Ndxum3XecLXSaYL1un2X JoPscjjZRvLnSz3JVckM4EzRhIOr8r2t6LRylc4WD2587o1UXUioWKXijdBk6/chWToB v3ot2jQMmUiu9bAoCQtpMxCFIUZ3GWMT6j0se+pwLnhQHVV/IcQyGv1LJVZmYvrjECrD 5IPg== 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=bDrg++qLU9iWkSFdQ/o4AXQ/+Fr9yLOD8f+3Y4A/s60=; b=Ow4xUz+eBio8m8F+xdZT+6ye1NYSFrJFZbJjqCzE7L2GXdWNjn92RI2Ovg4gGVjt51 poMhe3uu/9MRZInSyfrHrl2FcRiRVFXCjct/yXvxI1wRVEhuAsTEQZ5rKNDuXbpGIA2J deUf9s8cxwFHzHyLlQJkZvTpZJZcp6uqNCIYVq9Zudq7Vq7cfCuuh44ujYM/MCGKOBTA vE1tiVv28z2bOCyA8ebul5KNrKBW84Cgl4GRtkPcq5Kt8SasgD1copoqTAAw0MXznMBN 2ypM9ixkh+jbKcoDe3PDRwYJUXsTaZ99Fz5enkvYDkKEtNu+7LRNYOyLoGcAB9hIdz80 hu+w== X-Gm-Message-State: AOAM530Eq6gs1eb5EdScix3Xs2Wskre/hd9hl95dXJ/JYe+39zHGYVl7 9bX3S/fCtvb4oiiz/pyTA7JuVQ== X-Received: by 2002:a5d:5342:: with SMTP id t2mr20140228wrv.243.1605548251806; Mon, 16 Nov 2020 09:37:31 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:31 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 20/43] drm/radeon/evergreen: Move 'cayman_*()'s prototypes to shared header Date: Mon, 16 Nov 2020 17:36:37 +0000 Message-Id: <20201116173700.1830487-21-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/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 | 38 ++++++++++++++++++++++++++++++ 3 files changed, 40 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 f860f5ef2df88..8fb0b8c3db5b5 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..d63be1c88c0f1 --- /dev/null +++ b/drivers/gpu/drm/radeon/ni.h @@ -0,0 +1,38 @@ +/* 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__ + +struct radeon_device; + +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__ */