Re: [PULL v2] gvt-next

[Jason Gunthorpe <jgg@nvidia.com>]

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