1. 16 Aug, 2015 38 commits
  2. 14 Aug, 2015 2 commits
    • Dave Airlie's avatar
      Merge tag 'drm-amdkfd-next-fixes-2015-08-05' of... · 8f9cb507
      Dave Airlie authored
      Merge tag 'drm-amdkfd-next-fixes-2015-08-05' of git://people.freedesktop.org/~gabbayo/linux into drm-next
      
      Two small bug fixes for the code you pulled for 4.3:
      
      - Used a SHIFT define instead of a MASK define to check if a bit is turned on
        when destroying hqd. Luckily, this is in gfx7 interface file with amdgpu,
        which was used only for bring-up purposes of amdgpu, so no real effect on
        a running system
      
      - Used a logical AND instead of a bitwise AND operator, when initializing
        sdma virtual memory when using SDMA queues
      
      * tag 'drm-amdkfd-next-fixes-2015-08-05' of git://people.freedesktop.org/~gabbayo/linux:
        drm/amdkfd: fix bug when initializing sdma vm
        drm/amdgpu: fix bug when amdkfd destroys hqd
      8f9cb507
    • Dave Airlie's avatar
      Merge branch 'drm-sti-next-atomic-2015-08-11' of... · e1474e7b
      Dave Airlie authored
      Merge branch 'drm-sti-next-atomic-2015-08-11' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next
      
      This serie of patches fix minor bugs around how driver sub-components are
      bind and planes z-ordering.
      The main part is about atomic support: using more atomic helpers allow us
      to simplify the code (~300 lines removed) and to ahve a better match between
      drm concepts (planes and crtc) and hardware split.
      
      [airlied: fixed up conflict in atomic code]
      
      * 'drm-sti-next-atomic-2015-08-11' of http://git.linaro.org/people/benjamin.gaignard/kernel:
        drm/sti: atomic crtc/plane update
        drm/sti: rename files and functions
        drm/sti: code clean up
        drm/sti: fix dynamic z-ordering
        drm: sti: fix sub-components bind
      e1474e7b