From patchwork Mon Nov 16 17:36: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: 324458 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503552ils; Mon, 16 Nov 2020 09:38:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1M3uJSq0sKhjKk1RWBOmZbAgeIw5jCR4IRaItHcS1mlW8mS8i/E0ftWlgc2DZBRPiTA/s X-Received: by 2002:a63:4450:: with SMTP id t16mr274790pgk.312.1605548283497; Mon, 16 Nov 2020 09:38:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548283; cv=none; d=google.com; s=arc-20160816; b=vjsR2Tx63WJ6EKpFZGbTbcSt8wNJdfuZPyq2dVy5HNcGLxkTXcLwXmMiK8S1knbnu4 Ri7B16F4e/oxBhU6sgTssmqE3gn6wLTHuWPQCrR8Aseal+o2u/E8+/+teuZcOAke7PJb YofaB/n0g90EuGLU50UEHtd0KmEFdHjQZaL+3ovDz2uWbP69/QkVjyXcuL8b0+lrCMLJ 6RAwYMioG+ecIlZINxj7xc2muAoi0TywfbLHsZ1Ej9p6wRiuV1DRdQCMjsmOyu1pqi3h wy52MmZT4Pbfp45uaiVG9y5Ac8gSUsq/6Sp+unMsXWzFvAgW6xIt781mkiTyXMbl788h YB/A== 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=86sAmQENKMgvSKj2XmODtweIyU5jZpvlOLy2DSzsRqI=; b=wi2dZXDUgHq8ers1U7+YDLC/FFlCKmFTBUDgCYmVPdcyYecrmmR+xOsc9E4i9DpEAD Zm5y8Fk991jX6Ol3Zs2n/6S+T6YD/yfi+k0cf+jtetK8B+yL5lleXjhDEGbi/1O1T9V1 Mtb8PLd1gcy5eiPqzSLNI7YmcARcsT2Qnfb1f2sYhx4VTJcBfdpW/llkxy8uUDDNY+Md jI2uIkAGmpaoERXRdRAVk+8aSvef256XjXrREV8hTIJ3igK7xCgpzDzqmGPb2NuxAops acyu35//TwMWntiqXSauTfa4XlCBxebvPLwf1t03ZUFnwqV6JmOIsr3rStPN2eiZB6fE NuvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=R2Zvmw9K; 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 b17si4266775pgl.370.2020.11.16.09.38.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:03 -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=R2Zvmw9K; 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 6DA286E07B; 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-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 65EDA6E07D for ; Mon, 16 Nov 2020 17:37:38 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id s8so19610184wrw.10 for ; Mon, 16 Nov 2020 09:37:38 -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=6eWjxCy1b/Di1KDbBj5VEEMSjXTSXChj8189ArvQtHE=; b=R2Zvmw9KS2p/uW92MEVvMAZHk/cC36qiZDKxllEIdVedCqMaJxEhSpmCl8uEzkgxvs ziSwIPTt2zvHY39MLFUPlML1cC0Y4JOoKx3lqQ8apPiW9uNx0p0hyqKCg3mdkC1uGZpo 9QZLpveawM4J2EiSh9h4Ky7yUMPlTMDW6etAsDjbjhYc6A4T792sIprRsqKM6TO+Cuia qRZodDurakwR/Sa0L1NztR38xENLghD8JYA7jLO9eYyDMWoNeqNc8F8voGZxgUOBAoiG PVYJw/2UeoXSIhRt0aiFE/6FKhjqwCslGMIL6Nvym5qzUA0y6W2dVcXzM/1fuh4TKJik 2ecQ== 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=6eWjxCy1b/Di1KDbBj5VEEMSjXTSXChj8189ArvQtHE=; b=kMb1efmi18S7kI1nsrenqTaE3o2awjMejdQ0vLU/nUcq7bwQjinegJCNsLA+RqNeY4 CZL+4XazWKs9hcbOVBPeUVES7NVXDVpQNKHHlrRj9Sz61hbGXi73uUkQHxCZ3TAnZ1ia XnviwQL7t4a7oUlQiJrWOekJmt86Eb1Kn9F1xJEbtkpB48ijAgVi1w9b3PlZYL5rV+Fv 2/aKPqXlnCIB0oCMiXKPgWOstGg/3h6fBas0uh+TFRzL0HoGGpDUr+oHtsSuukU14WEU gKR0hkt4wJeD5WwM0pot+5mw1Npfs3Rp5aFeyK3UE2SdBCmN28Qc9Q/0AKteo5BscQWX YHeA== X-Gm-Message-State: AOAM530GjAikuSlbg0JbWXFHGvJUX3PCJwSfB624P7qP07zdddyvZXct +dF+sM2oyHj/e3cvi8vHsv+p0w== X-Received: by 2002:a5d:448b:: with SMTP id j11mr20117581wrq.236.1605548257084; Mon, 16 Nov 2020 09:37:37 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:36 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 23/43] drm/radeon/evergreen_dma: Move 'evergreen_gpu_check_soft_reset()'s prototype to shared header Date: Mon, 16 Nov 2020 17:36:40 +0000 Message-Id: <20201116173700.1830487-24-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/evergreen.c:3825:5: warning: no previous prototype for ‘evergreen_gpu_check_soft_reset’ [-Wmissing-prototypes] 3825 | u32 evergreen_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.h | 1 + drivers/gpu/drm/radeon/evergreen_dma.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.h b/drivers/gpu/drm/radeon/evergreen.h index 30c9ca99ced90..eb46ac7776951 100644 --- a/drivers/gpu/drm/radeon/evergreen.h +++ b/drivers/gpu/drm/radeon/evergreen.h @@ -47,5 +47,6 @@ int sumo_rlc_init(struct radeon_device *rdev); void evergreen_gpu_pci_config_reset(struct radeon_device *rdev); u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev); void evergreen_print_gpu_status_regs(struct radeon_device *rdev); +u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev); #endif /* __RADEON_EVERGREEN_H__ */ diff --git a/drivers/gpu/drm/radeon/evergreen_dma.c b/drivers/gpu/drm/radeon/evergreen_dma.c index 767857d4a8c5c..52c79da1ecf57 100644 --- a/drivers/gpu/drm/radeon/evergreen_dma.c +++ b/drivers/gpu/drm/radeon/evergreen_dma.c @@ -24,10 +24,9 @@ #include "radeon.h" #include "radeon_asic.h" +#include "evergreen.h" #include "evergreend.h" -u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev); - /** * evergreen_dma_fence_ring_emit - emit a fence on the DMA ring *