• Dave Airlie's avatar
    Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-next · 65983bd6
    Dave Airlie authored
    Daniel writes:
    "New stuff for -next. Highlights:
    - prep patches for the modeset rework. Note that one of those patches
      touches the fb helper in the common drm code.
    - hasw hdmi audio support (Wang Xingchao)
    - improved instdone dumping for gen7 (Ben)
    - unbound tracking and a few follow-up patches from Chris
    - dma_buf->begin/end_cpu_access plus fix for drm/udl (Dave)
    - improve mmio error reporting for hsw
    - prep patch for WQ_NON_REENTRANT removal (Tejun Heo)
    "
    
    * 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel: (41 commits)
      drm/i915: Remove __GFP_NO_KSWAPD
      drm/i915: disable rc6 on ilk when vt-d is enabled
      drm/i915: Avoid unbinding due to an interrupted pin_and_fence during execbuffer
      drm/i915: Use new INSTDONE registers (Gen7+)
      drm/i915: Add new INSTDONE registers
      drm/i915: Extract reading INSTDONE
      drm/i915: Use a non-blocking wait for set-to-domain ioctl
      drm/i915: Juggle code order to ease flow of the next patch
      drm/i915: Use cpu relocations if the object is in the GTT but not mappable
      drm/i915: Extract general object init routine
      drm/i915: Protect private gem objects from truncate (such as imported dmabuf)
      drm/i915: Only pwrite through the GTT if there is space in the aperture
      i915: use alloc_ordered_workqueue() instead of explicit UNBOUND w/ max_active = 1
      drm/i915: Find unclaimed MMIO writes.
      drm/i915: Add ERR_INT to gen7 error state
      drm/i915: Cantiga+ cannot handle a hsync front porch of 0
      drm/i915: fix reassignment of variable "intel_dp->DP"
      drm/i915: Try harder to allocate an mmap_offset
      drm/i915: Show pin count in debugfs
      drm/i915: Show (count, size) of purgeable objects in i915_gem_objects
      ...
    65983bd6
drm_fb_helper.c 36.8 KB