Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753425AbcCAVOz (ORCPT ); Tue, 1 Mar 2016 16:14:55 -0500 Received: from galahad.ideasonboard.com ([185.26.127.97]:45166 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751778AbcCAVOy (ORCPT ); Tue, 1 Mar 2016 16:14:54 -0500 From: Laurent Pinchart To: Arnd Bergmann Cc: David Airlie , linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm: rcar-du: clarify vsp dependency Date: Tue, 01 Mar 2016 23:15:03 +0200 Message-ID: <1889313.6DCL1oqnHh@avalon> User-Agent: KMail/4.14.8 (Linux/4.1.15-gentoo-r1; KDE/4.14.8; x86_64; ; ) In-Reply-To: <1456487546-3886345-1-git-send-email-arnd@arndb.de> References: <1456487546-3886345-1-git-send-email-arnd@arndb.de> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1554 Lines: 46 Hi Arnd, Thank you for the patch. On Friday 26 February 2016 12:52:20 Arnd Bergmann wrote: > The VSP1 compositor code in DRM links against the respective V4L > driver, but the dependency is not expressed correctly in Kconfig, > which leads to a build error when the DRM driver is built-in > and the V4L driver is a module: > > drivers/gpu/built-in.o: In function `rcar_du_vsp_plane_atomic_update': > rcar-du/rcar_du_vsp.c:183: undefined reference to `vsp1_du_atomic_update' > > This patch avoids the problem by ensuring that the DRM VSP code can > only be enabled if the V4L driver is linked into the kernel, or > both are loadable modules. > > Signed-off-by: Arnd Bergmann > Fixes: 6d62ef3ac30b ("drm: rcar-du: Expose the VSP1 compositor through KMS > planes") Acked-by: Laurent Pinchart Dave, could you please queue this for v4.6 ? > --- > drivers/gpu/drm/rcar-du/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/rcar-du/Kconfig > b/drivers/gpu/drm/rcar-du/Kconfig index 1f10fa0928b4..eb1e6d5cfed9 100644 > --- a/drivers/gpu/drm/rcar-du/Kconfig > +++ b/drivers/gpu/drm/rcar-du/Kconfig > @@ -27,6 +27,6 @@ config DRM_RCAR_LVDS > config DRM_RCAR_VSP > bool "R-Car DU VSP Compositor Support" > depends on DRM_RCAR_DU > - depends on VIDEO_RENESAS_VSP1 > + depends on VIDEO_RENESAS_VSP1=y || (VIDEO_RENESAS_VSP1 && DRM_RCAR_DU=m) > help > Enable support to expose the R-Car VSP Compositor as KMS planes. -- Regards, Laurent Pinchart