• Dave Airlie's avatar
    Merge tag 'drm-intel-next-2013-11-29' of... · da32cc90
    Dave Airlie authored
    Merge tag 'drm-intel-next-2013-11-29' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
    
    - some more ppgtt prep patches from Ben
    - a few fbc fixes from Ville
    - power well rework from Imre
    - vlv forcewake improvements from Deepak S, Ville and Jesse
    - a few smaller things all over
    
    [airlied: fixup forwcewake conflict]
    * tag 'drm-intel-next-2013-11-29' of git://people.freedesktop.org/~danvet/drm-intel: (97 commits)
      drm/i915: Fix port name in vlv_wait_port_ready() timeout warning
      drm/i915: Return a drm_mode_status enum in the mode_valid vfuncs
      drm/i915: add intel_display_power_enabled_sw() for use in atomic ctx
      drm/i915: drop DRM_ERROR in intel_fbdev init
      drm/i915/vlv: use parallel context restore when coming out of RC6
      drm/i915/vlv: use a lower RC6 timeout on VLV
      drm/i915/sdvo: Fix up debug output to not split lines
      drm/i915: make sparse happy for the new vlv mmio read function
      drm/i915: drop the right force-wake engine in the vlv mmio funcs
      drm/i915: Fix GT wake FIFO free entries for VLV
      drm/i915: Report all GTFIFODBG errors
      drm/i915: Enabling DebugFS for valleyview forcewake counts
      drm/i915/vlv: Valleyview support for forcewake Individual power wells.
      drm/i915: Add power well arguments to force wake routines.
      drm/i915: Do not attempt to re-enable an unconnected primary plane
      drm/i915: add a debugfs entry for power domain info
      drm/i915: add a default always-on power well
      drm/i915: don't do BDW/HSW specific powerdomains init on other platforms
      drm/i915: protect HSW power well check with IS_HASWELL in redisable_vga
      drm/i915: use IS_HASWELL/BROADWELL instead of HAS_POWER_WELL
      ...
    
    Conflicts:
    	drivers/gpu/drm/i915/intel_display.c
    da32cc90
intel_opregion.c 26.5 KB