summaryrefslogtreecommitdiff
path: root/drivers/i2c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-11-25 12:10:53 (GMT)
committerDave Airlie <airlied@redhat.com>2014-11-25 12:10:53 (GMT)
commit955289c7cfad158dc939e150896a240f549ccc60 (patch)
tree3c3afeec99f63a52904f55906eb987bf89710612 /drivers/i2c
parented1e8777a56f3523712506d608a29f57ed37b613 (diff)
parent46df9adb2e7709e56ab8aacaff2fc997a6d17239 (diff)
downloadlinux-955289c7cfad158dc939e150896a240f549ccc60.tar.xz
Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next
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) * 'msm-next' of git://people.freedesktop.org/~robclark/linux: drm/atomic: shutdown *current* encoder drm/atomic: check mode_changed *after* atomic_check drm/msm/mdp4: fix mixer setup for multi-crtc + planes drm/msm/mdp5: dpms(OFF) cleanups drm/msm/mdp5: atomic drm/msm: atomic fixes drm/msm/mdp5: remove global mdp5_ctl_mgr drm/msm/mdp5: don't use void * for opaque types drm/msm: add multiple CRTC and overlay support drm/msm/mdp5: set rate before enabling clk drm/msm/mdp5: introduce mdp5_cfg module drm/msm/mdp5: make SMP module dynamically configurable drm/msm/hdmi: remove useless kref drm/msm/mdp5: get the core clock rate from MDP5 config drm/msm/mdp5: use irqdomains
Diffstat (limited to 'drivers/i2c')
0 files changed, 0 insertions, 0 deletions