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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCA91C433EF for ; Wed, 20 Apr 2022 07:08:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359602AbiDTHKw (ORCPT ); Wed, 20 Apr 2022 03:10:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231806AbiDTHKt (ORCPT ); Wed, 20 Apr 2022 03:10:49 -0400 Received: from verein.lst.de (verein.lst.de [213.95.11.211]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA2B525C55 for ; Wed, 20 Apr 2022 00:08:04 -0700 (PDT) Received: by verein.lst.de (Postfix, from userid 2407) id 36FFD68AFE; Wed, 20 Apr 2022 09:08:01 +0200 (CEST) Date: Wed, 20 Apr 2022 09:08:00 +0200 From: Christoph Hellwig To: Jason Gunthorpe Cc: "Wang, Zhi A" , Jani Nikula , Christoph Hellwig , Joonas Lahtinen , "Vivi, Rodrigo" , Zhenyu Wang , "intel-gfx@lists.freedesktop.org" , "intel-gvt-dev@lists.freedesktop.org" , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" , Alex Williamson Subject: Re: refactor the i915 GVT support and move to the modern mdev API v3 Message-ID: <20220420070800.GB4417@lst.de> References: <20220413154642.GA28095@lst.de> <871qy1geko.fsf@intel.com> <5af7726e-920e-603a-bad3-8adb09d2ba89@intel.com> <20220413232053.GA2120790@nvidia.com> <1c3aaab9-3bd4-95d4-9f9f-4be9e10e6516@intel.com> <20220414133427.GB2120790@nvidia.com> <87ilrbeqbo.fsf@intel.com> <20220414134321.GD2120790@nvidia.com> <20220414143859.GE368031@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220414143859.GE368031@nvidia.com> User-Agent: Mutt/1.5.17 (2007-11-01) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 14, 2022 at 11:38:59AM -0300, Jason Gunthorpe wrote: > pull requests can flow through more than one tree concurrently. The > purpose of the topic branch is to allow all the commits to be in all > the trees they need to be in at once. > > So you should send this branch as a PR to the next logical upstream > tree gvt patches normally go through, in the usual way that you send > PRs. Especially in this case where there is a small merge conflict > internal to DRM to resolve. I'm assuming this is the drm-intel-next > tree? > > Once DRM is internally happy then VFIO can merge it as well. You can > view VFIO as the secondary path to Linus, DRM as primary. Alex will > mention in his pull request that VFIO has a 'shared branch with DRM > for gvt'. Where do we stand here? The (somewhat misnamed) topic/for-christoph branch looks fine to me now except for the mіssing "static inline" on the intel_gvt_iterate_mmio_table stub. When can we expect it in the i915 tree and linux-next? 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 5D0C3C433EF for ; Wed, 20 Apr 2022 07:08:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D6ECC10F195; Wed, 20 Apr 2022 07:08:05 +0000 (UTC) Received: from verein.lst.de (verein.lst.de [213.95.11.211]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C38510F195; Wed, 20 Apr 2022 07:08:04 +0000 (UTC) Received: by verein.lst.de (Postfix, from userid 2407) id 36FFD68AFE; Wed, 20 Apr 2022 09:08:01 +0200 (CEST) Date: Wed, 20 Apr 2022 09:08:00 +0200 From: Christoph Hellwig To: Jason Gunthorpe Message-ID: <20220420070800.GB4417@lst.de> References: <20220413154642.GA28095@lst.de> <871qy1geko.fsf@intel.com> <5af7726e-920e-603a-bad3-8adb09d2ba89@intel.com> <20220413232053.GA2120790@nvidia.com> <1c3aaab9-3bd4-95d4-9f9f-4be9e10e6516@intel.com> <20220414133427.GB2120790@nvidia.com> <87ilrbeqbo.fsf@intel.com> <20220414134321.GD2120790@nvidia.com> <20220414143859.GE368031@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220414143859.GE368031@nvidia.com> User-Agent: Mutt/1.5.17 (2007-11-01) Subject: Re: [Intel-gfx] refactor the i915 GVT support and move to the modern mdev API v3 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "dri-devel@lists.freedesktop.org" , "intel-gfx@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" , "Vivi, Rodrigo" , "intel-gvt-dev@lists.freedesktop.org" , Christoph Hellwig Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Apr 14, 2022 at 11:38:59AM -0300, Jason Gunthorpe wrote: > pull requests can flow through more than one tree concurrently. The > purpose of the topic branch is to allow all the commits to be in all > the trees they need to be in at once. > > So you should send this branch as a PR to the next logical upstream > tree gvt patches normally go through, in the usual way that you send > PRs. Especially in this case where there is a small merge conflict > internal to DRM to resolve. I'm assuming this is the drm-intel-next > tree? > > Once DRM is internally happy then VFIO can merge it as well. You can > view VFIO as the secondary path to Linus, DRM as primary. Alex will > mention in his pull request that VFIO has a 'shared branch with DRM > for gvt'. Where do we stand here? The (somewhat misnamed) topic/for-christoph branch looks fine to me now except for the mіssing "static inline" on the intel_gvt_iterate_mmio_table stub. When can we expect it in the i915 tree and linux-next?