From patchwork Thu Feb 22 09:56:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 13567000 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9CFDCC48BEB for ; Thu, 22 Feb 2024 09:56:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DFFA810E446; Thu, 22 Feb 2024 09:56:40 +0000 (UTC) Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by gabe.freedesktop.org (Postfix) with ESMTP id D1EB910E7AF for ; Thu, 22 Feb 2024 09:56:38 +0000 (UTC) X-IronPort-AV: E=Sophos;i="6.06,177,1705330800"; d="scan'208";a="198839012" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 22 Feb 2024 18:56:37 +0900 Received: from localhost.localdomain (unknown [10.226.93.13]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 4B7AD41F0CE0; Thu, 22 Feb 2024 18:56:33 +0900 (JST) From: Biju Das To: Biju Das , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Stephen Rothwell , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, Geert Uytterhoeven , Prabhakar Mahadev Lad , Biju Das Subject: [PATCH] drm: renesas: rz-du: Fix redefinition errors related to rzg2l_du_vsp_*() Date: Thu, 22 Feb 2024 09:56:30 +0000 Message-Id: <20240222095630.85949-1-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fix the redefinition errors for the below functions on x86 by replacing CONFIG_DRM_RCAR_VSP->IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1) and adding EXPORT_SYMBOL_GPL for all: 1) rzg2l_du_vsp_init() 2) rzg2l_du_vsp_enable() 3) rzg2l_du_vsp_disable() 4) rzg2l_du_vsp_atomic_flush() 5) rzg2l_du_vsp_get_drm_plane() Reported-by: Stephen Rothwell Closes: https://lore.kernel.org/linux-next/20240222124610.383e1ce3@canb.auug.org.au/T/#u Signed-off-by: Biju Das --- drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 5 +++++ drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c index 0ae6331d6430..d0e597fb1459 100644 --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c @@ -57,11 +57,13 @@ void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc) vsp1_du_setup_lif(crtc->vsp->vsp, crtc->vsp_pipe, &cfg); } +EXPORT_SYMBOL_GPL(rzg2l_du_vsp_enable); void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc) { vsp1_du_setup_lif(crtc->vsp->vsp, crtc->vsp_pipe, NULL); } +EXPORT_SYMBOL_GPL(rzg2l_du_vsp_disable); void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc) { @@ -72,6 +74,7 @@ void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc) vsp1_du_atomic_flush(crtc->vsp->vsp, crtc->vsp_pipe, &cfg); } +EXPORT_SYMBOL_GPL(rzg2l_du_vsp_atomic_flush); struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc *crtc, unsigned int pipe_index) @@ -88,6 +91,7 @@ struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc *crtc, return plane ? plane : ERR_PTR(-EINVAL); } +EXPORT_SYMBOL_GPL(rzg2l_du_vsp_get_drm_plane); static const u32 rzg2l_du_vsp_formats[] = { DRM_FORMAT_RGB332, @@ -347,3 +351,4 @@ int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np, return 0; } +EXPORT_SYMBOL_GPL(rzg2l_du_vsp_init); diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h index 12d98f04bf89..322eb80dcbaf 100644 --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h @@ -54,7 +54,7 @@ to_rzg2l_vsp_plane_state(struct drm_plane_state *state) return container_of(state, struct rzg2l_du_vsp_plane_state, state); } -#ifdef CONFIG_DRM_RCAR_VSP +#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1) int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np, unsigned int crtcs); void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc);