From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753345AbcHBK2S (ORCPT ); Tue, 2 Aug 2016 06:28:18 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:63842 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752000AbcHBK2I (ORCPT ); Tue, 2 Aug 2016 06:28:08 -0400 From: Arnd Bergmann To: David Airlie , Gerd Hoffmann Cc: Archit Taneja , Tobias Jakobi , Arnd Bergmann , Daniel Vetter , Emil Velikov , dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/virtio: fix building without CONFIG_FBDEV Date: Tue, 2 Aug 2016 12:09:15 +0200 Message-Id: <20160802100922.3914038-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:G0XCRL23kW8FdFW+cpvyRCkLedX7pEbnr2pd9dw8ginJglcbzsw ycbRIAG82JpvO5kfnoH4DN92vNT7BeUh8c3o0Qou8PwnHnqZKI/QVa4IdJX4/2KZmcaTEiS BJ2jHqJrdFOtXYolcZ1UDyiAIBhSnLRyIls5ffopr3bv5DFNeSfUGNo4zXLIUoqbGGrvX2A JfDHcxY0nTvBSDV9/Kw6A== X-UI-Out-Filterresults: notjunk:1;V01:K0:FMdD4LBDHYA=:2HsuYnrue1Z72wvnSWFXkV cOTA42P2+VDW4pQakqkfgLkqTunFyLj6fQGiJcIXFJYiYDDMOcVmrBFyJmJ9Eukh/J3iOypHU cPcSKZZzneD7SzTAW9bbh/5r1zwJI+qA0ICiExIONX0dBJq1bdahEG5mzm+xs1GO6g0mn9sG/ 6IWM4OetM0rfhHblD1CEnVpPJRivQBGORBqf/aomrF6nhtaz54ZGl6AjldgJTpIs1b7YVVG/K F4njpUh52GncBuZbk+CmDFURRJnVHuruXvDwsqSBimNXu+p49SIaSK07aX4H5xLZFvxXobk44 7WjJaVNR0+G5bd+4KsQGJkjdJo4TUB7QZ4oeAvLcPCjMIwZL/lxduxZxPfKA7ZU3ICXxm+LkV nS4E8W9pKZPK3a2QZ9bIpHSCeXc05yUhZu2phbGlM4mM1W78l88CTiMirxcR1tCEyL9sWCIcT whkEaGHUzG77TG+dJUVENFkujHFacPQwLD56KDcqOHpfRgjtxuQNWZy3OgS+SjMqU8TbCsVp5 gM9Y8qGOeQfF4zCY/ovFbdnGT7OfL4RcIeHDY3RrWbJonDVELfUdPvFi+TNovU7L9DGO2t/z1 rUlvrJeMwbREYb/y1SqnL+Lq5FeF7NFMPFnWbp19QVVxmrj1+hemIOE3+GhI+S9zfLNUE1i60 16MkjSFpuNZB1y/UxDO4pxKwX5PW5RPBhCXpXZrwTYgV5zIf7ABjT9mxVszb0n3EepPI= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Removing the build-time dependency on DRM_KMS_FB_HELPER means we can now build with CONFIG_FB disabled or as a loadable module, leading to a link error: ERROR: "remove_conflicting_framebuffers" [drivers/gpu/drm/virtio/virtio-gpu.ko] undefined! There is no need to call remove_conflicting_framebuffers() if CONFIG_FB is disabled, or if the virtio-gpu driver is built-in and CONFIG_FB=m, as there won't be any prior consoles that are registered at that point. This adds a compile-time check in the driver to ensure we only attempt to call that function if either CONFIG_FB=y or both subsystems are configured as loadable modules. Signed-off-by: Arnd Bergmann Fixes: 0b6320dfdfea ("drm/virtio: make fbdev support really optional") --- drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drm_bus.c b/drivers/gpu/drm/virtio/virtgpu_drm_bus.c index 7f0e93f87a55..2087569ae8d7 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drm_bus.c +++ b/drivers/gpu/drm/virtio/virtgpu_drm_bus.c @@ -65,7 +65,7 @@ int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev) DRM_INFO("pci: %s detected\n", vga ? "virtio-vga" : "virtio-gpu-pci"); dev->pdev = pdev; - if (vga) + if (IS_REACHABLE(CONFIG_FB) && vga) virtio_pci_kick_out_firmware_fb(pdev); } -- 2.9.0