Blergh, forgotten to cc: mailing lists ... -Daniel
On Fri, Sep 6, 2013 at 9:48 AM, Daniel Vetter daniel@ffwll.ch wrote:
Hi Dave,
Already a decent pile of fixes and a few stragglers for the merge window. Nothing in here though to appease Linus :(
- Early stolen mem reservation from Jesse in x86 boot code. Acked by Ingo and hpa. This was ready much earlier but somehow I've thought it'd go in through x86 trees, hence why this is late. Avoids the pci resource code to plant mmiobars in the middle of stolen mem and other ugliness.
- vgaarb improvements from Alex Williamson plus the fix from Ville for the vgacon->fbcon smooth transition "feature".
- Render pageflips on ivb/hsw to avoid stalls due to the ring switching when only flipping on the blitter (Chris).
- Deadlock fixes around our flush_workqueue which crept back in - lockdep isn't clever enough :(
- Shrinker recursion fix from Chris - this is the thing that blew the vma patches from Ben I've taken out of 3.12.
- Fixup for the relocation refactoring. Also an igt testcase to make sure we don't break this again.
- Pile of smaller fixups all over, shortlog has full details.
Cheers, Daniel
The following changes since commit f33bcab9e816c5bf56b74c3007790f2a256910eb:
drm/radeon: support render nodes (2013-09-02 10:51:53 +1000)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-fixes-2013-09-06
for you to fetch changes up to cac6a5ae0118832936eb162ec4cedb30f2422bcc:
drm/i915: try not to lose backlight CBLV precision (2013-09-06 09:41:20 +0200)
Alex Williamson (3): vgaarb: Don't disable resources that are not owned vgaarb: Fix VGA decodes changes i915: Update VGA arbiter support for newer devices
Chris Wilson (9): drm/i915: Adjust available RPS information through sysfs for vlv drm/i915: Apply the force-detect VGA w/a to Valleyview drm/i915: Report requested frequency alongside current frequency in debugfs drm/i915: Embed the ring->private within the struct intel_ring_buffer drm/i915: Use RCS flips on Ivybridge+ drm/i915: Pin pages whilst mapping the dma-buf drm/i915: Hold an object reference whilst we shrink it drm/i915: Skip stolen region initialisation if none is reserved drm/i915: Confine page flips to BCS on Valleyview
Damien Lespiau (1): drm/i915: Don't call sg_free_table() if sg_alloc_table() fails
Daniel Vetter (6): drm/i915: tune down hangcheck noise drm/i915: fix up the relocate_entry refactoring drm/i915: fix hpd work vs. flush_work in the pageflip code deadlock drm/i915: handle sdvo input pixel multiplier correctly again drm/i915: fix i9xx_crtc_clock_get for multiplied pixels drm/i915: fix gpu hang vs. flip stall deadlocks
Imre Deak (1): drm/i915: fix lvds/dp panel fitter setting
Jani Nikula (1): drm/i915: try not to lose backlight CBLV precision
Jesse Barnes (2): drm/i915: split PCI IDs out into i915_drm.h v4 x86: add early quirk for reserving Intel graphics stolen memory v5
Joe Perches (1): i915_gem: Convert kmem_cache_alloc(...GFP_ZERO) to kmem_cache_zalloc
Mika Kuoppala (2): drm/i915: Don't mask EI UP interrupt on IVB|SNB drm/i915: sanitize forcewake registers on reset
Paulo Zanoni (1): drm/i915: enable trickle feed on Haswell
Ville Syrjälä (1): drm/i915: Fix pipe config warnings when dealing with LVDS fixed mode
arch/x86/kernel/early-quirks.c | 154 +++++++++++++++++++++ drivers/gpu/drm/i915/i915_debugfs.c | 11 +- drivers/gpu/drm/i915/i915_dma.c | 9 +- drivers/gpu/drm/i915/i915_drv.c | 164 +++++----------------- drivers/gpu/drm/i915/i915_drv.h | 7 + drivers/gpu/drm/i915/i915_gem.c | 48 +++++-- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 41 +++--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 + drivers/gpu/drm/i915/i915_gem_stolen.c | 3 + drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 23 +++- drivers/gpu/drm/i915/i915_reg.h | 34 +++-- drivers/gpu/drm/i915/i915_sysfs.c | 36 ++++- drivers/gpu/drm/i915/intel_crt.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 78 +++++++++-- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 8 +- drivers/gpu/drm/i915/intel_opregion.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 14 +- drivers/gpu/drm/i915/intel_pm.c | 14 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 99 ++++---------- drivers/gpu/drm/i915/intel_ringbuffer.h | 6 +- drivers/gpu/drm/i915/intel_sdvo.c | 17 +-- drivers/gpu/drm/i915/intel_sprite.c | 7 +- drivers/gpu/drm/i915/intel_uncore.c | 9 +- drivers/gpu/vga/vgaarb.c | 51 +++---- include/drm/i915_drm.h | 34 +++++ include/drm/i915_pciids.h | 211 +++++++++++++++++++++++++++++ include/linux/vgaarb.h | 7 + 29 files changed, 762 insertions(+), 334 deletions(-) create mode 100644 include/drm/i915_pciids.h
-- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch