Re: [PATCH 20/48] drm: omapdrm: Merge the omapdrm and omapdss drivers

[Laurent Pinchart]

Hi Sebastian,

On Saturday, 14 October 2017 16:12:37 EEST Sebastian Reichel wrote:
> On Fri, Oct 13, 2017 at 05:59:16PM +0300, Laurent Pinchart wrote:
> > The split between the omapdss and omapdrm driver is historic and was due
> > to other userspace APIs (FBDEV and V4L2) being supported in addition to
> > DRM/KMS. Now that the drivers only supports the DRM/KMS API, there is no
> > need to keep them separate anymore.
> > 
> > Merge the two drivers and remove the now unneeded omapdrm virtual
> > platform device.
> > 
> > Signed-off-by: Laurent Pinchart 
> > ---
> > 
> >  drivers/gpu/drm/omapdrm/Kconfig  |  5 +-
> >  drivers/gpu/drm/omapdrm/Makefile | 25 ++
> >  drivers/gpu/drm/omapdrm/dss/Kconfig  | 12 -
> >  drivers/gpu/drm/omapdrm/dss/Makefile | 25 --
> >  drivers/gpu/drm/omapdrm/dss/base.c   | 13 -
> >  drivers/gpu/drm/omapdrm/dss/core.c   | 14 ++
> >  drivers/gpu/drm/omapdrm/dss/dss.c| 23 -
> >  drivers/gpu/drm/omapdrm/dss/omapdss.h|  4 --
> >  drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 12 -
> >  drivers/gpu/drm/omapdrm/omap_dmm_tiler.h |  3 +-
> >  drivers/gpu/drm/omapdrm/omap_drv.c   | 82 ++-
> >  drivers/gpu/drm/omapdrm/omap_drv.h   |  4 ++
> >  12 files changed, 74 insertions(+), 148 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/omapdrm/Kconfig
> > b/drivers/gpu/drm/omapdrm/Kconfig index b3d08c5f41d4..7e5080e45b16 100644
> > --- a/drivers/gpu/drm/omapdrm/Kconfig
> > +++ b/drivers/gpu/drm/omapdrm/Kconfig
> > @@ -2,8 +2,11 @@ config DRM_OMAP
> > tristate "OMAP DRM"
> > depends on DRM
> > depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
> > -   select OMAP2_DSS
> > select DRM_KMS_HELPER
> > +   select HDMI
> > +   select OMAP2_DSS
> 
> As far as I can see "CONFIG_OMAP2_DSS" no longer exists after the merge,
> so this can be dropped.

Good point. I'll fix that in v2.

> Otherwise:
> 
> Reviewed-by: Sebastian Reichel 
> 
> -- Sebastian
> 
> > +   select OMAP2_DSS_INIT
> > +   select VIDEOMODE_HELPERS
> > default n
> > help
> >   DRM display driver for OMAP2/3/4 based boards.

[snip]

-- 
Regards,

Laurent Pinchart

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 20/48] drm: omapdrm: Merge the omapdrm and omapdss drivers

[Sebastian Reichel]

Hi,

On Fri, Oct 13, 2017 at 05:59:16PM +0300, Laurent Pinchart wrote:
> The split between the omapdss and omapdrm driver is historic and was due
> to other userspace APIs (FBDEV and V4L2) being supported in addition to
> DRM/KMS. Now that the drivers only supports the DRM/KMS API, there is no
> need to keep them separate anymore.
> 
> Merge the two drivers and remove the now unneeded omapdrm virtual
> platform device.
> 
> Signed-off-by: Laurent Pinchart 
> ---
>  drivers/gpu/drm/omapdrm/Kconfig  |  5 +-
>  drivers/gpu/drm/omapdrm/Makefile | 25 ++
>  drivers/gpu/drm/omapdrm/dss/Kconfig  | 12 -
>  drivers/gpu/drm/omapdrm/dss/Makefile | 25 --
>  drivers/gpu/drm/omapdrm/dss/base.c   | 13 -
>  drivers/gpu/drm/omapdrm/dss/core.c   | 14 ++
>  drivers/gpu/drm/omapdrm/dss/dss.c| 23 -
>  drivers/gpu/drm/omapdrm/dss/omapdss.h|  4 --
>  drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 12 -
>  drivers/gpu/drm/omapdrm/omap_dmm_tiler.h |  3 +-
>  drivers/gpu/drm/omapdrm/omap_drv.c   | 82 
> ++--
>  drivers/gpu/drm/omapdrm/omap_drv.h   |  4 ++
>  12 files changed, 74 insertions(+), 148 deletions(-)
> 
> diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig
> index b3d08c5f41d4..7e5080e45b16 100644
> --- a/drivers/gpu/drm/omapdrm/Kconfig
> +++ b/drivers/gpu/drm/omapdrm/Kconfig
> @@ -2,8 +2,11 @@ config DRM_OMAP
>   tristate "OMAP DRM"
>   depends on DRM
>   depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
> - select OMAP2_DSS
>   select DRM_KMS_HELPER
> + select HDMI
> + select OMAP2_DSS

