• Dave Airlie's avatar
    Merge tag 'drm-intel-next-2013-03-23' of... · 399403c7
    Dave Airlie authored
    Merge tag 'drm-intel-next-2013-03-23' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
    
    Daniel writes:
    Highlights:
    - Imre's for_each_sg_pages rework (now also with the stolen mem backed
      case fixed with a hack) plus the drm prime sg list coalescing patch from
      Rahul Sharma. I have some follow-up cleanups pending, already acked by
      Andrew Morton.
    - Some prep-work for the crazy no-pch/display-less platform by Ben.
    - Some vlv patches, by far not all (Jesse et al).
    - Clean up the HDMI/SDVO #define confusion (Paulo)
    - gen2-4 vblank fixes from Ville.
    - Unclaimed register warning fixes for hsw (Paulo). More still to come ...
    - Complete pageflips which have been stuck in a gpu hang, should prevent
      stuck gl compositors (Ville).
    - pm patches for vt-switchless resume (Jesse). Note that the i915 enabling
      is not (yet) included, that took a bit longer to settle. PM patches are
      acked by Rafael Wysocki.
    - Minor fixlets all over from various people.
    
    * tag 'drm-intel-next-2013-03-23' of git://people.freedesktop.org/~danvet/drm-intel: (79 commits)
      drm/i915: Implement WaSwitchSolVfFArbitrationPriority
      drm/i915: Set the VIC in AVI infoframe for SDVO
      drm/i915: Kill a strange comment about DPMS functions
      drm/i915: Correct sandybrige overclocking
      drm/i915: Introduce GEN7_FEATURES for device info
      drm/i915: Move num_pipes to intel info
      drm/i915: fixup pd vs pt confusion in gen6 ppgtt code
      style nit: Align function parameter continuation properly.
      drm/i915: VLV doesn't have HDMI on port C
      drm/i915: DSPFW and BLC regs are in the display offset range
      drm/i915: set conservative clock gating values on VLV v2
      drm/i915: fix WaDisablePSDDualDispatchEnable on VLV v2
      drm/i915: add more VLV IDs
      drm/i915: use VLV DIP routines on VLV v2
      drm/i915: add media well to VLV force wake routines v2
      drm/i915: don't use plane pipe select on VLV
      drm: modify pages_to_sg prime helper to create optimized SG table
      drm/i915: use for_each_sg_page for setting up the gtt ptes
      drm/i915: create compact dma scatter lists for gem objects
      drm/i915: handle walking compact dma scatter lists
      ...
    399403c7
intel_display.c 253 KB