[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 <laurent.pinchart at ideasonboard.com>
> > ---
> > 
> >  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.reichel at collabora.co.uk>
> 
> -- Sebastian
> 
> > +	select OMAP2_DSS_INIT
> > +	select VIDEOMODE_HELPERS
> >  	default n
> >  	help
> >  	  DRM display driver for OMAP2/3/4 based boards.

[snip]

-- 
Regards,

Laurent Pinchart