diff options
author | Dave Airlie <airlied@redhat.com> | 2014-11-17 06:36:53 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-11-17 06:36:53 +1000 |
commit | d0d6c524bf1d72e6d64134c3a315b77deecc9252 (patch) | |
tree | cbd0fbfed07b34f2a93471dd9344c619e8fcd158 /drivers/gpu/drm/tilcdc/tilcdc_panel.c | |
parent | 967b8e04d7993e93a44ffb63cc6504b6eded899a (diff) | |
parent | 23bd62fd419755b439152915f4df8ff26346f2b7 (diff) | |
download | talos-op-linux-d0d6c524bf1d72e6d64134c3a315b77deecc9252.tar.gz talos-op-linux-d0d6c524bf1d72e6d64134c3a315b77deecc9252.zip |
Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next
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..
* 'msm-next' of git://people.freedesktop.org/~robclark/linux: (21 commits)
drm/msm: a4xx support for msm-drm
drm/msm: Handle register offset differences between a3xx and a4xx
drm/msm: small mmap offset cleanups
drm/msm/mdp4: atomic
drm/msm/hdmi: atomic
drm/msm: atomic core bits
drm/msm: bit of fb error checking
drm/msm: fb prepare/cleanup
drm/msm: remove unused compile-test stub
drm/msm: small fence cleanup
drm/msm/mdp5: drop attached planes table
drm/msm/mdp4: drop attached planes table
drm/msm/mdp4: don't care about fb in crtc
drm/msm/mdp5: drop private primary ptr
drm/msm/mdp4: drop private primary ptr
drm/msm: Fix fbdev for 16- and 24-bit modes.
drm/msm: Allow exported dma-bufs to be mapped
drm/msm/hdmi: refactor bind/init
drm/msm: update generated headers
drm/msm/adreno: slight init order cleanup
...
Diffstat (limited to 'drivers/gpu/drm/tilcdc/tilcdc_panel.c')
0 files changed, 0 insertions, 0 deletions