From patchwork Wed Jan 11 15:41:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 42060 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3391407wrt; Wed, 11 Jan 2023 07:42:24 -0800 (PST) X-Google-Smtp-Source: AMrXdXuYnf18XTfiFhMWwf7PUExrLFVH24A1xlfpGUl/NTZCTJM+pkzxQX9rdXknpFu4O/iOM/tk X-Received: by 2002:a05:6402:3887:b0:496:4d2f:1b4b with SMTP id fd7-20020a056402388700b004964d2f1b4bmr17969631edb.7.1673451744410; Wed, 11 Jan 2023 07:42:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673451744; cv=none; d=google.com; s=arc-20160816; b=LKDj2F1JlS6j5H4iCwZ5p3Xz/apwfvVGcUfIwMVc9MtxcOHYVTryZ9SA3ATguQkfze /2lhqKiOyob5evlVMDKO0x1Gi8/oBMRawoF+a1yDyNWnoMMmGzLUW3ZZhvrC8Epg5ekK cmdmHE8Fd7FKodK91MTtLcpcs6ieq2a+Q8Aw2kYpmoF9aluUe3L6sdU6KPqYhLKKVIkT CUi2WV9Xf9I2Wjo1vgBBP5Mxa6fPQVzcJe45ZY0rr0SKhQQt2rkkccPJGOyUj+oVlr1z 1dzdhbn4lxrEOOlSxcBNYz5+UG6wIAsrS/3l3bnEoW/gQXzMaOWfKBeLWvbRKFKKQL6U 0eng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tJcVjf8pDC4yO+skqSU0XKC89Tk1zxOfzlV0lRIff7c=; b=WpkvRTWJesO5UzL5H89N6DK8XubPQwoLGhd/kr5PozLEq+deZNqqP8efleUfbOaNsN SMroIo0iAlp4mZYZKgytwCmVfQkQ5mDus97tzRQkRnrYvXpt+QGv950PitN1C7f9HWii r4xcH/cxhlQZuMFhniC7wnXqkQvHdRfxhH0ltikj+kgcGFn8m+dTUVvJAcEWKBrJITAl Qy6kWYOVR+WDbVcJIU6dlFbW9/Q2NmHnAyvWPVo25bvS+6c2zjGD1T24ypvYbX++eyho YReP+m0TmoCue9wCI8BHySHKwObQ2JtCm0xmMOTLu4Q63O4SeynSP3VwxpnS2V2UylZQ R/iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b=aZrY9NQH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g14-20020a056402090e00b0048721e1b62csi17579149edz.613.2023.01.11.07.42.00; Wed, 11 Jan 2023 07:42:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b=aZrY9NQH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238814AbjAKPlu (ORCPT + 99 others); Wed, 11 Jan 2023 10:41:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234924AbjAKPl3 (ORCPT ); Wed, 11 Jan 2023 10:41:29 -0500 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D089D43 for ; Wed, 11 Jan 2023 07:41:28 -0800 (PST) Received: by mail-wm1-x330.google.com with SMTP id bg13-20020a05600c3c8d00b003d9712b29d2so14682005wmb.2 for ; Wed, 11 Jan 2023 07:41:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tJcVjf8pDC4yO+skqSU0XKC89Tk1zxOfzlV0lRIff7c=; b=aZrY9NQHD2THbetIXlgCj7dIm+IHrmHhq7F17hc477mP1n6APHub6Ck2CJ3DzdinLT ElgTJWC47fGty6V4ACS9w2xVnnEuSz4Z9Kz+uIPLYWQdsKohf8UMi7KQUG29Hent2GEo Jqem0opQMtn8iekTGOrnsTul/w0T9hALDGZaE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tJcVjf8pDC4yO+skqSU0XKC89Tk1zxOfzlV0lRIff7c=; b=UN75pwRTYBhm9beKyiQ/H5jrUB0QjdcmojEaFLmNKnc6s5x5XwrCvflECq0J23PzTw 5vGYtU3ADpwpbtwHLCOPpcNLVad4ruPEYfFWixFkeg4Nvz+bVj/TTyNNZ7mGT6YLcToA 6xatWVeAaAkgFBewP43AWr+udLvzE4iTp22av31WVYmbDcvPvdF1eNWSAxqDvxghWViL Abiyd3sBcXPNXle5JvNXe+/b93ycE109F+TPn2+0IGqIUdBAQXJBcjcpAO29weY4GQGj K5EkBIuvPWjdPut95rNb+IUrW0n6FRSh+t+pzemFg0V5AvzW4xTPfLHD47dbvi6BbInC ILhQ== X-Gm-Message-State: AFqh2koPMJxHstywZ4M7WfYTDj2J/aomg5V80GyIsTyHEUCKt7CLMrT1 KZIeBGahfL+Y9mwd9+ByATqqpg== X-Received: by 2002:a05:600c:1d8a:b0:3d9:ebab:ccff with SMTP id p10-20020a05600c1d8a00b003d9ebabccffmr10800367wms.33.1673451687083; Wed, 11 Jan 2023 07:41:27 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id t9-20020a05600c198900b003d9e74dd9b2sm15936149wmq.9.2023.01.11.07.41.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 07:41:26 -0800 (PST) From: Daniel Vetter To: DRI Development Cc: Intel Graphics Development , LKML , Daniel Vetter , Daniel Vetter , Thomas Zimmermann , Javier Martinez Canillas , Helge Deller , linux-fbdev@vger.kernel.org Subject: [PATCH 05/11] video/aperture: Only kick vgacon when the pdev is decoding vga Date: Wed, 11 Jan 2023 16:41:06 +0100 Message-Id: <20230111154112.90575-5-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230111154112.90575-1-daniel.vetter@ffwll.ch> References: <20230111154112.90575-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754741336417872604?= X-GMAIL-MSGID: =?utf-8?q?1754741336417872604?= Otherwise it's bit silly, and we might throw out the driver for the screen the user is actually looking at. I haven't found a bug report for this case yet, but we did get bug reports for the analog case where we're throwing out the efifb driver. References: https://bugzilla.kernel.org/show_bug.cgi?id=216303 Signed-off-by: Daniel Vetter Cc: Thomas Zimmermann Cc: Javier Martinez Canillas Cc: Helge Deller Cc: linux-fbdev@vger.kernel.org --- drivers/video/aperture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c index 3d8c925c7365..6f351a58f6c6 100644 --- a/drivers/video/aperture.c +++ b/drivers/video/aperture.c @@ -341,6 +341,9 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na return ret; } + if (!primary) + return 0; + /* * WARNING: Apparently we must kick fbdev drivers before vgacon, * otherwise the vga fbdev driver falls over.