[pull] drm/msm: msm-next for 3.19
Rob Clark
robdclark at gmail.com
Sun Nov 16 11:38:08 PST 2014
Hi Dave,
Main pull for 3.19. I may have another pull in a few days with some
mdp5 bits (and hopefully mdp5 atomic), but I figured there was no need
to hold up what we have already. Main highlights so far:
1) a4xx gpu support (userspace gallium bits on mesa master)
2) mdp4/hdmi/core bits for atomic helpers. Still missing mdp5
conversion, main hold up there is current hard-coded mixer setup isn't
clever enough to deal with disabling primary plane while crtc active.
3) various other misc cleanup/fixes/etc..
The following changes since commit ca5a71de4852e3eeba53a326ddf260b7b2e117b1:
Merge tag 'drm/gem-cma/for-3.19-rc1' of
git://people.freedesktop.org/~tagr/linux into drm-next (2014-11-15
09:50:21 +1000)
are available in the git repository at:
git://people.freedesktop.org/~robclark/linux msm-next
for you to fetch changes up to 23bd62fd419755b439152915f4df8ff26346f2b7:
drm/msm: a4xx support for msm-drm (2014-11-16 14:27:40 -0500)
----------------------------------------------------------------
Aravind Ganesan (2):
drm/msm: Handle register offset differences between a3xx and a4xx
drm/msm: a4xx support for msm-drm
Daniel Thompson (2):
drm/msm: Allow exported dma-bufs to be mapped
drm/msm: Fix fbdev for 16- and 24-bit modes.
Rob Clark (17):
drm/msm: select REGULATOR
drm/msm/adreno: slight init order cleanup
drm/msm: update generated headers
drm/msm/hdmi: refactor bind/init
drm/msm/mdp4: drop private primary ptr
drm/msm/mdp5: drop private primary ptr
drm/msm/mdp4: don't care about fb in crtc
drm/msm/mdp4: drop attached planes table
drm/msm/mdp5: drop attached planes table
drm/msm: small fence cleanup
drm/msm: remove unused compile-test stub
drm/msm: fb prepare/cleanup
drm/msm: bit of fb error checking
drm/msm: atomic core bits
drm/msm/hdmi: atomic
drm/msm/mdp4: atomic
drm/msm: small mmap offset cleanups
drivers/gpu/drm/msm/Kconfig | 1 +
drivers/gpu/drm/msm/Makefile | 2 +
drivers/gpu/drm/msm/adreno/a2xx.xml.h | 26 +-
drivers/gpu/drm/msm/adreno/a3xx.xml.h | 247 ++-
drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 91 +
drivers/gpu/drm/msm/adreno/a4xx.xml.h | 2144 ++++++++++++++++++++
drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 604 ++++++
drivers/gpu/drm/msm/adreno/a4xx_gpu.h | 34 +
drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 17 +-
drivers/gpu/drm/msm/adreno/adreno_device.c | 13 +
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 31 +-
drivers/gpu/drm/msm/adreno/adreno_gpu.h | 126 ++
drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 75 +-
drivers/gpu/drm/msm/dsi/dsi.xml.h | 8 +-
drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 8 +-
drivers/gpu/drm/msm/dsi/sfpb.xml.h | 8 +-
drivers/gpu/drm/msm/hdmi/hdmi.c | 99 +-
drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 8 +-
drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 3 +
drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c | 2 +-
drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 8 +-
drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 8 +-
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 266 +--
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 17 +-
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 10 -
drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 3 +
drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 120 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 10 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 46 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 3 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 11 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 2 -
drivers/gpu/drm/msm/msm_atomic.c | 163 ++
drivers/gpu/drm/msm/msm_drv.c | 25 +
drivers/gpu/drm/msm/msm_drv.h | 34 +-
drivers/gpu/drm/msm/msm_fb.c | 43 +-
drivers/gpu/drm/msm/msm_fbdev.c | 3 -
drivers/gpu/drm/msm/msm_gem.c | 40 +-
drivers/gpu/drm/msm/msm_gem.h | 13 +
drivers/gpu/drm/msm/msm_gem_prime.c | 13 +
drivers/gpu/drm/msm/msm_kms.h | 5 +
41 files changed, 3893 insertions(+), 497 deletions(-)
create mode 100644 drivers/gpu/drm/msm/adreno/a4xx.xml.h
create mode 100644 drivers/gpu/drm/msm/adreno/a4xx_gpu.c
create mode 100644 drivers/gpu/drm/msm/adreno/a4xx_gpu.h
create mode 100644 drivers/gpu/drm/msm/msm_atomic.c
More information about the dri-devel
mailing list