• Dave Airlie's avatar
    Merge tag 'drm-intel-next-2014-03-21' of git://anongit.freedesktop.org/drm-intel into drm-next · 66e514c1
    Dave Airlie authored
    - Inherit/reuse firmwar framebuffers (for real this time) from Jesse, less
      flicker for fastbooting.
    - More flexible cloning for hdmi (Ville).
    - Some PPGTT fixes from Ben.
    - Ring init fixes from Naresh Kumar.
    - set_cache_level regression fixes for the vma conversion from Ville&Chris.
    - Conversion to the new dp aux helpers (Jani).
    - Unification of runtime pm with pc8 support from Paulo, prep work for runtime
      pm on other platforms than HSW.
    - Larger cursor sizes (Sagar Kamble).
    - Piles of improvements and fixes all over, as usual.
    
    * tag 'drm-intel-next-2014-03-21' of git://anongit.freedesktop.org/drm-intel: (75 commits)
      drm/i915: Include a note about the dangers of I915_READ64/I915_WRITE64
      drm/i915/sdvo: fix questionable return value check
      drm/i915: Fix unsafe loop iteration over vma whilst unbinding them
      drm/i915: Enabling 128x128 and 256x256 ARGB Cursor Support
      drm/i915: Print how many objects are shared in per-process stats
      drm/i915: Per-process stats work better when evaluated per-process
      drm/i915: remove rps local variables
      drm/i915: Remove extraneous MMIO for RPS
      drm/i915: Rename and comment all the RPS *stuff*
      drm/i915: Store the HW min frequency as min_freq
      drm/i915: Fix coding style for RPS
      drm/i915: Reorganize the overclock code
      drm/i915: init pm.suspended earlier
      drm/i915: update the PC8 and runtime PM documentation
      drm/i915: rename __hsw_do_{en, dis}able_pc8
      drm/i915: kill struct i915_package_c8
      drm/i915: move pc8.irqs_disabled to pm.irqs_disabled
      drm/i915: remove dev_priv->pc8.enabled
      drm/i915: don't get/put PC8 when getting/putting power wells
      drm/i915: make intel_aux_display_runtime_get get runtime PM, not PC8
      ...
    
    Conflicts:
    	drivers/gpu/drm/i915/intel_display.c
    	drivers/gpu/drm/i915/intel_dp.c
    66e514c1
intel_display.c 332 KB