Hi Dave and Daniel - First off, we failed to explicitly agree who's going to cover me handling the v5.3 fixes during my time off. So it ended up not happening, and I was faced with quite the backlog. On top of that, testing uncovered lockdep issues that needed to be addressed before sending the pull. /o\ Thus I'm late with the pull, but latest testing gives me confidence the commits Chris backported yesterday resolved the issues. I apologize for not having fixes for a couple of weeks, and then showing up late with a bunch of them. I saw Dave make the fixes pull to Linus for -rc3 already, but I must humbly ask you to accommodate an extra fixes pull. There's a bunch of stuff that addresses ICL issues in v5.2 waiting to get merged to Linus' tree to be backported to stable. BR, Jani. drm-intel-fixes-2019-08-02: drm/i915 fixes for v5.3-rc3: - GVT fixes - Fix TBT aux powerwell - Fix PSR2 training pattern duration - Fix memory leak in runtime wakeref tracking - Fix ICL memory bandwidth issue preventing planes from being enabled - Fix OA mux configuration delays for accurate performance data - Fix VLV/CHV DP audio cdclk frequency requirements - Fix register whitelisting to fix a number of GL & Vulkan CTS tests - Fix ICL perf register offsets - Fix Gen11 Sampler Prefetch workaround, impacting dEQP tests - Fix various gen2 tracepoints - A number of GEM locking fixes addressing lockdep issues - Fix idle engine reset, recover only active engines - Fix incorrect MCR programming BR, Jani. The following changes since commit 609488bc979f99f805f34e9a32c1e3b71179d10b: Linux 5.3-rc2 (2019-07-28 12:47:02 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2019-08-02 for you to fetch changes up to 4b9bb9728c915c6079619e71e3340fe4840d9d40: drm/i915: Only recover active engines (2019-08-01 13:22:00 +0300) ---------------------------------------------------------------- drm/i915 fixes for v5.3-rc3: - GVT fixes - Fix TBT aux powerwell - Fix PSR2 training pattern duration - Fix memory leak in runtime wakeref tracking - Fix ICL memory bandwidth issue preventing planes from being enabled - Fix OA mux configuration delays for accurate performance data - Fix VLV/CHV DP audio cdclk frequency requirements - Fix register whitelisting to fix a number of GL & Vulkan CTS tests - Fix ICL perf register offsets - Fix Gen11 Sampler Prefetch workaround, impacting dEQP tests - Fix various gen2 tracepoints - A number of GEM locking fixes addressing lockdep issues - Fix idle engine reset, recover only active engines - Fix incorrect MCR programming ---------------------------------------------------------------- Chris Wilson (8): drm/i915: Keep rings pinned while the context is active drm/i915/gtt: Defer the free for alloc error paths drm/i915/gtt: Mark the freed page table entries with scratch drm/i915/userptr: Acquire the page lock around set_page_dirty() drm/i915: Lock the engine while dumping the active request drm/i915: Lift intel_engines_resume() to callers drm/i915: Add a wakeref getter for iff the wakeref is already active drm/i915: Only recover active engines Colin Xu (1): drm/i915/gvt: Adding ppgtt to GVT GEM context after shadow pdps settled. Dhinakaran Pandiyan (1): drm/i915/vbt: Fix VBT parsing for the PSR section Imre Deak (1): drm/i915: Fix the TBT AUX power well enabling Jani Nikula (1): Merge tag 'gvt-fixes-2019-07-30' of https://github.com/intel/gvt-linux into drm-intel-fixes Kenneth Graunke (1): drm/i915: Disable SAMPLER_STATE prefetching on all Gen11 steppings. Lionel Landwerlin (6): drm/i915/perf: fix ICL perf register offsets drm/i915: fix whitelist selftests with readonly registers drm/i915: whitelist PS_(DEPTH|INVOCATION)_COUNT drm/i915/icl: whitelist PS_(DEPTH|INVOCATION)_COUNT drm/i915/perf: ensure we keep a reference on the driver drm/i915/perf: add missing delay for OA muxes configuration Mika Kuoppala (1): drm/i915: Fix memleak in runtime wakeref tracking Tvrtko Ursulin (1): drm/i915: Fix GEN8_MCR_SELECTOR programming Ville Syrjälä (3): drm/i915: Fix various tracepoints for gen2 drm/i915: Deal with machines that expose less than three QGV points drm/i915: Make sure cdclk is high enough for DP audio on VLV/CHV Xiaolin Zhang (2): drm/i915/gvt: fix incorrect cache entry for guest page mapping drm/i915/gvt: grab runtime pm first for forcewake use Xiong Zhang (3): drm/i915/gvt: Warning for invalid ggtt access drm/i915/gvt: Don't use ggtt_validdate_range() with size=0 drm/i915/gvt: Checking workload's gma earlier Zhenyu Wang (1): drm/i915/gvt: remove duplicate include of trace.h drivers/gpu/drm/i915/display/intel_bios.c | 2 +- drivers/gpu/drm/i915/display/intel_bw.c | 15 +++-- drivers/gpu/drm/i915/display/intel_cdclk.c | 11 ++++ drivers/gpu/drm/i915/display/intel_display.c | 4 +- drivers/gpu/drm/i915/display/intel_display_power.c | 11 +++- drivers/gpu/drm/i915/display/intel_vbt_defs.h | 6 +- drivers/gpu/drm/i915/gem/i915_gem_pm.c | 7 +- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 10 ++- drivers/gpu/drm/i915/gt/intel_context.c | 27 +++++--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 20 +++--- drivers/gpu/drm/i915/gt/intel_engine_pm.c | 24 ------- drivers/gpu/drm/i915/gt/intel_engine_pm.h | 12 +++- drivers/gpu/drm/i915/gt/intel_engine_types.h | 12 ++++ drivers/gpu/drm/i915/gt/intel_gt_pm.c | 21 +++++- drivers/gpu/drm/i915/gt/intel_gt_pm.h | 2 +- drivers/gpu/drm/i915/gt/intel_lrc.c | 10 +-- drivers/gpu/drm/i915/gt/intel_reset.c | 58 ++++++++++++----- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 31 +++++---- drivers/gpu/drm/i915/gt/intel_workarounds.c | 38 ++++++++++- drivers/gpu/drm/i915/gt/mock_engine.c | 1 + drivers/gpu/drm/i915/gt/selftest_reset.c | 5 +- drivers/gpu/drm/i915/gt/selftest_workarounds.c | 7 +- drivers/gpu/drm/i915/gvt/cmd_parser.c | 10 --- drivers/gpu/drm/i915/gvt/fb_decoder.c | 6 +- drivers/gpu/drm/i915/gvt/gtt.c | 9 +++ drivers/gpu/drm/i915/gvt/kvmgt.c | 12 ++++ drivers/gpu/drm/i915/gvt/scheduler.c | 59 ++++++++++++----- drivers/gpu/drm/i915/gvt/trace_points.c | 2 - drivers/gpu/drm/i915/i915_drv.h | 5 +- drivers/gpu/drm/i915/i915_gem.c | 25 ++++--- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++- drivers/gpu/drm/i915/i915_gpu_error.c | 6 +- drivers/gpu/drm/i915/i915_perf.c | 67 ++++++++++++------- drivers/gpu/drm/i915/i915_trace.h | 76 ++++++++++------------ drivers/gpu/drm/i915/intel_runtime_pm.c | 10 ++- drivers/gpu/drm/i915/intel_wakeref.h | 15 +++++ 36 files changed, 417 insertions(+), 227 deletions(-) -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel