1. 04 Mar, 2015 3 commits
    • Dave Airlie's avatar
      Merge branch 'drm-atmel-hlcdc-devel' of git://github.com/bbrezillon/linux-at91 into drm-next · 87dc8b6c
      Dave Airlie authored
      This pull request includes:
      - support for Atomic mode setting
      - the discard area optimization
      - implementation of PM primitives
      
      * 'drm-atmel-hlcdc-devel' of git://github.com/bbrezillon/linux-at91:
        drm: atmel-hlcdc: Add pinctrl PM select sleep,default state in CRTC suspend/resume
        drm: atmel-hlcdc: Add PM suspend/resume support
        drm: atmel-hlcdc: add discard area support
        drm: atmel-hlcdc: Atomic mode-setting conversion
      87dc8b6c
    • Dave Airlie's avatar
      Merge branch 'drm/next/atomic' of git://linuxtv.org/pinchartl/fbdev into drm-next · 7e477484
      Dave Airlie authored
      rcar-du atomic modesetting support
      * 'drm/next/atomic' of git://linuxtv.org/pinchartl/fbdev: (32 commits)
        drm: rcar-du: Fix race condition in hardware plane allocator
        drm: rcar-du: Move group locking inside rcar_du_crtc_update_planes()
        drm: rcar-du: Move plane commit code from CRTC start to CRTC resume
        drm: rcar-du: Move plane format to plane state
        drm: rcar-du: Remove unneeded rcar_du_crtc plane field
        drm: rcar-du: Replace plane crtc and enabled fields by plane state
        drm: rcar-du: Rework plane setup code
        drm: rcar-du: Switch plane set_property to atomic helpers
        drm: rcar-du: Switch page flip to atomic helpers
        drm: rcar-du: Implement asynchronous commit support
        drm: rcar-du: Replace encoder mode_fixup with atomic_check
        drm: rcar-du: Switch connector DPMS to atomic helpers
        drm: rcar-du: Switch mode config to atomic helpers
        drm: rcar-du: Switch plane update to atomic helpers
        drm: rcar-du: Rework CRTC enable/disable for atomic updates
        drm: rcar-du: Rework HDMI encoder enable/disable for atomic updates
        drm: rcar-du: Rework encoder enable/disable for atomic updates
        drm: rcar-du: Replace LVDS encoder DPMS by enable/disable
        drm: rcar-du: Remove private copy of plane size and position
        drm: rcar-du: Wire up atomic state object scaffolding
        ...
      7e477484
    • Dave Airlie's avatar
      Merge branch 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next · 79d6d942
      Dave Airlie authored
      A number of TDA998x updates for the next merge window.  Patches
      included in this set are:
      * adding support for finding the attached CRTCs from DT
      * a fix function name mis-spelling in a dev_err()
      * simplify the EDID reading by using the drm_do_get_edid() function
        instead of coding this ourselves.
      
      * 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        drm/i2c: tda998x: use drm_do_get_edid()
        drm/i2c: tda998x: fix misspelling of current function in string
        drm/i2c: tda998x: add OF support for finding attached CRTCs
      79d6d942
  2. 03 Mar, 2015 32 commits
  3. 26 Feb, 2015 1 commit
    • Dave Airlie's avatar
      Merge tag 'topic/drm-misc-2015-02-25' of git://anongit.freedesktop.org/drm-intel into drm-next · 329414c4
      Dave Airlie authored
      misc atomic and dp macros
      
      * tag 'topic/drm-misc-2015-02-25' of git://anongit.freedesktop.org/drm-intel:
        drm: Adding edp1.4 specific dpcd macros
        drm/atomic-helpers: make mode_set hooks optional
        drm/atomic-helper: Rename commmit_post/pre_planes
        drm/atomic: Rename drm_atomic_helper_commit_pre_planes() state argument
        drm: If available use atomic state in getcrtc ioctl
        drm: Add DRM_DEBUG_ATOMIC
        drm/atomic-helpers: Fix documentation typos and wrong copy&paste
        drm: Fix the CRTC_STEREO_DOUBLE_ONLY define to include stero modes
        drm: Fix drm_crtc_vblank_get() documentation
      329414c4
  4. 24 Feb, 2015 4 commits