This patch series is a third attempt at removing the omapdrm and omapdss
devices from platform code. Most of the patches from the previous version have
been picked up already, this version contains all the leftovers.

The omapdss/omapdrm initialization code is quite a mess. The physical devices
are instantiated from DT, but two virtual devices named omapdrm and omapdss
are instanciated from platform code to pass SoC version information to the
drivers through platform data.

The only remaining users of the platform data are the OMAP HDMI encoders. The
series starts with a small cleanup in patch 01/11, followed by patches 02/11
to 05/11 that replace the SoC version with HDMI encoder version. Another small
cleanup in patch 06/11 completes the HDMI encoders part of the series.

The next step is to remove the omapdss platform driver (for the virtual
omapdss platform device, also known as core code, not to be confused with the
omapdss_dss driver for the DSS hardware device). Patches 07/11 adds omapdrm
platform device registration to the omapdss_dss driver to replace board code,
and patch 08/11 finally removes the omapdss platform driver.

Note that registering the omapdrm platform device from within the omapdss_dss
driver is a hack, but isn't worse than the current situation. Quite the
contrary, given that the omapdrm device exists for the sole purpose of
supporting the omapdrm/omapdss driver architecture, moving it out of platform
code can be considered as (slightly) cleaner. In any case, it will be easier
to refactor the code as everything is now isolated on the driver side.

Patches 09/11 and 10/11 remove the now unnecessary platform devices from
platform code, and patch 11/11 removes the now unused omapdrm platform data

A few patches touch the ARM mach-omap2 code, the OMAP sound driver and the
OMAP fbdev driver. The ARM and sound patches have all been posted before and
acked by Tony for mach-omap2 and Mark for sound for upstreaming through the
drm tree. The fbdev change in patch 03/11 is new, and I'd like to get
Bartlomiej's ack on it.

The series is based on top of "[PATCH v3 00/35] omapdrm: Deconstruct DSS

Laurent Pinchart (11):
  drm: omapdrm: hdmi: Rename functions and structures to use hdmi_
  drm: omapdrm: hdmi: Replace OMAP SoC model check with HDMI xmit
  drm: omapdrm: hdmi: Pass HDMI core version as integer to HDMI audio
  drm: omapdrm: hdmi: Configure the PLL from the HDMI core version
  drm: omapdrm: hdmi: Configure the PHY from the HDMI core version
  drm: omapdrm: hdmi: Don't allocate PHY features dynamically
  drm: omapdrm: Register omapdrm platform device in omapdss driver
  drm: omapdrm: Remove the omapdss driver
  ARM: OMAP2+: Remove unused omapdrm platform device
  ARM: OMAP2+: Don't register omapdss device for omapdrm
  drm: omapdrm: Remove omapdrm platform data

 arch/arm/mach-omap2/Makefile                 |   2 +-
 arch/arm/mach-omap2/display.c                | 118 ++++++++++++++-------------
 arch/arm/mach-omap2/display.h                |   1 -
 arch/arm/mach-omap2/drm.c                    |  53 ------------
 drivers/gpu/drm/omapdrm/dss/core.c           |  62 ++++----------
 drivers/gpu/drm/omapdrm/dss/hdmi.h           |   7 +-
 drivers/gpu/drm/omapdrm/dss/hdmi4.c          |   6 +-
 drivers/gpu/drm/omapdrm/dss/hdmi5.c          |   6 +-
 drivers/gpu/drm/omapdrm/dss/hdmi_phy.c       |  45 ++--------
 drivers/gpu/drm/omapdrm/dss/hdmi_pll.c       |  24 ++----
 drivers/gpu/drm/omapdrm/dss/hdmi_wp.c        |  12 ++-
 drivers/gpu/drm/omapdrm/dss/omapdss.h        |   1 -
 drivers/gpu/drm/omapdrm/omap_drv.c           |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c |   2 +-
 drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c |   2 +-
 include/linux/platform_data/omap_drm.h       |  53 ------------
 include/sound/omap-hdmi-audio.h              |   2 +-
 sound/soc/omap/omap-hdmi-audio.c             |   9 +-
 18 files changed, 112 insertions(+), 295 deletions(-)
 delete mode 100644 arch/arm/mach-omap2/drm.c
 delete mode 100644 include/linux/platform_data/omap_drm.h


Laurent Pinchart

dri-devel mailing list

Reply via email to