[GIT PULL] imx-drm: module/dependency changes

[GIT PULL] imx-drm: module/dependency changes

[Philipp Zabel]

Hi Dave,

this tag contains a patch to combine the imxdrm and imx-ipuv3-crtc
modules into a single imxdrm module, as after commits 44b460cfe554
("drm: imx: remove struct imx_drm_crtc and imx_drm_crtc_helper_funcs")
and especially eb8c88808c83 ("drm/imx: add deferred plane disabling")
there is no clear cut boundary between the two anymore. 
Another patch makes recently added PRE/PRG support optional in the core
ipu-v3 module, to avoid a dependency on CONFIG_DRM.

regards
Philipp

The following changes since commit 7d5ed2920d15a8583084f7ca689a30277ef9af55:

  drm/imx: Remove unneeded definition for structure imx_drm_component (2017-03-16 10:14:52 +0100)

are available in the git repository at:

  git://git.pengutronix.de/git/pza/linux.git tags/imx-drm-next-2017-04-04

for you to fetch changes up to 3d1df96ad46856ce850be5ac112eab919cbe1cab:

  drm/imx: merge imx-drm-core and ipuv3-crtc in one module (2017-04-04 10:59:08 +0200)

----------------------------------------------------------------
imx-drm module/dependency changes

- The PRE/PRG drivers added an unwanted DRM dependency to the ipu-v3 driver.
  Remove the dependency by conditionally disabling PRE/PRG support depending
  on CONFIG_DRM.
- Merge the imx-ipuv3-crtc module into the imxdrm module. There is no reason
  anymore for a separation between core drm driver and crtc/plane drivers,
  especially since commit eb8c88808c83 ("drm/imx: add deferred plane
  disabling"), which added a dependency on imx-ipuv3-crtc to the imxdrm
  module.

----------------------------------------------------------------
Lucas Stach (2):
      gpu: ipu-v3: don't depend on DRM being enabled
      drm/imx: merge imx-drm-core and ipuv3-crtc in one module

 drivers/gpu/drm/imx/Kconfig        |  7 -------
 drivers/gpu/drm/imx/Makefile       |  3 +--
 drivers/gpu/drm/imx/imx-drm-core.c | 18 +++++++++++++++++-
 drivers/gpu/drm/imx/imx-drm.h      |  2 ++
 drivers/gpu/drm/imx/ipuv3-crtc.c   |  8 +-------
 drivers/gpu/ipu-v3/Makefile        |  6 +++++-
 drivers/gpu/ipu-v3/ipu-common.c    |  5 ++++-
 7 files changed, 30 insertions(+), 19 deletions(-)
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel