[PULL] drm-intel-fixes

Daniel Vetter
2013-07-16T13:03:08Z

Hi Dave,

[resend, somehow this was lost somewhere. At least I couldn't find it in
the list archives.]

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.

Otherwise pretty calm thus far.

Cheers, Daniel

The following changes since commit 446f8d81ca2d9cefb614e87f2fabcc996a9e4e7e:

drm/i915: Don't try to tear down the stolen drm_mm if it's not there (2013-07-02 11:47:19 +0200)

are available in the git repository at:

git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-fixes-2013-07-11

for you to fetch changes up to 46a0b638f35b45fc13d3dc0deb6a7e17988170b2:

Revert "drm/i915: Workaround incoherence between fences and LLC across multiple CPUs" (2013-07-10 15:31:12 +0200)

----------------------------------------------------------------
Chris Wilson (3):
drm/i915: Fix write-read race with multiple rings
drm/i915: Fix incoherence with fence updates on Sandybridge+
Revert "drm/i915: Workaround incoherence between fences and LLC across multiple CPUs"

Daniel Vetter (2):
drm/i915: reinit status page registers after gpu reset
drm/i915: fix up ring cleanup for the i830/i845 CS tlb w/a

Guenter Roeck (1):
Partially revert "drm/i915: unconditionally use mt forcewake on hsw/ivb"

Imre Deak (1):
drm/i915: fix lane bandwidth capping for DP 1.2 sinks

Paulo Zanoni (1):
drm/i915: switch disable_power_well default value to 1

Xiong Zhang (1):
drm/i915: Correct obj->mm_list link to dev_priv->dev_priv->mm.inactive_list

drivers/gpu/drm/i915/i915_drv.c | 4 +-
drivers/gpu/drm/i915/i915_gem.c | 83 +++++++++++++--------------------
drivers/gpu/drm/i915/intel_dp.c | 5 ++
drivers/gpu/drm/i915/intel_pm.c | 31 +++++++++++-
drivers/gpu/drm/i915/intel_ringbuffer.c | 38 +++++++++------
5 files changed, 93 insertions(+), 68 deletions(-)
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch