From patchwork Mon Nov 16 17:36:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11909957 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3ADBBC4742C for ; Mon, 16 Nov 2020 17:38:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DA6142227F for ; Mon, 16 Nov 2020 17:38:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="WirrMl8f" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA6142227F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B54B6E042; Mon, 16 Nov 2020 17:38:17 +0000 (UTC) Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 355926E04A for ; Mon, 16 Nov 2020 17:38:01 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id r17so19666558wrw.1 for ; Mon, 16 Nov 2020 09:38:01 -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=RO6gVjdG8KAsdeDZko1zQc/smdj+DRpN8GOLXtDNvO8=; b=WirrMl8fUxp4CO5aIQmGr0dbC4i6LjQ5TaIvP1F18yQ9bcjLr9Ahv5ncmc+D+rDiB6 jnXwyVZOgt697WzPOCzN35MCspjL1F3oMNO4pyQlFbKV/AqhvkypMuRxRQYT7fGT5qm7 qoIltC6EqdtoQgVkm/2T9Ne73ONBGIgLLk6eKipqsjzPYB6rLceNhPW8BkX68K8qJ+0u gOl5LCqRWDmgdQzuSIwQXhlqFz6Wwc565XdPtH5Eap/jQVVI88UzJJ2k1AWvaVfFKnLP xQRuYkkDCZemobG+VP2trTK/7X/r5owlR/Xg6sjuoQ6grn7zRLl0HAvyrc3Z2BHBeROE M6iQ== 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=RO6gVjdG8KAsdeDZko1zQc/smdj+DRpN8GOLXtDNvO8=; b=MfHyT99snw89J+uL85KoAcrrcmUh1TpkRwokFxXVSCMZ8pp3Kh0XtwgVtcMQUrbhFe l/moIBLvLd9m23bFK2qrYPJYKEYI2A9rHIP1S4ArNiS7753DnzJVMQu/31+uyWvDXl8E wKXBkPZ1RqQyr8pbccewOdevsztgpxGwUoAIaDX1vBUsnQx47KvcW0HiUlLeb42wtSx8 qSGenhaiOw/pRzYQEg5EOQC8MeCHLdwPi3NaHGikZWkidNDjujGgswiZ1nRJwIF/VnVD v+YPlGHKn7IQGtri3MhXLXRQM7LabPybGcNpqYt1r+2FTSg5LMK2IpEyQURaVkT2dzsF Qy4A== X-Gm-Message-State: AOAM5314lxjsQ9+6xPKGxLzDS9oP8T9ATOtcsigNa64m360/BgE8pUGC dB+n3moC3qG5xE/12dH1Z3A3Ug== X-Google-Smtp-Source: ABdhPJyDb6MSSsrxeaZ0Ak/n2fUOzh8hKJoprG7a4vmxqPmZhO/GHAqyfWZv5CNERO41midRYzTR3g== X-Received: by 2002:a5d:634b:: with SMTP id b11mr19958992wrw.97.1605548279761; Mon, 16 Nov 2020 09:37:59 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id 30sm16942828wrd.88.2020.11.16.09.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:37:59 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 41/43] drm/radeon/evergreen_cs: Move 'r600_dma_cs_next_reloc()'s prototype to shared header Date: Mon, 16 Nov 2020 17:36:58 +0000 Message-Id: <20201116173700.1830487-42-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=B6nig?= 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_cs.c:2343:5: warning: no previous prototype for ‘r600_dma_cs_next_reloc’ [-Wmissing-prototypes] 2343 | int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, | ^~~~~~~~~~~~~~~~~~~~~~ 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_cs.c | 3 +-- drivers/gpu/drm/radeon/r600.h | 4 ++++ drivers/gpu/drm/radeon/r600_cs.c | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index 53b75cf201958..0de79f3a7e3ff 100644 --- a/drivers/gpu/drm/radeon/evergreen_cs.c +++ b/drivers/gpu/drm/radeon/evergreen_cs.c @@ -28,6 +28,7 @@ #include "radeon.h" #include "radeon_asic.h" +#include "r600.h" #include "evergreend.h" #include "evergreen_reg_safe.h" #include "cayman_reg_safe.h" @@ -37,8 +38,6 @@ #define REG_SAFE_BM_SIZE ARRAY_SIZE(evergreen_reg_safe_bm) -int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, - struct radeon_bo_list **cs_reloc); struct evergreen_cs_track { u32 group_size; u32 nbanks; diff --git a/drivers/gpu/drm/radeon/r600.h b/drivers/gpu/drm/radeon/r600.h index e66ef58706cd8..dbdff4568516b 100644 --- a/drivers/gpu/drm/radeon/r600.h +++ b/drivers/gpu/drm/radeon/r600.h @@ -28,10 +28,14 @@ #ifndef __R600_H__ #define __R600_H__ +struct radeon_bo_list; +struct radeon_cs_parser; struct radeon_device; u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); int r600_ih_ring_alloc(struct radeon_device *rdev); void r600_ih_ring_fini(struct radeon_device *rdev); +int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, + struct radeon_bo_list **cs_reloc); #endif /* __R600_H__ */ diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index f20b619466816..dc68e538d5a97 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -29,6 +29,7 @@ #include "radeon.h" #include "radeon_asic.h" +#include "r600.h" #include "r600d.h" #include "r600_reg_safe.h"