As far as I can see "CONFIG_OMAP2_DSS" no longer exists after the merge,
so this can be dropped.

Otherwise:

Reviewed-by: Sebastian Reichel 

-- Sebastian

> + select OMAP2_DSS_INIT
> + select VIDEOMODE_HELPERS
>   default n
>   help
> DRM display driver for OMAP2/3/4 based boards.
> diff --git a/drivers/gpu/drm/omapdrm/Makefile 
> b/drivers/gpu/drm/omapdrm/Makefile
> index b391be7ecb6c..1dafa51ca00e 100644
> --- a/drivers/gpu/drm/omapdrm/Makefile
> +++ b/drivers/gpu/drm/omapdrm/Makefile
> @@ -21,4 +21,29 @@ omapdrm-y := omap_drv.o \
>  
>  omapdrm-$(CONFIG_DRM_FBDEV_EMULATION) += omap_fbdev.o
>  
> +# Core DSS files
> +omapdrm-y += \
> + dss/base.o \
> + dss/core.o \
> + dss/dispc.o \
> + dss/dispc_coefs.o \
> + dss/display.o \
> + dss/dss.o \
> + dss/dss-of.o \
> + dss/output.o \
> + dss/pll.o \
> + dss/video-pll.o
> +
> +omapdrm-$(CONFIG_OMAP2_DSS_DPI) += dss/dpi.o
> +omapdrm-$(CONFIG_OMAP2_DSS_VENC) += dss/venc.o
> +omapdrm-$(CONFIG_OMAP2_DSS_SDI) += dss/sdi.o
> +omapdrm-$(CONFIG_OMAP2_DSS_DSI) += dss/dsi.o
> +omapdrm-$(CONFIG_OMAP2_DSS_HDMI_COMMON) += dss/hdmi_common.o dss/hdmi_wp.o \
> + dss/hdmi_pll.o dss/hdmi_phy.o
> +omapdrm-$(CONFIG_OMAP4_DSS_HDMI) += dss/hdmi4.o dss/hdmi4_core.o
> +omapdrm-$(CONFIG_OMAP4_DSS_HDMI_CEC) += dss/hdmi4_cec.o
> +omapdrm-$(CONFIG_OMAP5_DSS_HDMI) += dss/hdmi5.o dss/hdmi5_core.o
> +
> +ccflags-$(CONFIG_OMAP2_DSS_DEBUG) += -DDEBUG
> +
>  obj-$(CONFIG_DRM_OMAP)   += omapdrm.o
> diff --git a/drivers/gpu/drm/omapdrm/dss/Kconfig 
> b/drivers/gpu/drm/omapdrm/dss/Kconfig
> index 39a30a64448a..157c5601e4be 100644
> --- a/drivers/gpu/drm/omapdrm/dss/Kconfig
> +++ b/drivers/gpu/drm/omapdrm/dss/Kconfig
> @@ -1,16 +1,6 @@
>  config OMAP2_DSS_INIT
>   bool
>  
> -menuconfig OMAP2_DSS
> -tristate "OMAP2+ Display Subsystem support"
> - select VIDEOMODE_HELPERS
> - select OMAP2_DSS_INIT
> - select HDMI
> -help
> -   OMAP2+ Display Subsystem support.
> -
> -if OMAP2_DSS
> -
>  config OMAP2_DSS_DEBUG
>   bool "Debug support"
>   default n
> @@ -126,5 +116,3 @@ config OMAP2_DSS_SLEEP_AFTER_VENC_RESET
>  
> This option enables the sleep, and is enabled by default. You can
> disable the sleep if it doesn't cause problems on your platform.
> -
> -endif
> diff --git a/drivers/gpu/drm/omapdrm/dss/Makefile 
> b/drivers/gpu/drm/omapdrm/dss/Makefile
> index 531b4d8075e5..3db4bf31aeaf 100644
> --- a/drivers/gpu/drm/omapdrm/dss/Makefile
> +++ b/drivers/gpu/drm/omapdrm/dss/Makefile
> @@ -1,26 +1 @@
>  obj-$(CONFIG_OMAP2_DSS_INIT) += omapdss-boot-init.o
> -obj-$(CONFIG_OMAP2_DSS) += omapdss.o
> -
> -# Core DSS files
> -omapdss-y := \
> - base.o \
> - display.o \
> - dss-of.o \
> - output.o \
> - core.o \
> - dss.o \
> - dispc.o \
> - dispc_coefs.o \
> - pll.o \
> - video-pll.o
> -
> -omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o
> -omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o
> -omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o
> -omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o
> -omapdss-$(CONFIG_OMAP2_DSS_HDMI_COMMON) += hdmi_common.o hdmi_wp.o 
> hdmi_pll.o \
> - hdmi_phy.o
> -omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi4.o hdmi4_core.o
>