• Dave Airlie's avatar
    Merge tag 'drm-intel-next-2013-06-18' of... · 28419261
    Dave Airlie authored
    Merge tag 'drm-intel-next-2013-06-18' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
    
    Last 3.11 feature pull. I have a few odds bits and pieces and fixes in my
    queue, I'll sort them out later on to see what's for 3.11-fixes and what's
    for 3.12. But nothing to hold this here up imo.
    
    Highlights:
    - more hangcheck work from Mika and Chris to prepare for arb robustness
    - trickle feed fixes from Ville
    - first parts of the shared pch pll rework, with some basic hw state
      readout and cross-checking (this shuts up the confused pch pll refcount
      WARN that Linus just recently forwarded)
    - Haswell audio power well support from Wang Xingchao (alsa bits acked by
      Takashi)
    - some cleanups and asserts sprinkling around the plane/gamma enabling
      sequence from Ville
    - more gtt refactoring from Ben
    - clear up the adjusted->mode vs. pixel clock vs. port clock confusion
    - 30bpp support, this time for real hopefully
    
    * tag 'drm-intel-next-2013-06-18' of git://people.freedesktop.org/~danvet/drm-intel: (97 commits)
      drm/i915: remove a superflous semi-colon
      drm/i915: Kill useless "Enable panel fitter" comments
      drm/i915: Remove extra "ring" from error message
      drm/i915: simplify the reduced clock handling for pch plls
      drm/i915: stop killing pfit on i9xx
      drm/i915: explicitly set up PIPECONF (and gamma table) on haswell
      drm/i915: set up PIPECONF explicitly for i9xx/vlv platforms
      drm/i915: set up PIPECONF explicitly on ilk-ivb
      drm/i915: find guilty batch buffer on ring resets
      drm/i915: store ring hangcheck action
      drm/i915: add batch bo to i915_add_request()
      drm/i915: change i915_add_request to macro
      drm/i915: add i915_gem_context_get_hang_stats()
      drm/i915: add struct i915_ctx_hang_stats
      drm/i915: Try harder to disable trickle feed on VLV
      drm/i915: fix up pch pll enabling for pixel multipliers
      drm/i915: hw state readout and cross-checking for shared dplls
      drm/i915: WARN on lack of shared dpll
      drm/i915: split up intel_modeset_check_state
      drm/i915: extract readout_hw_state from setup_hw_state
      ...
    
    Conflicts:
    	drivers/gpu/drm/i915/intel_display.c
    	drivers/gpu/drm/i915/intel_fb.c
    	drivers/gpu/drm/i915/intel_sdvo.c
    28419261
intel_display.c 274 KB