[pull] drm/msm: msm-next for 3.19 (part 2)

Rob Clark robdclark at gmail.com
Fri Nov 21 13:10:16 PST 2014


Hi Dave,

Now that we have the bits needed for mdp5 atomic, here is the followup
pull request I mentioned.  Main highlights are:

1) mdp5 multiple crtc and public plane support (no more hard-coded mixer setup!)
2) mdp5 atomic conversion
3) couple atomic helper fixes for issues found during mdp5 atomic
debug (reviewed by danvet.. but he didn't plane to send an
atomic-fixes pull request so I agreed to tack them on to mine)

I didn't have time to review the eDP patches, so those will wait until
the next time.

The following changes since commit ed1e8777a56f3523712506d608a29f57ed37b613:

  Merge branch 'drm-next-3.19' of
git://people.freedesktop.org/~agd5f/linux into drm-next (2014-11-21
12:17:43 +1000)

are available in the git repository at:


  git://people.freedesktop.org/~robclark/linux msm-next

for you to fetch changes up to 46df9adb2e7709e56ab8aacaff2fc997a6d17239:

  drm/atomic: shutdown *current* encoder (2014-11-21 16:06:15 -0500)

----------------------------------------------------------------
Rob Clark (11):
      drm/msm/mdp5: use irqdomains
      drm/msm/hdmi: remove useless kref
      drm/msm/mdp5: set rate before enabling clk
      drm/msm/mdp5: don't use void * for opaque types
      drm/msm/mdp5: remove global mdp5_ctl_mgr
      drm/msm: atomic fixes
      drm/msm/mdp5: atomic
      drm/msm/mdp5: dpms(OFF) cleanups
      drm/msm/mdp4: fix mixer setup for multi-crtc + planes
      drm/atomic: check mode_changed *after* atomic_check
      drm/atomic: shutdown *current* encoder

Stephane Viau (4):
      drm/msm/mdp5: get the core clock rate from MDP5 config
      drm/msm/mdp5: make SMP module dynamically configurable
      drm/msm/mdp5: introduce mdp5_cfg module
      drm/msm: add multiple CRTC and overlay support

 drivers/gpu/drm/drm_atomic_helper.c         |  17 +-
 drivers/gpu/drm/msm/Makefile                |   2 +
 drivers/gpu/drm/msm/hdmi/hdmi.c             |  57 ++--
 drivers/gpu/drm/msm/hdmi/hdmi.h             |  17 --
 drivers/gpu/drm/msm/hdmi/hdmi_bridge.c      |   3 +-
 drivers/gpu/drm/msm/hdmi/hdmi_connector.c   |   4 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c    |  70 +++--
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h     |   7 -
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c     | 207 +++++++++++++
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h     |  91 ++++++
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c    | 430 ++++++++++++++--------------
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c     | 322 +++++++++++++++++++++
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h     | 122 ++++++++
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c |  24 ++
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c     |  94 +++++-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c     | 262 +++++++----------
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h     | 131 +++------
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c   | 327 +++++++++++++--------
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c     | 241 +++++++++++++---
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h     |  23 +-
 drivers/gpu/drm/msm/msm_atomic.c            |   2 +-
 drivers/gpu/drm/msm/msm_drv.h               |   1 -
 drivers/gpu/drm/msm/msm_fb.c                |   2 +
 drivers/gpu/drm/msm/msm_kms.h               |  20 +-
 24 files changed, 1737 insertions(+), 739 deletions(-)
 create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c
 create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h
 create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c
 create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h


More information about the dri-devel mailing list