Re: [PATCH 2/2] [media] s5p-g2d: Replace old driver with DRM version

2016-07-13 Thread Nicolas Dufresne 
Le mardi 12 juillet 2016 à 20:02 -0300, Mauro Carvalho Chehab a écrit :
> I suspect that you'll be applying this one via DRM tree, so:
> 
> Em Tue, 24 May 2016 15:28:13 +0200
> Krzysztof Kozlowski  escreveu:
> 
> > Remove the old non-DRM driver because it is now entirely supported
> by
> > exynos_drm_g2d driver.
> > 
> > Cc: Kyungmin Park 
> > Cc: Kamil Debski 
> > Signed-off-by: Krzysztof Kozlowski 
> 
> Acked-by: Mauro Carvalho Chehab 
> 
> PS.: If you prefer to apply this one via my tree, I'm ok too. Just
> let me know when the first patch gets merged upstream.

Just a note that this is effectively an API break.

cheers,
Nicolas

signature.asc
Description: This is a digitally signed message part

Re: [PATCH 2/2] [media] s5p-g2d: Replace old driver with DRM version

2016-07-13 Thread Krzysztof Kozlowski 
On 07/13/2016 01:02 AM, Mauro Carvalho Chehab wrote:
> I suspect that you'll be applying this one via DRM tree, so:
> 
> Em Tue, 24 May 2016 15:28:13 +0200
> Krzysztof Kozlowski  escreveu:
> 
>> Remove the old non-DRM driver because it is now entirely supported by
>> exynos_drm_g2d driver.
>>
>> Cc: Kyungmin Park 
>> Cc: Kamil Debski 
>> Signed-off-by: Krzysztof Kozlowski 
> 
> Acked-by: Mauro Carvalho Chehab 
> 
> PS.: If you prefer to apply this one via my tree, I'm ok too. Just
> let me know when the first patch gets merged upstream.

This patchset was insufficient and I didn't came up with follow up.
Please ignore it for now.

Best regards,
Krzysztof
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] [media] s5p-g2d: Replace old driver with DRM version

2016-07-12 Thread Mauro Carvalho Chehab 
I suspect that you'll be applying this one via DRM tree, so:

Em Tue, 24 May 2016 15:28:13 +0200
Krzysztof Kozlowski  escreveu:

> Remove the old non-DRM driver because it is now entirely supported by
> exynos_drm_g2d driver.
> 
> Cc: Kyungmin Park 
> Cc: Kamil Debski 
> Signed-off-by: Krzysztof Kozlowski 

Acked-by: Mauro Carvalho Chehab 

PS.: If you prefer to apply this one via my tree, I'm ok too. Just
let me know when the first patch gets merged upstream.

Regards,
Mauro

