• Dave Airlie's avatar
    Merge tag 'drm-intel-fixes-2013-07-11' of git://people.freedesktop.org/~danvet/drm-intel · 6bd2cab2
    Dave Airlie authored
    One feature latecomer, I've forgotten to merge the patch to reeanble the
    Haswell power well feature now that the audio interaction is fixed up.
    Since that was the only unfixed issue with it I've figured I could throw
    it in a bit late, and it's trivial to revert in case I'm wrong.
    
    Otherwise all bug/regression fixes:
    - Fix status page reinit after gpu hangs, spotted by more paranoid igt
      checks.
    - Fix object list walking fumble regression in the shrinker (only the
      counting part, the actual shrinking code was correct so no Oops
      potential), from Xiong Zhang.
    - Fix DP 1.2 bw limits (Imre).
    - Restore legacy forcewake on ivb, too many broken biosen out there. We
      dump a warn though that recent userspace might fall over with that
      config (Guenter Roeck).
    - Patch up the gen2 cs tlb w/a.
    - Improve the fence coherency w/a now that we have a better understanding
      what's going on. The removed wbinvd+ipi should make -rt folks happy. Big
      thanks to Jon Bloomfield for figuring this out, patches from Chris.
    - Fix write-read race when switching ring (Chris). Spotted with code
      inspection, but now we also have an igt for it.
    
    There's an ugly regression we're still working on introduced between
    3.10-rc7 and 3.10.0. Unfortunately we can't just revert the offender since
    that one fixes another regression :( I've asked Steven to include my
    -fixes branch into linux-next to prevent such fallout in the future,
    hopefully.
    
    * tag 'drm-intel-fixes-2013-07-11' of git://people.freedesktop.org/~danvet/drm-intel:
      Revert "drm/i915: Workaround incoherence between fences and LLC across multiple CPUs"
      drm/i915: Fix incoherence with fence updates on Sandybridge+
      drm/i915: Fix write-read race with multiple rings
      Partially revert "drm/i915: unconditionally use mt forcewake on hsw/ivb"
      drm/i915: fix lane bandwidth capping for DP 1.2 sinks
      drm/i915: fix up ring cleanup for the i830/i845 CS tlb w/a
      drm/i915: Correct obj->mm_list link to dev_priv->dev_priv->mm.inactive_list
      drm/i915: switch disable_power_well default value to 1
      drm/i915: reinit status page registers after gpu reset
    6bd2cab2
i915_gem.c 115 KB