Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7fb8a23 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Remove __OS_HAS_AGP 



We already express the drm/agp depencies correctly in Kconfig, so we
can rip this remnant from the shared drm core days.

Aside: Pretty much all the #ifdefs in radeon/nouveau could be killed
if ttm would provide dummy functions. I'm not going to volunteer for
that though.

v2: Use IS_ENABLED(CONFIG_AGP) as suggested by Ville

v3: Polish from Ville's review.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Christian König <christian.koenig@amd.com> (v2)
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6e3f797c

drivers/gpu/drm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ 
		drm_context.o drm_dma.o \

		drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \

		drm_lock.o drm_memory.o drm_drv.o drm_vm.o \

		drm_agpsupport.o drm_scatter.o drm_pci.o \

		drm_scatter.o drm_pci.o \

		drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \

		drm_crtc.o drm_modes.o drm_edid.o \

		drm_info.o drm_debugfs.o drm_encoder_slave.o \
@@ -19,6 +19,7 @@ drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o 
drm-$(CONFIG_PCI) += ati_pcigart.o

drm-$(CONFIG_DRM_PANEL) += drm_panel.o

drm-$(CONFIG_OF) += drm_of.o

drm-$(CONFIG_AGP) += drm_agpsupport.o



drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \

		drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o

drivers/gpu/drm/drm_agpsupport.c

+0 −4
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 
#include <linux/slab.h>

#include "drm_legacy.h"



#if __OS_HAS_AGP



#include <asm/agp.h>



/**
@@ -502,5 +500,3 @@ drm_agp_bind_pages(struct drm_device *dev, 
	return mem;

}

EXPORT_SYMBOL(drm_agp_bind_pages);
 


#endif /* __OS_HAS_AGP */

drivers/gpu/drm/drm_bufs.c

+3 −3
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ static void drm_cleanup_buf_error(struct drm_device * dev, 
	}

}



#if __OS_HAS_AGP

#if IS_ENABLED(CONFIG_AGP)

/**

 * Add AGP buffers for DMA transfers.

 *
@@ -756,7 +756,7 @@ int drm_legacy_addbufs_agp(struct drm_device *dev, 
	return 0;

}

EXPORT_SYMBOL(drm_legacy_addbufs_agp);

#endif				/* __OS_HAS_AGP */

#endif /* CONFIG_AGP */



int drm_legacy_addbufs_pci(struct drm_device *dev,

			   struct drm_buf_desc *request)
@@ -1145,7 +1145,7 @@ int drm_legacy_addbufs(struct drm_device *dev, void *data, 
	if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA))

		return -EINVAL;



#if __OS_HAS_AGP

#if IS_ENABLED(CONFIG_AGP)

	if (request->flags & _DRM_AGP_BUFFER)

		ret = drm_legacy_addbufs_agp(dev, request);

	else

drivers/gpu/drm/drm_ioc32.c

+3 −3
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ static int compat_drm_dma(struct file *file, unsigned int cmd, 
	return 0;

}



#if __OS_HAS_AGP

#if IS_ENABLED(CONFIG_AGP)

typedef struct drm_agp_mode32 {

	u32 mode;	/**< AGP mode */

} drm_agp_mode32_t;
@@ -882,7 +882,7 @@ static int compat_drm_agp_unbind(struct file *file, unsigned int cmd, 


	return drm_ioctl(file, DRM_IOCTL_AGP_UNBIND, (unsigned long)request);

}

#endif				/* __OS_HAS_AGP */

#endif /* CONFIG_AGP */



typedef struct drm_scatter_gather32 {

	u32 size;	/**< In bytes -- will round to page boundary */
@@ -1090,7 +1090,7 @@ static drm_ioctl_compat_t *drm_compat_ioctls[] = { 
	[DRM_IOCTL_NR(DRM_IOCTL_GET_SAREA_CTX32)] = compat_drm_getsareactx,

	[DRM_IOCTL_NR(DRM_IOCTL_RES_CTX32)] = compat_drm_resctx,

	[DRM_IOCTL_NR(DRM_IOCTL_DMA32)] = compat_drm_dma,

#if __OS_HAS_AGP

#if IS_ENABLED(CONFIG_AGP)

	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ENABLE32)] = compat_drm_agp_enable,

	[DRM_IOCTL_NR(DRM_IOCTL_AGP_INFO32)] = compat_drm_agp_info,

	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ALLOC32)] = compat_drm_agp_alloc,

drivers/gpu/drm/drm_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = { 


	DRM_IOCTL_DEF(DRM_IOCTL_CONTROL, drm_control, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),



#if __OS_HAS_AGP

#if IS_ENABLED(CONFIG_AGP)

	DRM_IOCTL_DEF(DRM_IOCTL_AGP_ACQUIRE, drm_agp_acquire_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_AGP_RELEASE, drm_agp_release_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_AGP_ENABLE, drm_agp_enable_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),