Hi Dave - A big bunch of i915 fixes for drm-next / v4.9 merge window, with more than half of them also cc: stable. We also continue to have more Fixes: annotations for our fixes, which should help the backporters and archeologists. There's also a fix to your v4.8-rc8 backmerge to drm-next, which brought back a few unwanted lines. Seemed to be a tricky diff in the conflict. The fix is 105f1a65b04a ("drm/i915: Fix conflict resolution from backmerge of v4.8-rc8 to drm-next"). BR, Jani. The following changes since commit b89857852656f016328d2d7ccec5fff57445fa85: Merge branch 'drm-next-4.9' of git://people.freedesktop.org/~agd5f/linux into drm-next (2016-10-10 16:40:16 +1000) are available in the git repository at: git://anongit.freedesktop.org/drm-intel tags/drm-intel-next-fixes-2016-10-11 for you to fetch changes up to 105f1a65b04a8f4f7abec11b200b1fb54f3d4b46: drm/i915: Fix conflict resolution from backmerge of v4.8-rc8 to drm-next (2016-10-10 16:12:21 +0300) ---------------------------------------------------------------- Chris Wilson (11): drm/i915: Restore current RPS state after reset drm/i915: Only shrink the unbound objects during freeze drm/i915: Just clear the mmiodebug before a register access drm/i915: Unalias obj->phys_handle and obj->userptr drm/i915: Use correct index for backtracking HUNG semaphores drm/i915/execlists: Reinitialise context image after GPU hang drm/i915: Distinguish last emitted request from last submitted request drm/i915: Force relocations via cpu if we run out of idle aperture drm/i915: Reset the breadcrumbs IRQ more carefully drm/i915/guc: Unwind GuC workqueue reservation if request construction fails drm/i915: Fix conflict resolution from backmerge of v4.8-rc8 to drm-next Imre Deak (2): drm/i915: Unlock PPS registers after GPU reset drm/i915/bxt: Fix HDMI DPLL configuration Jani Nikula (1): drm/i915/backlight: setup and cache pwm alternate increment value Paulo Zanoni (9): drm/i915: don't forget to set intel_crtc->dspaddr_offset on SKL+ drm/i915: SAGV is not SKL-only, so rename a few things drm/i915: introduce intel_has_sagv() drm/i915/kbl: KBL also needs to run the SAGV code drm/i915/gen9: fix the WaWmMemoryReadLatency implementation drm/i915/gen9: minimum scanlines for Y tile is not always 4 drm/i915/gen9: fix plane_blocks_per_line on watermarks calculations drm/i915/gen9: fix the watermark res_blocks value drm/i915/gen9: only add the planes actually affected by ddb changes Shawn Lee (1): drm/i915/backlight: setup backlight pwm alternate increment on backlight enable Ville Syrjälä (3): drm/i915: Allow PCH DPLL sharing regardless of DPLL_SDVO_HIGH_SPEED drm/i915: Move long hpd handling into the hotplug work drm/i915: Allow DP to work w/o EDID drivers/gpu/drm/i915/i915_drv.c | 21 +-- drivers/gpu/drm/i915/i915_drv.h | 35 +++-- drivers/gpu/drm/i915/i915_gem.c | 27 +++- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +- drivers/gpu/drm/i915/i915_gem_request.c | 5 +- drivers/gpu/drm/i915/i915_guc_submission.c | 12 ++ drivers/gpu/drm/i915/i915_irq.c | 14 +- drivers/gpu/drm/i915/intel_breadcrumbs.c | 33 ++++- drivers/gpu/drm/i915/intel_display.c | 30 +++- drivers/gpu/drm/i915/intel_dp.c | 70 +++++---- drivers/gpu/drm/i915/intel_dpll_mgr.c | 21 ++- drivers/gpu/drm/i915/intel_drv.h | 7 +- drivers/gpu/drm/i915/intel_engine_cs.c | 15 -- drivers/gpu/drm/i915/intel_guc.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 122 +++++++++------- drivers/gpu/drm/i915/intel_panel.c | 32 ++++- drivers/gpu/drm/i915/intel_pm.c | 218 ++++++++++++++++++----------- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 3 +- drivers/gpu/drm/i915/intel_uncore.c | 7 +- 20 files changed, 432 insertions(+), 247 deletions(-) -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx