• Dave Airlie's avatar
    Merge tag 'drm-intel-next-2013-09-21-merged' of... · 4821ff14
    Dave Airlie authored
    Merge tag 'drm-intel-next-2013-09-21-merged' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
    
    drm-intel-next-2013-09-21:
    - clock state handling rework from Ville
    - l3 parity handling fixes for hsw from Ben
    - some more watermark improvements from Ville
    - ban badly behaved context from Mika
    - a few vlv improvements from Jesse
    - VGA power domain handling from Ville
    drm-intel-next-2013-09-06:
    - Basic mipi dsi support from Jani. Not yet converted over to drm_bridge
      since that was too fresh, but the porting is in progress already.
    - More vma patches from Ben, this time the code to convert the execbuffer
      code. Now that the shrinker recursion bug is tracked down we can move
      ahead here again. Yay!
    - Optimize hw context switching to not generate needless interrupts (Chris
      Wilson). Also some shuffling for the oustanding request allocation.
    - Opregion support for SWSCI, although not yet fully wired up (we need a
      bit of runtime D3 support for that apparently, due to Windows design
      deficiencies), from Jani Nikula.
    - A few smaller changes all over.
    
    [airlied: merge conflict fix in i9xx_set_pipeconf]
    
    * tag 'drm-intel-next-2013-09-21-merged' of git://people.freedesktop.org/~danvet/drm-intel: (119 commits)
      drm/i915: assume all GM45 Acer laptops use inverted backlight PWM
      drm/i915: cleanup a min_t() cast
      drm/i915: Pull intel_init_power_well() out of intel_modeset_init_hw()
      drm/i915: Add POWER_DOMAIN_VGA
      drm/i915: Refactor power well refcount inc/dec operations
      drm/i915: Add intel_display_power_{get, put} to request power for specific domains
      drm/i915: Change i915_request power well handling
      drm/i915: POSTING_READ IPS_CTL before waiting for the vblank
      drm/i915: don't disable ERR_INT on the IRQ handler
      drm/i915/vlv: disable rc6p and rc6pp residency reporting on BYT
      drm/i915/vlv: honor i915_enable_rc6 boot param on VLV
      drm/i915: s/HAS_L3_GPU_CACHE/HAS_L3_DPF
      drm/i915: Do remaps for all contexts
      drm/i915: Keep a list of all contexts
      drm/i915: Make l3 remapping use the ring
      drm/i915: Add second slice l3 remapping
      drm/i915: Fix HSW parity test
      drm/i915: dump crtc timings from the pipe config
      drm/i915: register backlight device also when backlight class is a module
      drm/i915: write D_COMP using the mailbox
      ...
    
    Conflicts:
    	drivers/gpu/drm/i915/intel_display.c
    4821ff14
i915_gpu_error.c 27.3 KB