From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967129AbcHBN7S (ORCPT ); Tue, 2 Aug 2016 09:59:18 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34195 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965863AbcHBN6n (ORCPT ); Tue, 2 Aug 2016 09:58:43 -0400 Date: Tue, 2 Aug 2016 15:58:38 +0200 From: Daniel Vetter To: Arnd Bergmann Cc: David Airlie , Gerd Hoffmann , Archit Taneja , Tobias Jakobi , Daniel Vetter , Emil Velikov , dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/virtio: fix building without CONFIG_FBDEV Message-ID: <20160802135838.GQ6232@phenom.ffwll.local> Mail-Followup-To: Arnd Bergmann , David Airlie , Gerd Hoffmann , Archit Taneja , Tobias Jakobi , Emil Velikov , dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org References: <20160802100922.3914038-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160802100922.3914038-1-arnd@arndb.de> X-Operating-System: Linux phenom 4.6.0-1-amd64 User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Aug 02, 2016 at 12:09:15PM +0200, Arnd Bergmann wrote: > 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") Reviewed-by: Daniel Vetter Dave, can you pls pick this one up directly? -Daniel > --- > 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 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch