From patchwork Wed Nov 11 18:35:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324129 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp622884ils; Wed, 11 Nov 2020 10:36:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJzlPVjhsmOxT/4bgo5hVqtMWU/dQGAims+dtdQgrNAoZEl58nyzM+KlABGciti8LsAmVVXz X-Received: by 2002:a17:90b:a51:: with SMTP id gw17mr4805869pjb.218.1605119762730; Wed, 11 Nov 2020 10:36:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119762; cv=none; d=google.com; s=arc-20160816; b=c05QX1hrpgCnDR579RjrK8JlX1l/jQF3neMzC88N+fbm2sptU0Nk6qB2HCjXsyiZAt Ijh5XgK72vgZx5bFFpV399eLWAWSZAWpCpuDI6gSIAARdfcTIExc07SGMT0o0Uf6XRib 9sJjJNfMvgzlTNHuQnEo7qCug2cRmdejWvpfO6AcXQHxSkuvT2C561c2bYl4JF490oKJ lZptSfQIGzPU69Ne8j0Bk8Z/H5kwkSKfBSzmi+cB+iJSCvhrJCF46KN6jf0n+2ay4naU UYkhy4EyWHjDUh1cb2zlGnGLYNrubEREqxhiW3ImSF5Gzuwu2a8/jP7fdYm5zOrXsMrY sBtQ== 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=gW7AqfMy32rPZ29FajBndYD0OykcaUKA4oPpUUPGMjQ=; b=VYm7MfcaGO8b3GjTAPt8vDdXEcLI6dzc/bSvfbAnPrnxLyTivoGwGxwP5vR/r+ESXF be+wGUC0XbWOhPgjLLzvCOk1dNgeHVU3/7SxgGLryFI1QzeWdYeZywJMfx8MiLlJNKLE KGTMraEl4Ua9vL/y4Lk6U09TA/CJFXDGLl3zo2aJd/Wll1pCv6ub7TQFcuJ9Hurw228z U9J9lCinbrGJedgO7r5tybLNw8D/3uikwRiS/+UKq/B+cyEk/8Gh10s1Be/NDIHVJwyW fNkR4LT7DxVWk6cc/YsOxwRbKdnjPBOBONA6DTqq8joessi9YMZRmsZZ/EZb8vDf2hGG er8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=uzYnXdFF; 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 g1si2583688plt.54.2020.11.11.10.36.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:02 -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=uzYnXdFF; 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 BC8FD6E0AB; Wed, 11 Nov 2020 18:35:56 +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 F13C46E0A8 for ; Wed, 11 Nov 2020 18:35:53 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id o15so3514449wru.6 for ; Wed, 11 Nov 2020 10:35:53 -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=5TTguyaQuVrd+USo/F+rMhw06NLnXmuljJDk3k933AM=; b=uzYnXdFFpGFm/O/yOG8ZnLUAwCXGekg2acMZNKqILkDN5/NpAh6cm4f6K2dqKdkJSn C7NRB6cZlnNl8hSwWeBmI36L4kdkOL3H4CmV87xjGW/FpXfExfTEu8a45Q4Y/V243SnO qGFS0il8RaTQOfwdfzUBnRXSabA3COE4c7YFG+yDuJ9WBCF9rBWj8yrEzOrUgjnQapnL D/WJ/RQQOsJ6t8yAtJBi2DNUPyxK5rCNaUWcRyoqXBo21obVwGHtq5ZrCENObNqe0lN1 3qjzGG56Gfes7ebdpjzYG1smr2Tp3b5vwvffnIt63DYfsfYCIuVGakNbesczuHou+RCn /xOQ== 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=5TTguyaQuVrd+USo/F+rMhw06NLnXmuljJDk3k933AM=; b=TEhNn4Qb7Y2baKeOIahMLYkwZ/R60FNgfnqOqUXKTfZRQDX0Bm3FtHyZEhM0wjCUD8 xF2lcT2+Ic8XriIGCoV0GFItyt6tKxcM3vKE1GwpCcJZFQS2JQNd3TpqohyHWgrgnVdY IQc6lEYpD6drHu2Cvgh8jrfTw1KmV1NLuUABQc4GCGTQ9u9Bkc/wPGCLIFjoJt0ogxxD c+5v5r653zzYbBDpDfvCBbpmIm7Pm6pERN9ORqJVfpBlLwZ9vsff8GCKv3rqPmyMoOq5 fE5vCmm1yfRNBCIbHEaBa1+BOnn6xUVZAqjlw3tvxZJgUzInsN1YZqa/C1AW28fEbEzA ngiA== X-Gm-Message-State: AOAM533Qtwd5R4Xvmvxs2lvhch2G8ZdAXVCj3skNNgkmeapwcNDCDa1Q r7+xf7gruaPvFC5mWZEloNu20A== X-Received: by 2002:a5d:6cc5:: with SMTP id c5mr31747759wrc.301.1605119752670; Wed, 11 Nov 2020 10:35:52 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.35.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:35:51 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 03/19] drm/radeon/ni_dma: Move 'cayman_gpu_check_soft_reset()'s prototype to shared header Date: Wed, 11 Nov 2020 18:35:29 +0000 Message-Id: <20201111183545.1756994-4-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=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:1733:5: warning: no previous prototype for ‘cayman_gpu_check_soft_reset’ [-Wmissing-prototypes] 1733 | 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/ni.h | 1 + drivers/gpu/drm/radeon/ni_dma.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/ni.h b/drivers/gpu/drm/radeon/ni.h index d63be1c88c0f1..9a5f31a05e68f 100644 --- a/drivers/gpu/drm/radeon/ni.h +++ b/drivers/gpu/drm/radeon/ni.h @@ -34,5 +34,6 @@ 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); +u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev); #endif /* __NI_H__ */ diff --git a/drivers/gpu/drm/radeon/ni_dma.c b/drivers/gpu/drm/radeon/ni_dma.c index c56136848360e..bd515ad4fe4cc 100644 --- a/drivers/gpu/drm/radeon/ni_dma.c +++ b/drivers/gpu/drm/radeon/ni_dma.c @@ -25,10 +25,9 @@ #include "radeon.h" #include "radeon_asic.h" #include "radeon_trace.h" +#include "ni.h" #include "nid.h" -u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev); - /* * DMA * Starting with R600, the GPU has an asynchronous