On Tue, Aug 07, 2012 at 02:08:18PM +0200, Daniel Vetter wrote:
Hi Dave,
- Regression fixer for an OOPS at boot when i915.ko is built-in and CONFIG_PM=n, introduce in 3.5 (patch from Hunt Xu)
- Regression fixer for occlusion query failures, the required w/a wasn't applied in all cases (thanks to Eric for tracking this on down).
- dmar vs. dma_buf imprt fix (Dave Airlie)
- 2 patches to fight down forcewake issues on snb. This is the stuff I've talked about 2 weeks ago already, it's a minefield. Investigation still going on, but afaict this is the best we have for now.
- a few minor things to keep coverty&compiler happy (Alan, Davendra, Stéphane)
- tons of hsw pci ids - this one is a bit late because internal approval sometimes takes a while, but ppl in charge finally agreed that world+dog already knows about ult and crw haswell variants ;-)
As discussed on irc, one more fix: - fix ring init sequence (only reported by QA afaict).
Yours, Daniel
The following changes since commit e8aeaee7b012f1cdb382765d17307445385aa87c:
drm/i915: unbreak lastclose for failed driver init (2012-07-25 10:40:00 +0200)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel drm-intel-fixes
for you to fetch changes up to 0d8957c8a90bbb5d34fab9a304459448a5131e06:
drm/i915: correctly order the ring init sequence (2012-08-08 10:23:35 +0200)
---------------------------------------------------------------- Alan Cox (3): vlv: it might be wise if we initialised the flag value... i915: fix error path leak in intel_sdvo_write_cmd i915: Remove silly test
Chris Wilson (1): drm/i915: Workaround hang with BSD and forcewake on SandyBridge
Daniel Vetter (2): drm/i915: fix forcewake related hangs on snb drm/i915: correctly order the ring init sequence
Dave Airlie (1): i915: don't map imported dma-bufs for dmar.
Devendra Naga (1): drm/i915: remove unused variable
Eric Anholt (1): drm/i915: Don't forget to apply SNB PIPE_CONTROL GTT workaround.
Hunt Xu (1): drm/i915: make rc6 in sysfs functions conditional
Paulo Zanoni (1): drm/i915: add more Haswell PCI IDs
Stéphane Marchesin (1): drm/i915: Make intel_panel_get_backlight static.
drivers/char/agp/intel-agp.h | 39 +++++++++++++++--- drivers/char/agp/intel-gtt.c | 60 +++++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_drv.c | 31 +++++++++++++- drivers/gpu/drm/i915/i915_gem_context.c | 1 - drivers/gpu/drm/i915/i915_gem_execbuffer.c | 20 +++++----- drivers/gpu/drm/i915/i915_gem_gtt.c | 3 +- drivers/gpu/drm/i915/i915_sysfs.c | 12 ++++++ drivers/gpu/drm/i915/intel_display.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 20 +++++----- drivers/gpu/drm/i915/intel_i2c.c | 3 -- drivers/gpu/drm/i915/intel_panel.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 6 ++- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++- drivers/gpu/drm/i915/intel_sdvo.c | 5 ++- 14 files changed, 172 insertions(+), 38 deletions(-)