From patchwork Wed Nov 11 18:35:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 324144 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp623231ils; Wed, 11 Nov 2020 10:36:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJxkLusBWkVGYIAPEvoGfthdm9ZSn6Ec4UPEWCbJr+XPvtOREq7SnTNHEY4JYvEJbvxkkWND X-Received: by 2002:a62:6107:0:b029:18b:8e8d:917b with SMTP id v7-20020a6261070000b029018b8e8d917bmr23470869pfb.70.1605119790185; Wed, 11 Nov 2020 10:36:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605119790; cv=none; d=google.com; s=arc-20160816; b=Y0yjT6uk7yNrJhEM/DzUOVT0W/lFPxzmePHIhizIWmUvcFQJ6hkqGtp+nOzfZXw1TE NJWlbWZslnM5x48wUxeR8C1zmQH3KZrzyLMRF5eELNg/l4OygwJCJyHKN/1+4dMRc8m2 VhwxlNpjICJC/9qJEXei9W4uHuHEHg5GwOJM3HKcP6m+7tk98kYNwhUf6EcLd+YyxYoN RCH+61YO0JDQrVs/3y4+T3ndaRjiWKIbopH/8gimps46G3libwrsp5LP4VcJE8GG3asC FjBLNX9rUbjy5F2ulyFKRHzNVAaOWEf+HALbQVtlXtVqWhOmwADjfVDjmd4T2Dq+2FCQ Y3XQ== 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=KjBSk2AilLfmyyoqMRha3euqSgzsSiweNvrOwFwGFZs=; b=oWSqqXO9mhkDv9BGn5siv33MJlaZgMM0ysxE/vQQ/sykfvY+vjRe/2ob1MYgaFJ36n Qp2CqRaISg0Pi2rOQ87oSuFwHkRzqJ647rHJ2hnRmrluMQu5OPWgM1Lo0HXhuWOhotWD A792ugSRdaHLLR2EtoLwpuj6ZBT8vUss0WEN3KHGeKS7kiFMkmRlozkRpxvkHrCq8Cdu HS6rAearzd5j9fdoYcm1U7WUsq9EX0UmAtN+OwpTwP9FmO22/c2VT+gdM5cZUIjpujj7 7ilRQ+i/6ez7Kpq0WmJGwFN4FSy+5+rn6NWgdPJ0rw2udPgOY+dFlWsUj76r1WWpkljf zLRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=mMr7iJVO; 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 j7si2490333pjn.86.2020.11.11.10.36.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:30 -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=mMr7iJVO; 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 2C8106E0D7; Wed, 11 Nov 2020 18:36:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by gabe.freedesktop.org (Postfix) with ESMTPS id B89CA6E0C8 for ; Wed, 11 Nov 2020 18:36:15 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id w24so3282529wmi.0 for ; Wed, 11 Nov 2020 10:36:15 -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=tediDzLC047hOPrU32KTbEuOLPsPka6LUr15f9wO3Gk=; b=mMr7iJVO6/1xsFbpADaI0KX7kFyobKLggc8W56w7L3MMk2GfW4ljqeSfLeXhfyLEyj XjcdV/fGWT4uj/ehcXbaUUedrwdLzRksO/j39a1M/QzL8AVDA8lY6o8ZYh2yf6BNOu3e DokwqqpsUUt6tr8S1Kux1Dxrv2cbPTLIvSVIdfRuMbKgQ7Ptr3ZS/s4jeJ8fljJD6sYb v9NXlilvlnlZ68adPseWU4ZZM6H2kZQV/8utnv1rtWscJNiwN2k51ux+q5NmB5aAlXKc ZmV8EL5mCTwd7VfZihKfsERIoxLWBGqCUVn8V9w6s6As362FXbEMbtxmVL7KIepHs4eL rpNg== 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=tediDzLC047hOPrU32KTbEuOLPsPka6LUr15f9wO3Gk=; b=CKh2bINQ0/IZatW4V4yVOCK0a2TOsWFft4qcWMn9ETwL0q1Tzwq/p4H0YOaDEFAdRs SaTCEz3167hDwyV9ioQ33WqslSK3ZYxg4ueDqzpLerb1R/kVS14aTZJc5ekHQotp9knU 2nNQHPL+7k3ZSN8p57uPoorwOjHSbI3Bw6Jptjhb79bmhFYPI10IlX4UrYuxIsAGLYg4 R4emt80FRt5Ie9rccuILgZbUTSI8rmYQvcRwqBsNH4YZFaiuh8aYipSCzIzqaSkUyMzh pdaENeLU+MYbdgUFMCfY1KC5ix9OfmvwkQEgx8uLkcfG28ZahFimz5V/A1KgLOmwrohI pCFQ== X-Gm-Message-State: AOAM5317CpE/fbALJCZFx2WebxaeG/LLdUIBfASXpywF8hnwL21IJeq7 Sc4gxWV/zyGmRLOuygSf/Qs6OQ== X-Received: by 2002:a1c:20d0:: with SMTP id g199mr5981271wmg.68.1605119774423; Wed, 11 Nov 2020 10:36:14 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id k84sm3558311wmf.42.2020.11.11.10.36.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 10:36:13 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 18/19] drm/radeon/cik: Move 'vce_v2_0_enable_mgcg()'s prototype to shared header Date: Wed, 11 Nov 2020 18:35:44 +0000 Message-Id: <20201111183545.1756994-19-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/vce_v2_0.c:111:6: warning: no previous prototype for ‘vce_v2_0_enable_mgcg’ [-Wmissing-prototypes] 111 | void vce_v2_0_enable_mgcg(struct radeon_device *rdev, bool enable) | ^~~~~~~~~~~~~~~~~~~~ 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 | 2 +- drivers/gpu/drm/radeon/vce.h | 1 + drivers/gpu/drm/radeon/vce_v2_0.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index 4520ec4c7b2e2..ae2a507d13bb7 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -41,6 +41,7 @@ #include "radeon_audio.h" #include "radeon_ucode.h" #include "si.h" +#include "vce.h" #define SH_MEM_CONFIG_GFX_DEFAULT \ ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED) @@ -129,7 +130,6 @@ MODULE_FIRMWARE("radeon/mullins_rlc.bin"); MODULE_FIRMWARE("radeon/mullins_sdma.bin"); static u32 cik_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh); -extern void vce_v2_0_enable_mgcg(struct radeon_device *rdev, bool enable); static void cik_rlc_stop(struct radeon_device *rdev); static void cik_pcie_gen3_enable(struct radeon_device *rdev); static void cik_program_aspm(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/vce.h b/drivers/gpu/drm/radeon/vce.h index 1eb4f5715202e..ccc9c00f0d02c 100644 --- a/drivers/gpu/drm/radeon/vce.h +++ b/drivers/gpu/drm/radeon/vce.h @@ -30,5 +30,6 @@ struct radeon_device; void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); +void vce_v2_0_enable_mgcg(struct radeon_device *rdev, bool enable); #endif /* __VCE_H__ */ diff --git a/drivers/gpu/drm/radeon/vce_v2_0.c b/drivers/gpu/drm/radeon/vce_v2_0.c index d6fde3659e65f..163c9bfc03da8 100644 --- a/drivers/gpu/drm/radeon/vce_v2_0.c +++ b/drivers/gpu/drm/radeon/vce_v2_0.c @@ -30,6 +30,7 @@ #include "radeon.h" #include "radeon_asic.h" #include "cikd.h" +#include "vce.h" #define VCE_V2_0_FW_SIZE (256 * 1024) #define VCE_V2_0_STACK_SIZE (64 * 1024)