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;
Date:   Wed, 20 Apr 2022 17:00:34 -0300
From:   Jason Gunthorpe <jgg@nvidia.com>
To:     Alex Williamson <alex.williamson@redhat.com>
Cc:     "Wang, Zhi A" <zhi.a.wang@intel.com>,
        Jani Nikula <jani.nikula@linux.intel.com>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
        "Vivi, Rodrigo" <rodrigo.vivi@intel.com>,
        Christoph Hellwig <hch@lst.de>,
        "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>,
        "intel-gvt-dev@lists.freedesktop.org" 
        <intel-gvt-dev@lists.freedesktop.org>,
        "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Zhenyu Wang <zhenyuw@linux.intel.com>
Subject: Re: [PULL v2] gvt-next
Message-ID: <20220420200034.GE2120790@nvidia.com>
References: <5a8b9f48-2c32-8177-1c18-e3bd7bfde558@intel.com>
 <20220420164351.GC2120790@nvidia.com>
 <20220420114033.7f8b57c7.alex.williamson@redhat.com>
 <20220420174600.GD2120790@nvidia.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220420174600.GD2120790@nvidia.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qPZcYJDMnvLxnAyaGk82vJugv98rPH6zq3MK+Rg6zsbunRzd1qL8NH6179OJ?=
 =?us-ascii?Q?DyvW7RdF89MPJhdJueVDczZNIYCSZC6ScETJvIqivPySfJ+521ejwFfe9WZ1?=
 =?us-ascii?Q?supIY2rTSEdUjYOvMfYPZ6Ucnk5rcjKq0oLTwikpUclSZ3MffHaB0rNqbvvp?=
 =?us-ascii?Q?JY9rJh4NbrVIe2vU1HaH4316jcSlt5Q23f+D6ZsiPAeKIYUjvRY4/DBNvbr9?=
 =?us-ascii?Q?hiwC2uCB3+wRKpDPKH/JLA/lHW/4wELtioIozuP+8OkNEdsvKuqARjDyvBD0?=
 =?us-ascii?Q?PTWmZ61QWYiMxmX5l8OznhNT9/NHsk4PbIcJ9v1hYqHDmNKesGWyE3OKyX4y?=
 =?us-ascii?Q?Lv15A4Vp5pbzO2Y/9ACrdJP5nK73N8tc3t7usF2vJ7x9awjbJplE82HhlXdO?=
 =?us-ascii?Q?25huML67EwagUpyTPkmLkFZMvFzmi7zq4J0/PiPQBE9DAuNdNcapyaajBTpR?=
 =?us-ascii?Q?NAg6ZDS5t5kqr7eTvBtQcXiKoIydoOisEX2YsA7PLFrYb8+UZ4Fu3uf1c5Qk?=
 =?us-ascii?Q?NhWVjCYm2r9FsTHYW96hrAYQbitA6sDLkFUJrNjJ47Nv5Z2XSiFhr7/+vCqI?=
 =?us-ascii?Q?aLkWS8c68eXF/3QoU4k3FuAL4HLlRyTN8y3OTIq4c0Ioeu72n5usz6qipH7W?=
 =?us-ascii?Q?G3Wf2wpu8DLJ38K0D7bpehXmHTu3kYoIIBuPIBUq3TCm4BQAXHWpVpsXCWfc?=
 =?us-ascii?Q?R2GYO3g08ppNlCtT89CIxqiC3uqQMcrk7FklMNjCRft/gOxun5DTkxfOPw9Q?=
 =?us-ascii?Q?Q8P2MnNb2E/gBsCs+B3S7JW0cbqnNvRIkxMiSgqYpacMW5UqPir15K+S1SSa?=
 =?us-ascii?Q?YHn1bW4TY93D+LYyJYlDKq3YzHQpqX9V5c2xv75Oq1BkZG2Xc6Vonc9Otse3?=
 =?us-ascii?Q?wrmuPF4EPhPPIrKyYDWuzdpQXdKcRT+194p0KHLNCGWgZjIMrbQeVSG1Zupn?=
 =?us-ascii?Q?oqBgn/OU9bPYCVzpiCNmOtWzKGyTfcm9FHaDruKUvTD4oPaltQcLZ3uQxrRS?=
 =?us-ascii?Q?A7UTzkJjwjf7mGcyyPIQ2EgHkfpfWp3Qz7X7aLL119JUgFNxkRqb76ODJO8K?=
 =?us-ascii?Q?96IbWsPHzK5lk1OqCXgdTY6iLKQKJOHNTpzlwQA/gsGRxp/QPzbKWTDRIfY1?=
 =?us-ascii?Q?pp5mguzLi9XMjruExO1mq39e6kBgEx3nRPH0V6039aw5VoNAobw4fsfpDLJi?=
 =?us-ascii?Q?flww6Mnl3KaXW5B6WZA6B9tsWHHJHGinzWaYCTPXBed+By4M3ufdywJF7rTR?=
 =?us-ascii?Q?oVWQEo6Ighn4a4Iz5ZkwytgkgzFkQJ4zDYg6W7UVs5/ocLQg0CVDnlhme1Y4?=
 =?us-ascii?Q?3vo2s2/Fk+KjMWk2vIdQsIjmgmVxX92Eq3VKut47ncwcvb5v6F1mZleP2Tl8?=
 =?us-ascii?Q?TTwyDtrUm56UhDMSC4GZeW+QePvPmWNPn8L1P4ENfeyChDJzc1cbvL+R/F0F?=
 =?us-ascii?Q?93baGnzLme7NQKMIjThhru6HHjCVFvtfcWc8vIDJPT3RuLzoWs8wtmNfOi+D?=
 =?us-ascii?Q?evANeW47d8PCG5dTyYI5ij5nwCpA0eTWPUdRxPMCnPG625GmcEnt6NrJ1Mdg?=
 =?us-ascii?Q?vy95kFt0uFXVtR/t86krABwkNvsXN8v0h3oY0NaROdxN6k2wZdHf3foxfw7o?=
 =?us-ascii?Q?wjjXmCchziW885UNJGsiQbyEMHPHP6s3ZcebWyxaiK7mQpeIzMA+I4/scBDA?=
 =?us-ascii?Q?RL+H3gH+/8QEN0kDs4US/yu+LfzjYUcGRP+u1HRICCyHxG/z/ghelYbNzKI7?=
 =?us-ascii?Q?OAz73e1fBA=3D=3D?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2bae995d-bfb1-43db-4950-08da23086f25
