[pull] drm/msm: msm-next for 3.17

Rob Clark robdclark at gmail.com
Mon Aug 4 09:07:46 PDT 2014


Dave,

This time around we have a mix of new hw enablement (mdp5 v1.3 /
apq8084), plus devicetree and various upstream changes (mostly
adapting to CCF vs downstream clk driver differences) for mdp4 /
apq8064.  With these drm/msm patches plus a few other small patchsets
(from linaro qcom integration branch.. mostly stuff queued up for
3.17) we have the inforce ifc6410 board working, with gpu.  Much nicer
to work with than ancient vendor android branch :-)

The following changes since commit c759606c96dc052373d4c36ea383595da46b04e9:

  Merge tag 'drm-intel-next-2014-07-25-merged' of
git://anongit.freedesktop.org/drm-intel into drm-next (2014-08-04
17:57:34 +1000)

are available in the git repository at:


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

for you to fetch changes up to a2fe6cdc03d7a9b0d048a7f32f9d8827e06c67fa:

  drm/msm/hdmi: fix HDMI_MUX_EN gpio request typo (2014-08-04 11:55:30 -0400)

----------------------------------------------------------------
Beeresh Gopal (2):
      drm/msm/hdmi: enable lpm-mux if it is present
      drm/msm/hdmi: fix HDMI_MUX_EN gpio request typo

Hai Li (1):
      drm/msm: Implement msm drm fb_mmap callback function

Rob Clark (9):
      drm/msm: fix double struct_mutex acquire
      drm/msm: DT support for 8960/8064 (v3)
      drm/msm: update generated headers
      drm/msm: hdmi phy 8960 phy pll
      drm/msm/mdp4: add mdp axi clk
      drm/msm: fix BUG_ON() in error cleanup path
      drm/msm: no mmu is only error if not using vram carveout
      drm/msm: use upstream iommu
      drm/msm: fix potential deadlock in gpu init

Stephane Viau (2):
      drm/msm: activate iommu support
      drm/msm/mdp5: add support for MDP5 v1.3

 Documentation/devicetree/bindings/drm/msm/gpu.txt  |  52 +++
 Documentation/devicetree/bindings/drm/msm/hdmi.txt |  46 +++
 Documentation/devicetree/bindings/drm/msm/mdp.txt  |  48 +++
 drivers/gpu/drm/msm/Kconfig                        |   1 -
 drivers/gpu/drm/msm/adreno/a2xx.xml.h              |  58 ++-
 drivers/gpu/drm/msm/adreno/a3xx.xml.h              | 296 +++++++++++---
 drivers/gpu/drm/msm/adreno/a3xx_gpu.c              |   7 +-
 drivers/gpu/drm/msm/adreno/a3xx_gpu.h              |   5 +
 drivers/gpu/drm/msm/adreno/adreno_common.xml.h     |  56 ++-
 drivers/gpu/drm/msm/adreno/adreno_gpu.c            |  14 +-
 drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h        | 239 +++++++++++-
 drivers/gpu/drm/msm/dsi/dsi.xml.h                  |   4 +-
 drivers/gpu/drm/msm/dsi/mmss_cc.xml.h              |   4 +-
 drivers/gpu/drm/msm/dsi/sfpb.xml.h                 |   4 +-
 drivers/gpu/drm/msm/hdmi/hdmi.c                    |  69 ++--
 drivers/gpu/drm/msm/hdmi/hdmi.h                    |   1 +
 drivers/gpu/drm/msm/hdmi/hdmi.xml.h                | 109 +++++-
 drivers/gpu/drm/msm/hdmi/hdmi_connector.c          |  23 +-
 drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c           | 377 +++++++++++++++++-
 drivers/gpu/drm/msm/hdmi/qfprom.xml.h              |   4 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h            |   4 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c            |  25 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h            |   1 +
 drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h            | 431 +++++++++++++--------
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c            | 159 +++++++-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h            |  25 ++
 drivers/gpu/drm/msm/mdp/mdp_common.xml.h           |   4 +-
 drivers/gpu/drm/msm/msm_drv.c                      |  52 ++-
 drivers/gpu/drm/msm/msm_fbdev.c                    |  45 ++-
 drivers/gpu/drm/msm/msm_gem.c                      |  15 +-
 drivers/gpu/drm/msm/msm_gpu.c                      |  12 +-
 drivers/gpu/drm/msm/msm_iommu.c                    |  31 +-
 drivers/gpu/drm/msm/msm_mmu.h                      |   8 +-
 33 files changed, 1837 insertions(+), 392 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/drm/msm/gpu.txt
 create mode 100644 Documentation/devicetree/bindings/drm/msm/hdmi.txt
 create mode 100644 Documentation/devicetree/bindings/drm/msm/mdp.txt


More information about the dri-devel mailing list