From patchwork Mon Nov 16 17:36:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324474 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3503901ils; Mon, 16 Nov 2020 09:38:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKaK9uyO0GiAxJ0oQ69605rqyF350g2x8Hz2gwDhjKfdfekq8DhE4yp+BcWNjifSwDLNJs X-Received: by 2002:a17:902:ed01:b029:d6:bb79:d46a with SMTP id b1-20020a170902ed01b02900d6bb79d46amr14162769pld.76.1605548311335; Mon, 16 Nov 2020 09:38:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605548311; cv=none; d=google.com; s=arc-20160816; b=aDX93rPrumA53U6uW99iEFpgZ4GZ4Wh4ZH/5EdPBr3rXWhpv+ysaaLIYWT3ywTojQ6 l4P3KYET+6TnzYIRPu5l+f+HeTjFh5RmSaW16eHlndj8uzFLhb3Ty19ScfRNMIy6HLzy 0kFv2uR+vkQMcoJLoLTxl7mMyqEDR7FsQguA1pgjEeFCqajh9uY+KJkmm13WUSTwMl5Q XK89RTJspLq8zEbQNx0OyyJkYWWYRQWWW2kmUA/fnDJQ9D5DZ/32/rWqaEdAxCl1s9Ws OCdmLSSM9IVcIQxYgzHCta7K1fNO8ZD8GctgUcCGWIDJj3YXd3qDopaDM0gBxIVw2hK5 Ca6g== 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=5YZ7lZtvZphXfu2D0EKK2wNTbEkZ9hIHwSMQwLVbuGI=; b=HUvdMj4kCskQ2GcaJze/jd13YRW10oc927auffkhMrQm4CBGydYrRXKpiawfWIHhcf xH18P3TFN3H8OailuuaKkbRHAJHvGuh/QLCPcmSql7DiefYAbtTq1lxOF218GG8XiHe4 6T8nMtpeo2V+EhaN97ppDQ5qLLuw2vvBMY1uqxXG1Dtatb8dbbZUVtL4SAb+SS+4IZqk +OVm4CCqptnuaQLBNqeivzKipZmKNFRIPA7zeBiOVfEzOUa+j6N92GS/GVraQVP5rj80 +8fUA+CXi1N6IUgSJMypEKV8UkgIuE2asX+oQCe+3ZvzOhnl8TJkqOE2G9aHlvKN8Q9w t7qQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=DFTBbu+5; 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 1si9941pjl.100.2020.11.16.09.38.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:38:31 -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=DFTBbu+5; 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 46F5F6E09F; Mon, 16 Nov 2020 17:38:29 +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 496E66E075 for ; Mon, 16 Nov 2020 17:37:53 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id j7so19634676wrp.3 for ; Mon, 16 Nov 2020 09:37: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=noNY+SglbM8aEsCCdAF8dY+Y+lbfpcrhUN1CWHwGoPw=; b=DFTBbu+5/taBz5pfwjhg2wGKAOcz772ZE8KKWtmmMpONrvSSKnHUEF6FR+5UjXPlQK XmlgrM5ohKz9h/HLFZcXQxou2oIiaih5t2afZ7Otfj4eqUJz+ClVii6GJ31QOupottY2 06K+IiP5G5Tql72mSEUj5Elt4Zonc+FW5cVsOEaMS375Pw0lb25NVw8jn19KABojYTnO sIvvQE5jz3fGbJosQodyjtGV4pDXBk4l7CjgB7lbA9PWHD/hGoTrLX7YaUy58OBTdG8n uyZSjbl/MOssb5we3fYsnndgw9ANHUUAgPawXlc59hSgBoC/XP5DMqLG24yHn7aduPpK h7Jw== 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=noNY+SglbM8aEsCCdAF8dY+Y+lbfpcrhUN1CWHwGoPw=; b=qBoUKcYwl6djTPi6w9iG4jVYhjVoUPxNzls4Pa4Zf24igMnXkTXS07dtTH7k+sF+om clacY2RKVSaS5SK/gwFDNIrKC6RvIBzy6oMCVuZkAqr1bPsuCRA6B34oZi0aXWPqKM2W OLS7oippsTnnQu5IJ4sgUHNneh9CRnYMjGa3mz/bi03r6jMuF1g7bfIXBuLPorWGdlzl 8wlSOb76Sk8d/XU6UI2GFhM/0/7BMvfYmk7MSW8oT+smHeOnQtjRHLYwT4nqes1LZK6P S7WeSnCRYdaB2XgcRLxfxGbPpoDR6AUPBK8cgoPxKDKAla4e/6TH8cJaeEfQzfUi5gtM cMAQ== X-Gm-Message-State: AOAM530r/I/K2O7ij2WEhUz2X+frqy9seMhuGRTbEWvXw+UBJYXac8Lj fX21PNv3LR/S6vs3L9IZx4xLjA== X-Received: by 2002:adf:e48d:: with SMTP id i13mr19977610wrm.387.1605548271964; Mon, 16 Nov 2020 09:37:51 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:51 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 35/43] drm/radeon/cik_sdma: Move 'amdgpu_cik_gpu_check_soft_reset()'s prototype to shared header Date: Mon, 16 Nov 2020 17:36:52 +0000 Message-Id: <20201116173700.1830487-36-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/cik.c:4845:5: warning: no previous prototype for ‘cik_gpu_check_soft_reset’ [-Wmissing-prototypes] 4845 | u32 cik_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/cik.h | 1 + drivers/gpu/drm/radeon/cik_sdma.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.h b/drivers/gpu/drm/radeon/cik.h index 297b3c1ff804f..6630b9da9e7aa 100644 --- a/drivers/gpu/drm/radeon/cik.h +++ b/drivers/gpu/drm/radeon/cik.h @@ -29,5 +29,6 @@ void cik_enter_rlc_safe_mode(struct radeon_device *rdev); void cik_exit_rlc_safe_mode(struct radeon_device *rdev); int ci_mc_load_microcode(struct radeon_device *rdev); void cik_update_cg(struct radeon_device *rdev, u32 block, bool enable); +u32 cik_gpu_check_soft_reset(struct radeon_device *rdev); #endif /* __CIK_H__ */ diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c index 3c709ebe8d1ab..919b14845c3c7 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -27,14 +27,13 @@ #include "radeon_ucode.h" #include "radeon_asic.h" #include "radeon_trace.h" +#include "cik.h" #include "cikd.h" /* sdma */ #define CIK_SDMA_UCODE_SIZE 1050 #define CIK_SDMA_UCODE_VERSION 64 -u32 cik_gpu_check_soft_reset(struct radeon_device *rdev); - /* * sDMA - System DMA * Starting with CIK, the GPU has new asynchronous