From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AF80C432BE for ; Fri, 23 Jul 2021 22:43:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6900F60F23 for ; Fri, 23 Jul 2021 22:43:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6900F60F23 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6663E6F387; Fri, 23 Jul 2021 22:43:38 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 708446F387 for ; Fri, 23 Jul 2021 22:43:37 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 9E68B60E92; Fri, 23 Jul 2021 22:43:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627080216; bh=6EN36z09hEeXoO/5efY7I2rKYLkgTb0P2gte2sdaLGk=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=a2U97qiMngddptFL6b9JS1yxtny8DN+6PSvGW+PkQo0WqghRdTI6A4T9fH71Jw05M L8jIfJpo1HCUicXTVJboCuck6BtgAEe8hgPPoMnF0mUM9eH0N3EgaYLCyDAa6FFQ2/ e2gkHv3Xwt9D1mE/ZbrDswxLBz1mr1JGxMJD1aEMelvL6g1p/Nrh0aWatzUdICCPZ0 FbsZRPo+StAgJ8VpdrsOVzQCt9vMBKnKr92Lfx53dbqqst0d8scMW++LzShHEQbbzb zkT8tvjtBalB6g80ZOvpCJtdsGrNIR8BjMv+KEWQsHcHI+ybquXwPWlcHSdK6DDCPT aNkE89IKQGIGw== Date: Fri, 23 Jul 2021 17:43:35 -0500 From: Bjorn Helgaas To: Daniel Vetter Subject: Re: [PATCH v2 0/9] PCI/VGA: Rework default VGA device selection Message-ID: <20210723224335.GA446523@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , dri-devel@lists.freedesktop.org, Christoph Hellwig , linux-pci@vger.kernel.org, Bjorn Helgaas , Xuefeng Li , Huacai Chen Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Fri, Jul 23, 2021 at 10:27:08AM +0200, Daniel Vetter wrote: > On Fri, Jul 23, 2021 at 06:51:59AM +0100, Christoph Hellwig wrote: > > On Thu, Jul 22, 2021 at 04:29:11PM -0500, Bjorn Helgaas wrote: > > > From: Bjorn Helgaas > > > > > > This is a little bit of rework and extension of Huacai's nice work at [1]. > > > > > > It moves the VGA arbiter to the PCI subsystem, fixes a few nits, and breaks > > > a few pieces off Huacai's patch to make the main patch a little smaller. > > > > > > That last patch is still not very small, and it needs a commit log, as I > > > mentioned at [2]. > > > > FYI, I have a bunch of changes to this code that the drm maintainers > > picked up. They should show up in the next linux-next I think. > > Yeah I think for merging I think there'll be two options: > > - We also merge this series through drm-misc-next to avoid conflicts, but > anything after that will (i.e. from 5.16-rc1 onwards) will go in through > the pci tree. > > - You also merge Christoph's series, and we tell Linus to ignore the > vgaarb changes that also come in through drm-next pull. > > It's a non-rebasing tree so taking them out isn't an option, and reverting > feels silly. Either of the above is fine with me. Seems easiest/cleanest if I just fix this up so it applies on top of drm-misc-next, e.g., on top of this: 474596fc749c ("dt-bindings: display: simple-bridge: Add corpro,gm7123 compatible") I'll post a v3 after that rebase and working on the commit log from Huacai. Bjorn