* [PATCH 1/2] drm/exynos: remove DRM_EXYNOS_DMABUF config
@ 2015-01-27 11:40 Joonyoung Shim
2015-01-27 11:40 ` [PATCH 2/2] drm/exynos: remove to use unnecessary MODULE_xxx macro Joonyoung Shim
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Joonyoung Shim @ 2015-01-27 11:40 UTC (permalink / raw)
To: dri-devel; +Cc: sw0312.kim, m.szyprowski
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.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
---
This patch can be conflicted below link patch of Marek to remove
selection of DRM_EXYNOS_IOMMU.
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
--
1.9.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] drm/exynos: remove to use unnecessary MODULE_xxx macro
2015-01-27 11:40 [PATCH 1/2] drm/exynos: remove DRM_EXYNOS_DMABUF config Joonyoung Shim
@ 2015-01-27 11:40 ` Joonyoung Shim
2015-01-27 13:02 ` Gustavo Padovan
2015-01-27 13:01 ` [PATCH 1/2] drm/exynos: remove DRM_EXYNOS_DMABUF config Gustavo Padovan
2015-02-04 5:23 ` Inki Dae
2 siblings, 1 reply; 5+ messages in thread
From: Joonyoung Shim @ 2015-01-27 11:40 UTC (permalink / raw)
To: dri-devel; +Cc: sw0312.kim, m.szyprowski
The exynos_drm_dmabuf.c file doesn't include any module feature and it
isn't built to module.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
---
drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
index 60192ed..3833bf8 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
@@ -279,7 +279,3 @@ err_buf_detach:
return ERR_PTR(ret);
}
-
-MODULE_AUTHOR("Inki Dae <inki.dae@samsung.com>");
-MODULE_DESCRIPTION("Samsung SoC DRM DMABUF Module");
-MODULE_LICENSE("GPL");
--
1.9.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] drm/exynos: remove DRM_EXYNOS_DMABUF config
2015-01-27 11:40 [PATCH 1/2] drm/exynos: remove DRM_EXYNOS_DMABUF config Joonyoung Shim
2015-01-27 11:40 ` [PATCH 2/2] drm/exynos: remove to use unnecessary MODULE_xxx macro Joonyoung Shim
@ 2015-01-27 13:01 ` Gustavo Padovan
2015-02-04 5:23 ` Inki Dae
2 siblings, 0 replies; 5+ messages in thread
From: Gustavo Padovan @ 2015-01-27 13:01 UTC (permalink / raw)
To: Joonyoung Shim; +Cc: sw0312.kim, dri-devel, m.szyprowski
2015-01-27 Joonyoung Shim <jy0922.shim@samsung.com>:
> 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.
>
> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
> ---
> This patch can be conflicted below link patch of Marek to remove
> selection of DRM_EXYNOS_IOMMU.
>
> 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(-)
Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Gustavo
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/exynos: remove to use unnecessary MODULE_xxx macro
2015-01-27 11:40 ` [PATCH 2/2] drm/exynos: remove to use unnecessary MODULE_xxx macro Joonyoung Shim
@ 2015-01-27 13:02 ` Gustavo Padovan
0 siblings, 0 replies; 5+ messages in thread
From: Gustavo Padovan @ 2015-01-27 13:02 UTC (permalink / raw)
To: Joonyoung Shim; +Cc: sw0312.kim, dri-devel, m.szyprowski
2015-01-27 Joonyoung Shim <jy0922.shim@samsung.com>:
> The exynos_drm_dmabuf.c file doesn't include any module feature and it
> isn't built to module.
>
> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
> ---
> drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 4 ----
> 1 file changed, 4 deletions(-)
Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Gustavo
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] drm/exynos: remove DRM_EXYNOS_DMABUF config
2015-01-27 11:40 [PATCH 1/2] drm/exynos: remove DRM_EXYNOS_DMABUF config Joonyoung Shim
2015-01-27 11:40 ` [PATCH 2/2] drm/exynos: remove to use unnecessary MODULE_xxx macro Joonyoung Shim
2015-01-27 13:01 ` [PATCH 1/2] drm/exynos: remove DRM_EXYNOS_DMABUF config Gustavo Padovan
@ 2015-02-04 5:23 ` Inki Dae
2 siblings, 0 replies; 5+ messages in thread
From: Inki Dae @ 2015-02-04 5:23 UTC (permalink / raw)
To: Joonyoung Shim; +Cc: sw0312.kim, dri-devel, m.szyprowski
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@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
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-02-04 5:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-27 11:40 [PATCH 1/2] drm/exynos: remove DRM_EXYNOS_DMABUF config Joonyoung Shim
2015-01-27 11:40 ` [PATCH 2/2] drm/exynos: remove to use unnecessary MODULE_xxx macro Joonyoung Shim
2015-01-27 13:02 ` Gustavo Padovan
2015-01-27 13:01 ` [PATCH 1/2] drm/exynos: remove DRM_EXYNOS_DMABUF config Gustavo Padovan
2015-02-04 5:23 ` Inki Dae
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.