From patchwork Wed Nov 11 18:35:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324136 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623041ils; Wed, 11 Nov 2020 10:36:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJxV00D6VGzPI5NENkKTtPUnjT54D0//9Kn5Gchum8fmzNAzFpEGKHORSUyfHOzaG5qqvgiN X-Received: by 2002:a17:90a:e615:: with SMTP id j21mr5179771pjy.74.1605119775655; Wed, 11 Nov 2020 10:36:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119775; cv=none; d=google.com; s=arc-20160816; b=Sve312AjY1znank9/IXU3wKN88nrPppaOBK06JbfSl0VNUetUestVlDFe76fgY6UyR l7i18PAzJ11yN97omaivQblGfoYRfBNQsekAL7juUMT4XZFD4NVORgBRIbt5Lft4K9ZO Wo7PYGGQm2LY8zxIGHUMlcbzTLRKyhONukHSXGDg6gksWc7Dh1Cm1YYVovgBQHAtF3Sq UJK8VQH6SCCs3PKlilWnj6/XcGTut0aGqycWrzQGkSCGC04fu8o2JSHUkV9ymhA+LaZK xdQM7laxTYSTn1xS0a4Z1gwEPWl17YeilspHk4LapurIFM8p97UdsOttGygktr25+xB0 Mrlw== 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=FRiw0NNmhi6ds5hsaxhnPWKGqlNFtCDJCa8NJnGx2GGCVkc5WOnNb9ozD3qPi3aA7K KKDgsoQNafpessaljXlDjq9W4OWoLIChsnADkHySs21eCccf29bQlMxJhlvtlJ+olN7S I7RvHuxw/1ETZG5B3yxZHtrVy6iuBR53TeUzDxkFTP+NQ5hAZTDVUy6WB2O1W0to4pUj /cfkFDA+FWEW0FSCnKWnczFIBqGNC6dfOJC6cyWZ4jc9NpJsxjaPoD9MR39pAXFSHu42 FbNPRMb21AuTNmhDhM2Z8uk86AJN3KiSMdlEIAA1PYYyX0835Ly3Nh0MZtm3NLSfX0O6 BnIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=otqPagV4; 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 o207si2945672pfd.67.2020.11.11.10.36.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:15 -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=otqPagV4; 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 A7A3C6E0C5; Wed, 11 Nov 2020 18:36:13 +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 0034F6E0C5 for ; Wed, 11 Nov 2020 18:36:08 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id c17so3464931wrc.11 for ; Wed, 11 Nov 2020 10:36:08 -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=otqPagV4SXXd1S4bOoNcEs67FQlaLvEbku6qmOoK8aE1zjdLYKVfZt2v7JkFaWtoGt doYNKSwpGKD6zLqXc1RSr97zszWJFrqrtVFwB+HAQ7qkJvhfIaU9qI9XjbLIi2Op/aL9 TrIP0kutM2A86a1F2u6S3zDK33RL70wJY9BMgSuSjYlf0dBV8/pwJA18QUXQJvUpAGEb 1ZKO9CR685LbV9yHiwaEocPif42d5g7zo9lzvVZs5Ni7nLvTPgjAT8U2kUchMUnD98Ka qf4zusM43Z6CxOQbTVYWg15XQw4u+Kj1yRWp+rOBegM5YgeBcvj02UUQMWNw2YA2bwLV P10w== 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=bUOHKLNuNM7gpYqxz/01GyyxJPcnUQ54LP2UluwgrhSnmgsLz/YHUyNkWS9j2NRcE0 2/hKE9D2SzgyZdpI/QV81hGsKJnSy6s0BTr9dCfLqBYPupSovkoyUTD68BgwPjAbCRNN YEoWouj5odE0QWYh0wKvVZWYFS9q0KBfz4g7hZSZYs4V1XFNeSoFw+tzs0oNEm/rkh3U QTMOlaQvZuEHAb+xhH6yoRVZqt7EXIuBLME+ViCNFsA+qFmaJo3DgcatmdcVy6lAiPF3 mBLvI7uzrldAqLroFBILHcBFnEqmdQY+7Kl6ofElmMVJOTjDUMj7iqRXVeqMN3t3GRTM hfGA== X-Gm-Message-State: AOAM5332bs3KdiqsJM17wchxUMy5j5CilgJh3th8+hgVwT5xjZ1sw1Pg f2h5GHorzjvGOTUlH3Hh2j5ePw== X-Received: by 2002:a05:6000:1d1:: with SMTP id t17mr32946201wrx.164.1605119767603; Wed, 11 Nov 2020 10:36:07 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:06 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 13/19] drm/radeon/cik_sdma: Move 'amdgpu_cik_gpu_check_soft_reset()'s prototype to shared header Date: Wed, 11 Nov 2020 18:35:39 +0000 Message-Id: <20201111183545.1756994-14-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/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