diff mbox series

[2/2] Revert "vfio/gvt: Make DRM_I915_GVT depend on VFIO_MDEV"

Message ID 20210426094143.4031527-2-zhenyuw@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series [1/2] drm/i915/gvt: Move mdev attribute groups into kvmgt module | expand

Commit Message

Zhenyu Wang April 26, 2021, 9:41 a.m. UTC
This reverts commit 07e543f4f9d116d6b4240644191dee6388ef4a85.

With all mdev handing moved to kvmgt module, only kvmgt should depend
on VFIO_MDEV. So revert this one.

Cc: Arnd Bergmann <arnd@kernel.org>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
---
 drivers/gpu/drm/i915/Kconfig | 1 -
 1 file changed, 1 deletion(-)

Comments

Alex Williamson April 26, 2021, 4:55 p.m. UTC | #1
On Mon, 26 Apr 2021 17:41:43 +0800
Zhenyu Wang <zhenyuw@linux.intel.com> wrote:

> This reverts commit 07e543f4f9d116d6b4240644191dee6388ef4a85.

07e543f4f9d1 ("vfio/gvt: Make DRM_I915_GVT depend on VFIO_MDEV")

> With all mdev handing moved to kvmgt module, only kvmgt should depend
> on VFIO_MDEV. So revert this one.
> 
> Cc: Arnd Bergmann <arnd@kernel.org>
> Cc: Jason Gunthorpe <jgg@ziepe.ca>
> Cc: Alex Williamson <alex.williamson@redhat.com>
> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/Kconfig | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
> index 8f15bfb5faac..93f4d059fc89 100644
> --- a/drivers/gpu/drm/i915/Kconfig
> +++ b/drivers/gpu/drm/i915/Kconfig
> @@ -102,7 +102,6 @@ config DRM_I915_GVT
>  	bool "Enable Intel GVT-g graphics virtualization host support"
>  	depends on DRM_I915
>  	depends on 64BIT
> -	depends on VFIO_MDEV
>  	default n
>  	help
>  	  Choose this option if you want to enable Intel GVT-g graphics

I take it that this retracts your ack from
https://lore.kernel.org/dri-devel/20210425032356.GH1551@zhen-hp.sh.intel.com/
I'll drop it from consideration for pushing through my tree unless
indicated otherwise.  Thanks,

Alex
Zhenyu Wang April 27, 2021, 5:31 a.m. UTC | #2
On 2021.04.26 14:40:17 -0300, Jason Gunthorpe wrote:
> On Mon, Apr 26, 2021 at 10:55:55AM -0600, Alex Williamson wrote:
> > On Mon, 26 Apr 2021 17:41:43 +0800
> > Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
> > 
> > > This reverts commit 07e543f4f9d116d6b4240644191dee6388ef4a85.
> > 
> > 07e543f4f9d1 ("vfio/gvt: Make DRM_I915_GVT depend on VFIO_MDEV")
> > 
> > > With all mdev handing moved to kvmgt module, only kvmgt should depend
> > > on VFIO_MDEV. So revert this one.
> > > 
> > > Cc: Arnd Bergmann <arnd@kernel.org>
> > > Cc: Jason Gunthorpe <jgg@ziepe.ca>
> > > Cc: Alex Williamson <alex.williamson@redhat.com>
> > > Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
> > >  drivers/gpu/drm/i915/Kconfig | 1 -
> > >  1 file changed, 1 deletion(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
> > > index 8f15bfb5faac..93f4d059fc89 100644
> > > +++ b/drivers/gpu/drm/i915/Kconfig
> > > @@ -102,7 +102,6 @@ config DRM_I915_GVT
> > >  	bool "Enable Intel GVT-g graphics virtualization host support"
> > >  	depends on DRM_I915
> > >  	depends on 64BIT
> > > -	depends on VFIO_MDEV
> > >  	default n
> > >  	help
> > >  	  Choose this option if you want to enable Intel GVT-g graphics
> > 
> > I take it that this retracts your ack from
> > https://lore.kernel.org/dri-devel/20210425032356.GH1551@zhen-hp.sh.intel.com/
> > I'll drop it from consideration for pushing through my tree unless
> > indicated otherwise.  Thanks,
> 
> In any event you'll need either Arnd's patch or this patch in your
> tree to avoid randconfig problems.
> 
> At this point I would take Arnd's and leave this to go next merge
> window.
> 

I'm ok with that, so won't block your vfio pull for merge window.
I'll send gvt fixes pull in next RC.

Thanks
Alex Williamson April 27, 2021, 7:39 p.m. UTC | #3
On Tue, 27 Apr 2021 13:31:39 +0800
Zhenyu Wang <zhenyuw@linux.intel.com> wrote:

> On 2021.04.26 14:40:17 -0300, Jason Gunthorpe wrote:
> > On Mon, Apr 26, 2021 at 10:55:55AM -0600, Alex Williamson wrote:  
> > > On Mon, 26 Apr 2021 17:41:43 +0800
> > > Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
> > >   
> > > > This reverts commit 07e543f4f9d116d6b4240644191dee6388ef4a85.  
> > > 
> > > 07e543f4f9d1 ("vfio/gvt: Make DRM_I915_GVT depend on VFIO_MDEV")
> > >   
> > > > With all mdev handing moved to kvmgt module, only kvmgt should depend
> > > > on VFIO_MDEV. So revert this one.
> > > > 
> > > > Cc: Arnd Bergmann <arnd@kernel.org>
> > > > Cc: Jason Gunthorpe <jgg@ziepe.ca>
> > > > Cc: Alex Williamson <alex.williamson@redhat.com>
> > > > Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
> > > >  drivers/gpu/drm/i915/Kconfig | 1 -
> > > >  1 file changed, 1 deletion(-)
> > > > 
> > > > diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
> > > > index 8f15bfb5faac..93f4d059fc89 100644
> > > > +++ b/drivers/gpu/drm/i915/Kconfig
> > > > @@ -102,7 +102,6 @@ config DRM_I915_GVT
> > > >  	bool "Enable Intel GVT-g graphics virtualization host support"
> > > >  	depends on DRM_I915
> > > >  	depends on 64BIT
> > > > -	depends on VFIO_MDEV
> > > >  	default n
> > > >  	help
> > > >  	  Choose this option if you want to enable Intel GVT-g graphics  
> > > 
> > > I take it that this retracts your ack from
> > > https://lore.kernel.org/dri-devel/20210425032356.GH1551@zhen-hp.sh.intel.com/
> > > I'll drop it from consideration for pushing through my tree unless
> > > indicated otherwise.  Thanks,  
> > 
> > In any event you'll need either Arnd's patch or this patch in your
> > tree to avoid randconfig problems.
> > 
> > At this point I would take Arnd's and leave this to go next merge
> > window.
> >   
> 
> I'm ok with that, so won't block your vfio pull for merge window.
> I'll send gvt fixes pull in next RC.

Ok, I've pushed Arnd's fix to my next branch, I'll get it in for rc1.
Thanks,

Alex
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index 8f15bfb5faac..93f4d059fc89 100644
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -102,7 +102,6 @@  config DRM_I915_GVT
 	bool "Enable Intel GVT-g graphics virtualization host support"
 	depends on DRM_I915
 	depends on 64BIT
-	depends on VFIO_MDEV
 	default n
 	help
 	  Choose this option if you want to enable Intel GVT-g graphics