From patchwork Fri Feb 26 11:52:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8436191 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CB721C0553 for ; Fri, 26 Feb 2016 11:53:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3113520396 for ; Fri, 26 Feb 2016 11:53:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 603D02037C for ; Fri, 26 Feb 2016 11:53:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751991AbcBZLw7 (ORCPT ); Fri, 26 Feb 2016 06:52:59 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:58935 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750883AbcBZLw7 (ORCPT ); Fri, 26 Feb 2016 06:52:59 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue001) with ESMTPA (Nemesis) id 0LkXZc-1a1JAe1JDQ-00aS62; Fri, 26 Feb 2016 12:52:28 +0100 From: Arnd Bergmann To: Laurent Pinchart , David Airlie Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm: rcar-du: clarify vsp dependency Date: Fri, 26 Feb 2016 12:52:20 +0100 Message-Id: <1456487546-3886345-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:gqSDW/W9lmhnaPs72NJjUuxWXppHD70jNwDx74+mnCwR+RvRq7d auLstk2sY2NmGHBABNNRJp0+MQ9kfHASxGxPOCO2gv1Iet32zAfWDXIUxiX5NNQiL/OlPu9 taE4+3tyZSalIxYIw36dM5BE5yObrFcioRjzSMOs4XILtRYqrBjOZl+3m4x8/ElwHhT1Wng EVpMPe3BU6kxEpvNeu6dA== X-UI-Out-Filterresults: notjunk:1; V01:K0:3VhQr7P5ltM=:TBecPksaU2dFbGogmH8XBI SzY3oTFwt3JGnbiRxz6GJuYhEnmszpGuot9igvDIOZr6tuOO9CIosQQi3myqk4tL3SKliZQSw GSV8dWc5aF2m9RWsYP2eBAjkPeOCR8jc8pvT3xF7h/gMt/y7vPOWd1pPOihsr4pVm5QQGwsmd nN//Q+sAHv6DpM5M5VjN01Z1hWNvR71llz0ijEtoN2JBjuNgL2Khh7cEKadb9V2/8kU4MFhQY 8pFBsN9VpNwF6ZTgM50EEVNRFRfzsUPjCD7RXEnyNUnanLNkMWkkYIkiiscNu/atHWPCaNisW dSflAcWI+Y6QaUCPh7jVD8MU9jhF9EEz7Q1E9xnlUegwwttK0F9d8X5uxq9GlwHmHeJ4jd69j +5BQwQrCL7SaSeLG5JFe35MGQmfWthIx/qE9ZkOKgmhNRnaLC2saxDJGiZ2ejWGjLPLwIPEhm 2YEtzKsTHfEwKAGJ9Jn9quNy/QFLr7dxq9Sa2kgn2TrSvbXH2oqlKqQQsn6DbgWo9pZdHv99l sYynAdRvhO3diSgiKmMkPHmFbyAFQmWnr6e6DmnLODbyK0XgeLwaUPnKWdJugy9VC0DBVimD6 lX5ySCnpndi3Lclzva74v9RYGpNdFocE6U/VuoDDOaVYrt/pPSdPhu6gvkP7nUygiKsciVr2v jbnpFWLj4w79lJsDFspLqSAm7EBpx2v5MjXDH2ig2vG9Pf7eiftCcLPd629HbmVXe+ts= Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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.