[Intel-gfx] [PATCH] drm/i915: Fix DRM_I915_DEBUG IOMMU stuff

[Ville Syrjälä]

On Wed, Sep 11, 2019 at 05:08:24PM +0300, Ville Syrjälä wrote:
> On Wed, Sep 11, 2019 at 02:59:29PM +0100, Chris Wilson wrote:
> > Quoting Ville Syrjala (2019-09-11 14:50:00)
> > > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > 
> > > We need to select IOMMU_SUPPORT as well, otherwise we can be left
> > > with:
> > >  CONFIG_IOMMU_IOVA=m
> > >  # CONFIG_IOMMU_SUPPORT is not set
> > >  CONFIG_INTEL_IOMMU=y
> > > 
> > > which complains:
> > > "WARNING: unmet direct dependencies detected for INTEL_IOMMU"
> > > 
> > > and fails to link:
> > > ld: drivers/iommu/intel-iommu.o: in function `free_all_cpu_cached_iovas':
> > > /home/vsyrjala/src/linux/build_skl/../drivers/iommu/intel-iommu.c:4466: undefined reference to `free_cpu_cached_iovas'
> > > ...
> > > 
> > > Or do we maybe want something like:
> > >  select <iommu thing> if IOMMU_SUPPORT
> > > instead?
> > 
> > Hmm. My goal for DRM_I915_DEBUG was basically to dictate the
> > configuration options for CI. Now CI has entered a new era of git
> > itself, this could be reined back in I guess. But I still like having a
> > single option that enables a good set of debug options (that match what
> > CI does for convenience).
> > 
> > > Cc: Chris Wilson <chris at chris-wilson.co.uk>
> > > Fixes: 02229acb3926 ("drm/i915: Force compilation with intel-iommu for CI validation")
> > > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > ---
> > >  drivers/gpu/drm/i915/Kconfig.debug | 1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/Kconfig.debug b/drivers/gpu/drm/i915/Kconfig.debug
> > > index c5c00cad6ba1..d940280df6b9 100644
> > > --- a/drivers/gpu/drm/i915/Kconfig.debug
> > > +++ b/drivers/gpu/drm/i915/Kconfig.debug
> > > @@ -22,6 +22,7 @@ config DRM_I915_DEBUG
> > >          depends on DRM_I915
> > >         select PCI_MSI
> > >         select IOMMU_API
> > > +       select IOMMU_SUPPORT
> > 
> > Already in the updated
> > 41dfd5f67ae4 ("drm/i915: Force compilation with intel-iommu for CI validation")
> 
> That's not upstream though. So my build is still broken.

Bah. Never mind. It was more than two minutes since my last git fetch
so I was horribly out of date. Seems fine now.

-- 
Ville Syrjälä
Intel