From patchwork Mon Jun 24 09:21:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11012707 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6C4FE1398 for ; Mon, 24 Jun 2019 09:22:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 586A928AF3 for ; Mon, 24 Jun 2019 09:22:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49BF428B4C; Mon, 24 Jun 2019 09:22:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2080528AF3 for ; Mon, 24 Jun 2019 09:22:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726481AbfFXJWB (ORCPT ); Mon, 24 Jun 2019 05:22:01 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:36611 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726438AbfFXJWB (ORCPT ); Mon, 24 Jun 2019 05:22:01 -0400 Received: by mail-ed1-f66.google.com with SMTP id k21so20782939edq.3 for ; Mon, 24 Jun 2019 02:22:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+BUYv0zqx8JIAejbVUFuWCyUFzi0Ma0oiXTkdM9XeBA=; b=D5WZwKUOqaEYxf9YiCGA1hGGeS+fnJ87Uk5TnGhZMEmbhxOZBjbdtmZi5JFaciO6rf fYk4DRN8WEzOg5rJR6avnD3k16txo0YzxSmxnlh68316/FKyoLfFUebCQ7IGOZqBH7ii KwbVftADxitSPXm1+Z5+bbC5EWcXZytEwhHbc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+BUYv0zqx8JIAejbVUFuWCyUFzi0Ma0oiXTkdM9XeBA=; b=d/nFWg7APGUjz0xHBbEHBDTHzefbgnijZ7X8sxmDNIyjb9Oly4joknQnmazviKvzr6 7/yN1EtP9QVxHO6E/d9ux0EYDILiEZEMau9K1sLCxK3bQh/JK5JyzBbBkm78fOFKtD7q kkSfU18s/TxKY7YWN+hQWNPa+OZmwOYfKOVjfAj2cv0x7ZOtljubjg3jcVbtcf4QmscK G7Q56L10zfaPZiRVmMmklx4WAlc8Iw9ZQ4B5OGX+nNYSfHZWS3CSFFWjj8l3TIzbj/mg 4OaPZQKZ7hy2kSG8U1UpkXYgI/OK+eKvLrP7QGMcqc57kst3BDrN2jUmJtYUiWtzqy53 EN3A== X-Gm-Message-State: APjAAAXBDNvz4/6vpS6HF81xO1nzxlUiM6NR8mdBE4CZuBeEif5G391o /xT1Lihj3wqIgGEUfxNqaaV0DCtboPY= X-Google-Smtp-Source: APXvYqz8Q2nVLs1tDAdsiwqZ2dYDUxN/Py220zuadxrweoxy+8stjJzd4MvG81Wi2CYIZ1kAGnzZXw== X-Received: by 2002:a17:906:1dcb:: with SMTP id v11mr1768180ejh.218.1561368119634; Mon, 24 Jun 2019 02:21:59 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id c3sm1769156ejo.43.2019.06.24.02.21.58 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 24 Jun 2019 02:21:58 -0700 (PDT) From: Daniel Vetter To: DRI Development Cc: Daniel Vetter , Stephen Rothwell , kbuild test robot , Lukas Wunner , Daniel Vetter , Sam Ravnborg , Maarten Lankhorst , David Airlie , Daniel Vetter , Maxime Ripard , Sean Paul , Bartlomiej Zolnierkiewicz , Hans de Goede , Yisheng Xie , linux-fbdev@vger.kernel.org, Daniel Thompson , Lee Jones Subject: [PATCH] vga_switcheroo: Depend upon fbcon being built-in, if enabled Date: Mon, 24 Jun 2019 11:21:53 +0200 Message-Id: <20190624092153.23375-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fixes linking fail when fbcon/fbdev is modular and vgaswitcheroo is enabled: x86_64-linux-gnu-ld: drivers/gpu/vga/vga_switcheroo.o: in function `vga_switchto_stage2': vga_switcheroo.c:(.text+0x997): undefined reference to `fbcon_remap_all' v2: I first tried to fix this with an EXPORT_SYMBOL, but vga_switcheroo is never a module, so this doesn't work. Reported-by: Stephen Rothwell Reported-by: kbuild test robot Fixes: 1cd51b5d200d ("vgaswitcheroo: call fbcon_remap_all directly") Cc: Stephen Rothwell Cc: Lukas Wunner Cc: Daniel Vetter Cc: Sam Ravnborg Cc: Maarten Lankhorst Cc: David Airlie Cc: Daniel Vetter Cc: Maxime Ripard Cc: Sean Paul Cc: Bartlomiej Zolnierkiewicz Cc: Hans de Goede Cc: Yisheng Xie Cc: linux-fbdev@vger.kernel.org Cc: Daniel Thompson Cc: Lee Jones Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Daniel Vetter --- wrt merging probably best if Maarten adds this to the topic branch we have already and sends out an updated pull request. Apologies for the mess. -Daniel --- drivers/gpu/vga/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig index 84ab482d0db6..c8c770b05ed9 100644 --- a/drivers/gpu/vga/Kconfig +++ b/drivers/gpu/vga/Kconfig @@ -23,6 +23,7 @@ config VGA_SWITCHEROO depends on X86 depends on ACPI depends on PCI + depends on (FRAMEBUFFER_CONSOLE=n || FB=y) select VGA_ARB help Many laptops released in 2008/9/10 have two GPUs with a multiplexer