From patchwork Mon Nov 16 17:36:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324462 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503668ils; Mon, 16 Nov 2020 09:38:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJwDziVu0cgbZIID699gNq40SOCOP4DnDtQC+JhTHNMmkE6QxNp8JFoVXjMKma8GcxcRpt5b X-Received: by 2002:a17:90a:9f85:: with SMTP id o5mr16322538pjp.63.1605548291919; Mon, 16 Nov 2020 09:38:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548291; cv=none; d=google.com; s=arc-20160816; b=W59m/B6d8mfrccjuvdZsi6jJ2jRuWZI4jao8I09UvWkvBeB/Q8WMaqT7op5LFsPo+I pSY4FjjY3+YyOBrTdlyA3oQM60Qyn6ajNqvqAkIXC44BFkjUNte8b4rHSixTvwMdmM0A 3aTmfyGvIn1mq8bI+zT691IRyhZDCkbqLet5fwpSbItl01AysLYXGdOW8cx4MVqsi+En VsseNHUSw3ies46Hh5Xb0xUhzceVHrMH1OFnFeezkYXLRkU0EM2WOqe9K4x+/4k5oTps GOeEx5dDKF/n4nVn7ME18Z0+7UzmmpnB7UXUxeBv4uePu/cbXU8Id4MuqJVdqXojcEoh 9mWA== 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=YZFWxL1Q0BrWVA9mg7O3gqbuRNVwT1nYa8gRAkihPLg=; b=Fmzs6Zfn7nnCsp6aX5/55X6KhhLq73ZJ7/9e9u+Hp7+AXrrwXcWX8O3y9NCy4M25lS xM+e6plyFaI0R2wEyVqyKsPMtxijG2ix1MQGf4tWiD2VLTcQ30cpxbr9hpPTED5X17oo wy3Mx0tKw7NrOXG1bNmzB4QW+AP98UfKpdyKH/tPZtH3CMnidMEhgCEu1X0ppyXX9fCY /frKMdJlx6q4m3Kx8AfcHKMmY0dXEXBNXNy8PYChZnzzAu2AcW/ObEjty+2rBJZMZtrq Np6D6XYayk1NaiEC8lM/uSgygfi8jb1qoW696X7Bc5//T3ksk3MTG575BVVfoVIYvRvy UZmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=A8HzgcFm; 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 d11si5741354pgl.232.2020.11.16.09.38.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:11 -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=A8HzgcFm; 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 7081A6E07D; Mon, 16 Nov 2020 17:37:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by gabe.freedesktop.org (Postfix) with ESMTPS id BD5026E061 for ; Mon, 16 Nov 2020 17:37:35 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id w24so38117wmi.0 for ; Mon, 16 Nov 2020 09:37:35 -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=bUgD99dAZfuLWNam3kGxkjEykoel9F1pl4Jg76K7MCg=; b=A8HzgcFmHJlDoRnxOLVZNJsNZd5RSaDMhSbJjyA6Zsf+uOVZiwxgsrZ3qS/yomov6M ImfkYga1c9za82A3rxY+3q1sgd1dKCR4FLFTq54FzNvsOXjP4jT3rk7iNq4V+OfNY1qz HA3Guu8rubwWPgTwa96fKsPnDlmxn4lljezuu9Htm+kOdivDmj83mDkrl9I0Lgmt7hAI NcjebhEvuNFy98kZ0fjw6avLJaR4r/+QtLJqJbYxr/c1rqXQdoPd7Z2LCUKWcWb219aN MtgPdH+xHTSR3WfhZ6yXP6rToCbCsx2/OQ7yUsk6/6IyW62TPiCBhsUK01Z3RQsgytV9 pl9Q== 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=bUgD99dAZfuLWNam3kGxkjEykoel9F1pl4Jg76K7MCg=; b=orxBA3TLIbzb02XfKkQaurijXwVK+0o7n566R0Ai0b8XwxepyUNIyxlsM+NlSsI5Tp pj2sdGNkOhk/fd3I3fqQKlst2zCItcIz0+ay02nGB5y7xuAKBgulckuL8Qnbd5vDryZW gesNUI8d3PP73w/sscW7CFNJsyatgWOak/De3CpSPQBkbeTRNVuwj/joo/te3ouv7zxt DyFu8e0/aIrlN6oMCKhiNxTjNCZRD97JlQdlU3s4Wi2hhu3US7fQe03BvvHwn8eSDs0/ qS8VTziqGoWyieDdtTBxRJRMZ/AIHkz2svcKlFO7Q2VxbAAcIK+tmh9NnV/jZO+A8A+n /cag== X-Gm-Message-State: AOAM532uC3HT1MkCQ2jS4ZIFsu0WKywoxfthwvHhXde18WHbn/rKh9iL Gm7MCH6BR7ak0He1VhfBTD+j3g== X-Received: by 2002:a05:600c:2204:: with SMTP id z4mr15910947wml.57.1605548254381; Mon, 16 Nov 2020 09:37:34 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:33 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 21/43] drm/radeon/r600_dma: Move 'r600_gpu_check_soft_reset()'s prototype to shared location Date: Mon, 16 Nov 2020 17:36:38 +0000 Message-Id: <20201116173700.1830487-22-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, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/r600.c:1615:5: warning: no previous prototype for ‘r600_gpu_check_soft_reset’ [-Wmissing-prototypes] 1615 | u32 r600_gpu_check_soft_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/r600.c | 1 + drivers/gpu/drm/radeon/r600.h | 35 +++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/r600_dma.c | 3 +-- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/radeon/r600.h diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index f09b6dc5cbeb3..94e8815e5067d 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -39,6 +39,7 @@ #include "atom.h" #include "avivod.h" +#include "r600.h" #include "r600d.h" #include "rv770.h" #include "radeon.h" diff --git a/drivers/gpu/drm/radeon/r600.h b/drivers/gpu/drm/radeon/r600.h new file mode 100644 index 0000000000000..2a3915f0039e4 --- /dev/null +++ b/drivers/gpu/drm/radeon/r600.h @@ -0,0 +1,35 @@ +/* r600.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 __R600_H__ +#define __R600_H__ + +struct radeon_device; + +u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); + +#endif /* __R600_H__ */ diff --git a/drivers/gpu/drm/radeon/r600_dma.c b/drivers/gpu/drm/radeon/r600_dma.c index af6c0da45f28a..89ca2738c5d4c 100644 --- a/drivers/gpu/drm/radeon/r600_dma.c +++ b/drivers/gpu/drm/radeon/r600_dma.c @@ -24,10 +24,9 @@ #include "radeon.h" #include "radeon_asic.h" +#include "r600.h" #include "r600d.h" -u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); - /* * DMA * Starting with R600, the GPU has an asynchronous