[PATCH 1/2] drm/exynos: remove DRM_EXYNOS_DMABUF config

[Inki Dae]

On 2015년 01월 27일 20:40, Joonyoung Shim wrote:
> The exynos drm driver has DRIVER_PRIME capability, then it's reasonable
> to support dmabuf as default. Remove DRM_EXYNOS_DMABUF config, it will
> prevent that user selects the option unnecessarily.

Applied two patches, 1 and 2.

Thanks,
Inki Dae.

> 
> Signed-off-by: Joonyoung Shim <jy0922.shim at samsung.com>
> ---
> This patch can be conflicted below link patch of Marek to remove
> selection of DRM_EXYNOS_IOMMU.

Yes, conflicted so merged it manually. :)

> 
> http://www.spinics.net/lists/linux-samsung-soc/msg41392.html
> 
>  drivers/gpu/drm/exynos/Kconfig             | 6 ------
>  drivers/gpu/drm/exynos/Makefile            | 3 +--
>  drivers/gpu/drm/exynos/exynos_drm_dmabuf.h | 5 -----
>  3 files changed, 1 insertion(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
> index 7f9f6f9..c8385f7 100644
> --- a/drivers/gpu/drm/exynos/Kconfig
> +++ b/drivers/gpu/drm/exynos/Kconfig
> @@ -18,12 +18,6 @@ config DRM_EXYNOS_IOMMU
>  	help
>  	  Choose this option if you want to use IOMMU feature for DRM.
>  
> -config DRM_EXYNOS_DMABUF
> -	bool "EXYNOS DRM DMABUF"
> -	depends on DRM_EXYNOS
> -	help
> -	  Choose this option if you want to use DMABUF feature for DRM.
> -
>  config DRM_EXYNOS_FIMD
>  	bool "Exynos DRM FIMD"
>  	depends on DRM_EXYNOS && !FB_S3C
> diff --git a/drivers/gpu/drm/exynos/Makefile b/drivers/gpu/drm/exynos/Makefile
> index 33ae365..0856891 100644
> --- a/drivers/gpu/drm/exynos/Makefile
> +++ b/drivers/gpu/drm/exynos/Makefile
> @@ -6,10 +6,9 @@ ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/exynos
>  exynosdrm-y := exynos_drm_drv.o exynos_drm_encoder.o \
>  		exynos_drm_crtc.o exynos_drm_fbdev.o exynos_drm_fb.o \
>  		exynos_drm_buf.o exynos_drm_gem.o exynos_drm_core.o \
> -		exynos_drm_plane.o
> +		exynos_drm_plane.o exynos_drm_dmabuf.o
>  
>  exynosdrm-$(CONFIG_DRM_EXYNOS_IOMMU) += exynos_drm_iommu.o
> -exynosdrm-$(CONFIG_DRM_EXYNOS_DMABUF) += exynos_drm_dmabuf.o
>  exynosdrm-$(CONFIG_DRM_EXYNOS_FIMD)	+= exynos_drm_fimd.o
>  exynosdrm-$(CONFIG_DRM_EXYNOS_DPI)	+= exynos_drm_dpi.o
>  exynosdrm-$(CONFIG_DRM_EXYNOS_DSI)	+= exynos_drm_dsi.o
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.h b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.h
> index 49acfaf..886de9f 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.h
> +++ b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.h
> @@ -12,14 +12,9 @@
>  #ifndef _EXYNOS_DRM_DMABUF_H_
>  #define _EXYNOS_DRM_DMABUF_H_
>  
> -#ifdef CONFIG_DRM_EXYNOS_DMABUF
>  struct dma_buf *exynos_dmabuf_prime_export(struct drm_device *drm_dev,
>  				struct drm_gem_object *obj, int flags);
>  
>  struct drm_gem_object *exynos_dmabuf_prime_import(struct drm_device *drm_dev,
>  						struct dma_buf *dma_buf);
> -#else
> -#define exynos_dmabuf_prime_export		NULL
> -#define exynos_dmabuf_prime_import		NULL
> -#endif
>  #endif
>