> ---
>  MAINTAINERS   |   8 -
>  drivers/gpu/drm/exynos/Kconfig|   1 -
>  drivers/media/platform/Kconfig|  12 -
>  drivers/media/platform/Makefile   |   1 -
>  drivers/media/platform/s5p-g2d/Makefile   |   3 -
>  drivers/media/platform/s5p-g2d/g2d-hw.c   | 117 -
>  drivers/media/platform/s5p-g2d/g2d-regs.h | 122 -
>  drivers/media/platform/s5p-g2d/g2d.c  | 800 
> --
>  drivers/media/platform/s5p-g2d/g2d.h  |  91 
>  9 files changed, 1155 deletions(-)
>  delete mode 100644 drivers/media/platform/s5p-g2d/Makefile
>  delete mode 100644 drivers/media/platform/s5p-g2d/g2d-hw.c
>  delete mode 100644 drivers/media/platform/s5p-g2d/g2d-regs.h
>  delete mode 100644 drivers/media/platform/s5p-g2d/g2d.c
>  delete mode 100644 drivers/media/platform/s5p-g2d/g2d.h
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 243c0811a4d8..01763419c6a1 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1616,14 +1616,6 @@ L: linux-arm-ker...@lists.infradead.org (moderated 
> for non-subscribers)
>  S:   Maintained
>  F:   arch/arm/mach-s5pv210/
>  
> -ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
> -M:   Kyungmin Park 
> -M:   Kamil Debski 
> -L:   linux-arm-ker...@lists.infradead.org
> -L:   linux-media@vger.kernel.org
> -S:   Maintained
> -F:   drivers/media/platform/s5p-g2d/
> -
>  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
>  M:   Kyungmin Park 
>  M:   Kamil Debski 
> diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
> index d814b3048ee5..b0eb20ba1b28 100644
> --- a/drivers/gpu/drm/exynos/Kconfig
> +++ b/drivers/gpu/drm/exynos/Kconfig
> @@ -95,7 +95,6 @@ comment "Sub-drivers"
>  
>  config DRM_EXYNOS_G2D
>   bool "G2D"
> - depends on VIDEO_SAMSUNG_S5P_G2D=n
>   select FRAME_VECTOR
>   help
> Choose this option if you want to use Exynos G2D for DRM.
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index 84e041c0a70e..171005c53d62 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -161,18 +161,6 @@ config VIDEO_MEM2MEM_DEINTERLACE
>   help
>   Generic deinterlacing V4L2 driver.
>  
> -config VIDEO_SAMSUNG_S5P_G2D
> - tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
> - depends on VIDEO_DEV && VIDEO_V4L2
> - depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
> - depends on HAS_DMA
> - select VIDEOBUF2_DMA_CONTIG
> - select V4L2_MEM2MEM_DEV
> - default n
> - ---help---
> -   This is a v4l2 driver for Samsung S5P and EXYNOS4 G2D
> -   2d graphics accelerator.
> -
>  config VIDEO_SAMSUNG_S5P_JPEG
>   tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"
>   depends on VIDEO_DEV && VIDEO_V4L2
> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
> index bbb7bd1eb268..ad5e26a0bd17 100644
> --- a/drivers/media/platform/Makefile
> +++ b/drivers/media/platform/Makefile
> @@ -32,7 +32,6 @@ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG)+= s5p-jpeg/
>  obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC)  += s5p-mfc/
>  obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV)   += s5p-tv/
>  
> -obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D)  += s5p-g2d/
>  obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC)   += exynos-gsc/
>  
>  obj-$(CONFIG_VIDEO_STI_BDISP)+= sti/bdisp/
> diff --git a/drivers/media/platform/s5p-g2d/Makefile 
> b/drivers/media/platform/s5p-g2d/Makefile
> deleted file mode 100644
> index 2c48c416a804..
> --- a/drivers/media/platform/s5p-g2d/Makefile
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -s5p-g2d-objs := g2d.o g2d-hw.o
> -
> -obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D)  += s5p-g2d.o
> diff --git a/drivers/media/platform/s5p-g2d/g2d-hw.c 
> b/drivers/media/platform/s5p-g2d/g2d-hw.c
> deleted file mode 100644
> index e87bd93811d4..
> --- a/drivers/media/platform/s5p-g2d/g2d-hw.c
> +++ /dev/null
> @@ -1,117 +0,0 @@
> -/*
> - * Samsung S5P G2D - 2D Graphics Accelerator Driver
> - *
> - * Copyright (c) 2011 Samsung Electronics Co., Ltd.
> - * Kamil Debski, 
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the

[PATCH 2/2] [media] s5p-g2d: Replace old driver with DRM version

2016-05-24 Thread Krzysztof Kozlowski 
Remove the old non-DRM driver because it is now entirely supported by
exynos_drm_g2d driver.

Cc: Kyungmin Park 
Cc: Kamil Debski 
Signed-off-by: Krzysztof Kozlowski 
---
 MAINTAINERS   |   8 -
 drivers/gpu/drm/exynos/Kconfig|   1 -
 drivers/media/platform/Kconfig|  12 -
 drivers/media/platform/Makefile   |   1 -
 drivers/media/platform/s5p-g2d/Makefile   |   3 -
 drivers/media/platform/s5p-g2d/g2d-hw.c   | 117 -
 drivers/media/platform/s5p-g2d/g2d-regs.h | 122 -
 drivers/media/platform/s5p-g2d/g2d.c  | 800 --
 drivers/media/platform/s5p-g2d/g2d.h  |  91 
 9 files changed, 1155 deletions(-)
 delete mode 100644 drivers/media/platform/s5p-g2d/Makefile
 delete mode 100644 drivers/media/platform/s5p-g2d/g2d-hw.c
 delete mode 100644 drivers/media/platform/s5p-g2d/g2d-regs.h
 delete mode 100644 drivers/media/platform/s5p-g2d/g2d.c
 delete mode 100644 drivers/media/platform/s5p-g2d/g2d.h

diff --git a/MAINTAINERS b/MAINTAINERS
index 243c0811a4d8..01763419c6a1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1616,14 +1616,6 @@ L:   linux-arm-ker...@lists.infradead.org (moderated 
for non-subscribers)
 S: Maintained
 F: arch/arm/mach-s5pv210/
 
-ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
-M: Kyungmin Park 
-M: Kamil Debski 
-L: linux-arm-ker...@lists.infradead.org
-L: linux-media@vger.kernel.org
-S: Maintained
-F: drivers/media/platform/s5p-g2d/
-
 ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
 M: Kyungmin Park 
 M: Kamil Debski 
diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
index d814b3048ee5..b0eb20ba1b28 100644
--- a/drivers/gpu/drm/exynos/Kconfig
+++ b/drivers/gpu/drm/exynos/Kconfig
@@ -95,7 +95,6 @@ comment "Sub-drivers"
 
 config DRM_EXYNOS_G2D
bool "G2D"
-   depends on VIDEO_SAMSUNG_S5P_G2D=n
select FRAME_VECTOR
help
  Choose this option if you want to use Exynos G2D for DRM.
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 84e041c0a70e..171005c53d62 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -161,18 +161,6 @@ config VIDEO_MEM2MEM_DEINTERLACE
help
Generic deinterlacing V4L2 driver.
 
-config VIDEO_SAMSUNG_S5P_G2D
-   tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
-   depends on VIDEO_DEV && VIDEO_V4L2
-   depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
-   depends on HAS_DMA
-   select VIDEOBUF2_DMA_CONTIG
-   select V4L2_MEM2MEM_DEV
-   default n
-   ---help---
- This is a v4l2 driver for Samsung S5P and EXYNOS4 G2D
- 2d graphics accelerator.
-
 config VIDEO_SAMSUNG_S5P_JPEG
tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"
depends on VIDEO_DEV && VIDEO_V4L2
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index bbb7bd1eb268..ad5e26a0bd17 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -32,7 +32,6 @@ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG)  += s5p-jpeg/
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC)+= s5p-mfc/
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV) += s5p-tv/
 
-obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D)+= s5p-g2d/
 obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/
 
 obj-$(CONFIG_VIDEO_STI_BDISP)  += sti/bdisp/
diff --git a/drivers/media/platform/s5p-g2d/Makefile 
b/drivers/media/platform/s5p-g2d/Makefile
deleted file mode 100644
index 2c48c416a804..
--- a/drivers/media/platform/s5p-g2d/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-s5p-g2d-objs := g2d.o g2d-hw.o
-
-obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D)+= s5p-g2d.o
diff --git a/drivers/media/platform/s5p-g2d/g2d-hw.c 
b/drivers/media/platform/s5p-g2d/g2d-hw.c
deleted file mode 100644
index e87bd93811d4..
--- a/drivers/media/platform/s5p-g2d/g2d-hw.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Samsung S5P G2D - 2D Graphics Accelerator Driver
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- * Kamil Debski, 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version
- */
-
-#include 
-
-#include "g2d.h"
-#include "g2d-regs.h"
-
-#define w(x, a)writel((x), d->regs + (a))
-#define r(a)   readl(d->regs + (a))
-
-/* g2d_reset clears all g2d registers */
-void g2d_reset(struct g2d_dev *d)
-{
-   w(1, SOFT_RESET_REG);
-}
-
-void g2d_set_src_size(struct g2d_dev *d, struct g2d_frame *f)
-{
-   u32 n;
-
-   w(0, SRC_SELECT_REG);
-