X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB4192.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2022 20:00:35.9333
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: GZUyaf+3QHVGmdXFOVfCgqjd9EG7Bv5F84DyR9+YX+AFuPMbSDXWhXXD0mX7keu1
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1598
X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE
        autolearn=no 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, Apr 20, 2022 at 02:46:00PM -0300, Jason Gunthorpe wrote:
> On Wed, Apr 20, 2022 at 11:40:33AM -0600, Alex Williamson wrote:
> > On Wed, 20 Apr 2022 13:43:51 -0300
> > Jason Gunthorpe <jgg@nvidia.com> wrote:
> > 
> > > On Wed, Apr 20, 2022 at 04:34:47PM +0000, Wang, Zhi A wrote:
> > > > Hi folks:
> > > > 
> > > > Here is the PR of gvt-next. Thanks so much for the patience.
> > > > 
> > > > Mostly it includes the patch bundle of GVT-g re-factor patches for adapting the GVT-g with the
> > > > new MDEV interfaces:
> > > > 
> > > > - Separating the MMIO table from GVT-g. (Zhi)
> > > > - GVT-g re-factor. (Christoph)
> > > > - GVT-g mdev API cleanup. (Jason)
> > > > - GVT-g trace/makefile cleanup. (Jani)
> > > > 
> > > > Thanks so much for making this happen.
> > > > 
> > > > This PR has been tested as following and no problem shows up:
> > > > 
> > > > $dim update-branches
> > > > $dim apply-pull drm-intel-next < this_email.eml
> > > > 
> > > > The following changes since commit 3123109284176b1532874591f7c81f3837bbdc17:
> > > > 
> > > >   Linux 5.18-rc1 (2022-04-03 14:08:21 -0700)
> > > > 
> > > > are available in the Git repository at:
> > > > 
> > > >   https://github.com/intel/gvt-linux tags/gvt-next-2022-04-20-for-christoph
> > > > 
> > > > for you to fetch changes up to ae7875879b7c838bffb42ed6db4658e5c504032e:
> > > > 
> > > >   vfio/mdev: Remove mdev drvdata (2022-04-20 03:15:58 -0400)  
> > > 
> > > This looks well constructed now! thanks
> > > 
> > > Alex you can pull this for VFIO after Jani&co grab it
> > > 
> > > I'll respin my vfio_group series on top of this branch
> > 
> > Sure, so just to confirm tags/gvt-next-2022-04-20-for-christoph is
> > pruned down to exactly the commits we're looking for now?  Thanks,
> 
> Yes, the above is correct and the tag points to commit
> ae7875879b7c838bffb42ed6db4658e5c504032e
> 
> It is the bare minimum series

Actually this topic branch doesn't compile:

../drivers/gpu/drm/i915/intel_gvt_mmio_table.c:7:10: fatal error: 'display/intel_dmc_regs.h' file not found
#include "display/intel_dmc_regs.h"
         ^~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

:( :(

This is the merge conflict that was mentioned. This topic branch needs
to delete the above intel_dmc_regs.h include file

When drm-intel-next merges this PR then need to add it back as part of
the merge resolution - so explain this in the PR text above and
include a diff that does it when you send it again. (or do the merge
yourself as I showed before, it depends on what drm-intel-next wants)

Jason