[Intel-gfx] [PATCH 2/3] drm/i915: Stop depending upon CONFIG_AGP/_INTEL

[Ville Syrjälä]

On Tue, Jan 26, 2016 at 07:49:55PM +0100, Daniel Vetter wrote:
> We need this to be able to paper over some CI fail: DMA API debuggin
> complaints that we leak the gmch scratch page, but fundamentally
> that's the only way to do it if there's both the intel-agp and i915
> driver using it: intel-agp shadow-attaches, i915 binds for real to the
> gpu. But when i915 unloads we need to keep the dma-mapping for
> intel-agp around, and the dma debugging code doesn't approve of that.
> 
> With this patch we can disable CONFIG_AGP_INTEL and avoid this
> troubel.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93769
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
>  drivers/gpu/drm/i915/Kconfig | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
> index fcd77b27514d..9aa7d2d98add 100644
> --- a/drivers/gpu/drm/i915/Kconfig
> +++ b/drivers/gpu/drm/i915/Kconfig
> @@ -2,9 +2,7 @@ config DRM_I915
>  	tristate "Intel 8xx/9xx/G3x/G4x/HD Graphics"
>  	depends on DRM
>  	depends on X86 && PCI
> -	depends on (AGP || AGP=n)
>  	select INTEL_GTT
> -	select AGP_INTEL if AGP

Just setting AGP=n in .config isn't enough?

>  	select INTERVAL_TREE
>  	# we need shmfs for the swappable backing store, and in particular
>  	# the shmem_readpage() which depends upon tmpfs
> -- 
> 2.5.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC