• Dave Airlie's avatar
    Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-next · 9fabd4ee
    Dave Airlie authored
    Daniel writes:
    Highlights of this -next round:
    - ivb fdi B/C fixes
    - hsw sprite/plane offset fixes from Damien
    - unified dp/hdmi encoder for hsw, finally external dp support on hsw
      (Paulo)
    - kill-agp and some other prep work in the gtt code from Ben
    - some fb handling fixes from Ville
    - massive pile of patches to align hsw VGA with the spec and make it
      actually work (Paulo)
    - pile of workarounds from Jesse, mostly for vlv, but also some other
      related platforms
    - start of a dev_priv reorg, that thing grew out of bounds and chaotic
    - small bits&pieces all over the place, down to better error handling for
      load-detect on gen2 (Chris, Jani, Mika, Zhenyu, ...)
    
    On top of the previous pile (just copypasta):
    - tons of hsw dp prep patches form Paulo
    - round scheduled work items and timers to nearest second (Chris)
    - some hw workarounds (Jesse&Damien)
    - vlv dp support and related fixups (Vijay et al.)
    - basic haswell dp support, not yet wired up for external ports (Paulo)
    - edp support (Paulo)
    - tons of refactorings to prepare for the above (Paulo)
    - panel rework, unifiying code between lvds and edp panels (Jani)
    - panel fitter scaling modes (Jani + Yuly Novikov)
    - panel power improvements, should now work without the BIOS setting it up
    - extracting some dp helpers from radeon/i915 and move them to
      drm_dp_helper.c
    - randome pile of workarounds (Damien, Ben, ...)
    - some cleanups for the register restore code for suspend/resume
    - secure batchbuffer support, should enable tear-free blits on gen6+
      Chris)
    - random smaller fixlets and cleanups.
    
    * 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel: (231 commits)
      drm/i915: Restore physical HWS_PGA after resume
      drm/i915: Report amount of usable graphics memory in MiB
      drm/i915/i2c: Track users of GMBUS force-bit
      drm/i915: Allocate the proper size for contexts.
      drm/i915: Update load-detect failure paths for modeset-rework
      drm/i915: Clear unused fields of mode for framebuffer creation
      drm/i915: Always calculate 8xx WM values based on a 32-bpp framebuffer
      drm/i915: Fix sparse warnings in from AGP kill code
      drm/i915: Missed lock change with rps lock
      drm/i915: Move the remaining gtt code
      drm/i915: flush system agent TLBs on SNB
      drm/i915: Kill off now unused gen6+ AGP code
      drm/i915: Calculate correct stolen size for GEN7+
      drm/i915: Stop using AGP layer for GEN6+
      drm/i915: drop the double-OP_STOREDW usage in blt_ring_flush
      drm/i915: don't rewrite the GTT on resume v4
      drm/i915: protect RPS/RC6 related accesses (including PCU) with a new mutex
      drm/i915: put ring frequency and turbo setup into a work queue v5
      drm/i915: don't block resume on fb console resume v2
      drm/i915: extract l3_parity substruct from dev_priv
      ...
    9fabd4ee
i915_drv.h 52.6 KB