Skip to content
  • Dave Airlie's avatar
    9e87e48f
    Merge tag 'drm-intel-next-2015-03-27-merge' of... · 9e87e48f
    Dave Airlie authored
    Merge tag 'drm-intel-next-2015-03-27-merge' of git://anongit.freedesktop.org/drm-intel into drm-next
    
    This backmerges 4.0-rc6 due to the recent fixes in rc5/6
    
    - DP link rate refactoring from Ville
    - byt/bsw rps tuning from Chris
    - kerneldoc for the shrinker code
    - more dynamic ppgtt pte work (Michel, Ben, ...)
    - vlv dpll code refactoring to prep fro bxt (Imre)
    - refactoring the sprite colorkey code (Ville)
    - rotated ggtt view support from Tvrtko
    - roll out struct drm_atomic_state to prep for atomic update (Ander)
    
    * tag 'drm-intel-next-2015-03-27-merge' of git://anongit.freedesktop.org/drm-intel: (473 commits)
      Linux 4.0-rc6
      arm64: juno: Fix misleading name of UART reference clock
      drm/i915: Update DRIVER_DATE to 20150327
      drm/i915: Skip allocating shadow batch for 0-length batches
      drm/i915: Handle error to get connector state when staging config
      drm/i915: Compare GGTT view structs instead of types
      drm/i915: fix simple_return.cocci warnings
      drm/i915: Add module param to test the load detect code
      drm/i915: Remove usage of encoder->new_crtc from clock computations
      drm/i915: Don't look at staged config crtc when changing DRRS state
      drm/i915: Convert intel_pipe_will_have_type() to using atomic state
      drm/i915: Pass an atomic state to modeset_global_resources() functions
      drm/i915: Add dynamic page trace events
      drm/i915: Finish gen6/7 dynamic page table allocation
      drm/i915: Remove unnecessary gen6_ppgtt_unmap_pages
      drm/i915: Fix i915_dma_map_single positive error code
      drm/i915: Prevent out of range pt in gen6_for_each_pde
      drm/i915: fix definition of the DRM_IOCTL_I915_GET_SPRITE_COLORKEY ioctl
      drm/i915: Rip out GET_SPRITE_COLORKEY ioctl
      watchdog: imgpdc: Fix default heartbeat
      ...
    9e87e48f
    Merge tag 'drm-intel-next-2015-03-27-merge' of...
    Dave Airlie authored
    Merge tag 'drm-intel-next-2015-03-27-merge' of git://anongit.freedesktop.org/drm-intel into drm-next
    
    This backmerges 4.0-rc6 due to the recent fixes in rc5/6
    
    - DP link rate refactoring from Ville
    - byt/bsw rps tuning from Chris
    - kerneldoc for the shrinker code
    - more dynamic ppgtt pte work (Michel, Ben, ...)
    - vlv dpll code refactoring to prep fro bxt (Imre)
    - refactoring the sprite colorkey code (Ville)
    - rotated ggtt view support from Tvrtko
    - roll out struct drm_atomic_state to prep for atomic update (Ander)
    
    * tag 'drm-intel-next-2015-03-27-merge' of git://anongit.freedesktop.org/drm-intel: (473 commits)
      Linux 4.0-rc6
      arm64: juno: Fix misleading name of UART reference clock
      drm/i915: Update DRIVER_DATE to 20150327
      drm/i915: Skip allocating shadow batch for 0-length batches
      drm/i915: Handle error to get connector state when staging config
      drm/i915: Compare GGTT view structs instead of types
      drm/i915: fix simple_return.cocci warnings
      drm/i915: Add module param to test the load detect code
      drm/i915: Remove usage of encoder->new_crtc from clock computations
      drm/i915: Don't look at staged config crtc when changing DRRS state
      drm/i915: Convert intel_pipe_will_have_type() to using atomic state
      drm/i915: Pass an atomic state to modeset_global_resources() functions
      drm/i915: Add dynamic page trace events
      drm/i915: Finish gen6/7 dynamic page table allocation
      drm/i915: Remove unnecessary gen6_ppgtt_unmap_pages
      drm/i915: Fix i915_dma_map_single positive error code
      drm/i915: Prevent out of range pt in gen6_for_each_pde
      drm/i915: fix definition of the DRM_IOCTL_I915_GET_SPRITE_COLORKEY ioctl
      drm/i915: Rip out GET_SPRITE_COLORKEY ioctl
      watchdog: imgpdc: Fix default heartbeat
      ...
Loading