From patchwork Wed Nov 11 18:35:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324134 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623004ils; Wed, 11 Nov 2020 10:36:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJya5wxeSuy3iIRKXsDkMC61e6veqYsdO//zEeL51wPeDNU3WXWDM/++l4o9Z2j6/gB6WNDo X-Received: by 2002:a17:902:ba8b:b029:d7:e6da:cd21 with SMTP id k11-20020a170902ba8bb02900d7e6dacd21mr13193078pls.38.1605119772117; Wed, 11 Nov 2020 10:36:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119772; cv=none; d=google.com; s=arc-20160816; b=KDfb4nfnGk7vJK9ytpnRA8ujNK6WjC0JvI7kd5mrGze2RybtM6XQUZQgfC+0OeZvcN fXEYUyRyFp62WAUl8mC6VRvFG3Mvz8AZKGlpC2R6ce5/p5jYqEv1z0tQ+tx+3EYrbKKj /XJ9nZRCQ1DjAnoVzeqvRviFj9nfZeNizcZyv210EcSj0QefDziwZLurViogQahogOOH Uxu13Z0IKhngCQNkBF8Bz9wJenhLxEUlPKP+yg6pEhiA6Vjbgv+IJdgsFA+gd8W4BW8M 3Vg8AkLO4Ar7ScmpSiaZjyhwwgwRmqdX7f87lWat6X/I8V5GZRcIAJobJI8rX7JsUY4F YwNw== 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=OuIzlOVqeXOyhG4aMR/6XvXcDY+FOgtmmVtOYuxRxOk=; b=PFt7CJ2HK/IWuSVX6irT0Znu5gkehfQ6+bjIkaYkbHqwqtMLt3mSVRIlhZSfIiJXpm hTEFqdXm24MrM4pZRt1UokKH2VgKdA4rmxaRA6+dTQze12rpKhedn7I548KkL8AeqRAS f9+dFWafNDjWzwSFc21jPa9duq1gzsT0rwClYzSkX1TYKRcSAk/49bdXrHw2ySdnEaC6 P1NguBFqFzkxYfXaSGjyr1Hp5QeYCsOaHb0n3RpB4xDNc11uumXFBxg41a6V8/4yeDWV m6KSVlR6fIRtc4MX88H7KJMcU3hzOkGuGWC/bMURMJ0L5QswJZfb09DtVPLmQ/rKuDUt bufg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Z3euSqif; 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 n10si2514926pgt.542.2020.11.11.10.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:12 -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=Z3euSqif; 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 3BB256E0C2; Wed, 11 Nov 2020 18:36:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id A5AEC6E0BA for ; Wed, 11 Nov 2020 18:36:03 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id c16so3255863wmd.2 for ; Wed, 11 Nov 2020 10:36:03 -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=Qh+SB3F0wBSwPJdxJvDqep6O/eLLWzPpPvay6C9QqmM=; b=Z3euSqifNwhu6ebXW5Gn4HJE9Yrd49M2yyiJejyPG3OBZSHtj/wbH/SAXvd9F/iwBQ 8FDI9vSOlm7tmv2uIeobzdDRXa9KBXZnAGQQ8LCyZsMtyagmQRTmyRw6G1pyBIJfj4sT LZ5qoVGnqhXDxbs0M9QvOx6n4nolTJmxEXKS9nFIJ3MbERYVarJ1SrfEnjbYy08ct8v+ hNdwbpEouUdQK5qYj5eOLFjoupuVUuETdzgN8bKKbT0Pxw1LCqh7g3+BTFeoov1iiTWO IsdNw7GqJvo3N1osqhhyB3/R6T1BA8EdglHEtkCt1UNLq15nd6wAASH4X8ieuXoVFVZ8 rwUw== 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=Qh+SB3F0wBSwPJdxJvDqep6O/eLLWzPpPvay6C9QqmM=; b=LV1OJTtU3JSKFpMWp5s2qSCchla33RHbMLVCCTSiF/Vrk0de+k7K8c1fDy+DuuhPQ4 xHf/17lBEUHQLsbk+DnmKri39Rh8nMmwezJMUEb1khx7lBV7LXzSEfYRxr570A5lZAq/ v8z+AWWVVFW4ME8QrxgT/da/6sEcONsZk/VQn4wQJFhqvZEY+e6R498vTRl+IXdYMm/x uSZQjD/6Vlf5A9qqEb03qNjUPXy8Cz1CrwBr1xVau3Vb9WDwjdOCmsJ9zfwtxoK3jeK9 RRqRGS+ORKl0+z6SN1DtBBVuWIllpfRDHwQWk+TuafypTN7+qIi1TaAEG6rWNtKFvPiZ ua2Q== X-Gm-Message-State: AOAM531kmn9bvAc2BnnX1ADtQhUMxlJnIgYJI1blp65gSkxIDAmViFVG z5kh8kr4YQdKYoiuVAlddyGvBA== X-Received: by 2002:a7b:c453:: with SMTP id l19mr5463021wmi.2.1605119762301; Wed, 11 Nov 2020 10:36:02 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:01 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 09/19] drm/radeon/cik: Move 'si_*()'s prototypes to shared header Date: Wed, 11 Nov 2020 18:35:35 +0000 Message-Id: <20201111183545.1756994-10-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, =?utf-8?q?Christian_K=C3=B6nig?= , linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, Alex Deucher , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/si.c:4186:6: warning: no previous prototype for ‘si_vram_gtt_location’ [-Wmissing-prototypes] 4186 | void si_vram_gtt_location(struct radeon_device *rdev, | ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si.c:5186:6: warning: no previous prototype for ‘si_init_uvd_internal_cg’ [-Wmissing-prototypes] 5186 | void si_init_uvd_internal_cg(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/radeon/si.c:5801:6: warning: no previous prototype for ‘si_rlc_reset’ [-Wmissing-prototypes] 5801 | void si_rlc_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~ Cc: Alex Deucher Cc: "Christian König" Cc: David Airlie Cc: Daniel Vetter Cc: Sumit Semwal Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Lee Jones --- drivers/gpu/drm/radeon/cik.c | 4 +--- drivers/gpu/drm/radeon/si.h | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index af08d6f1be53e..0330ee86a372b 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -40,6 +40,7 @@ #include "radeon_asic.h" #include "radeon_audio.h" #include "radeon_ucode.h" +#include "si.h" #define SH_MEM_CONFIG_GFX_DEFAULT \ ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED) @@ -127,9 +128,6 @@ MODULE_FIRMWARE("radeon/mullins_mec.bin"); MODULE_FIRMWARE("radeon/mullins_rlc.bin"); MODULE_FIRMWARE("radeon/mullins_sdma.bin"); -extern void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); -extern void si_rlc_reset(struct radeon_device *rdev); -extern void si_init_uvd_internal_cg(struct radeon_device *rdev); static u32 cik_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh); extern int cik_sdma_resume(struct radeon_device *rdev); extern void cik_sdma_enable(struct radeon_device *rdev, bool enable); diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h index a1751ae560f02..f483a64d17050 100644 --- a/drivers/gpu/drm/radeon/si.h +++ b/drivers/gpu/drm/radeon/si.h @@ -25,8 +25,12 @@ #define __SI_H__ struct radeon_device; +struct radeon_mc; int si_mc_load_microcode(struct radeon_device *rdev); u32 si_gpu_check_soft_reset(struct radeon_device *rdev); +void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); +void si_rlc_reset(struct radeon_device *rdev); +void si_init_uvd_internal_cg(struct radeon_device *rdev); #endif /* __SI_H__ */