Hi Linus, Dave sends his pull, everyone realizes they've been asleep at the wheel and hits send on their own pulls :-/ Normally I'd just ignore these all because w/e for me and Dave. But this time around the latecomers also included drm-intel-fixes, which failed to send out a -fixes pull thus far for this release (screwed up vacation coverage, despite that 2/3 maintainers were around ... they all look appropriately guilty), and that really is overdue to get landed. And since I had to do a pull request anyway I pulled the other two late ones too. Cheers, Daniel drm-fixes-2019-08-02-1: drm-fixes for 5.3-rc3, take 2 intel fixes (didn't have any ever since the main merge window pull): - gvt fixes (2 cc: stable) - fix gpu reset vs mm-shrinker vs wakeup fun (needed a few patches) - two gem locking fixes (one cc: stable) - pile of misc fixes all over with minor impact, 6 cc: stable, others from this window exynos: - misc minor fixes misc: - some build/Kconfig fixes - regression fix for vm scalability perf test which seems to mostly exercise dmesg/console logging ... - the vgem cache flush fix for arm64 broke the world on x86, so that's reverted again Cheers, Daniel The following changes since commit f8981e0309e9004c6e86d218049045700c79d740: Merge tag 'msm-fixes-2019_08_01' of https://gitlab.freedesktop.org/drm/msm into drm-fixes (2019-08-02 10:17:25 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2019-08-02-1 for you to fetch changes up to 9c8c9c7cdb4c8fb48a2bc70f41a07920f761d2cd: Merge tag 'exynos-drm-fixes-for-v5.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes (2019-08-02 17:10:17 +0200) ---------------------------------------------------------------- drm-fixes for 5.3-rc3, take 2 intel fixes (didn't have any ever since the main merge window pull): - gvt fixes (2 cc: stable) - fix gpu reset vs mm-shrinker vs wakeup fun (needed a few patches) - two gem locking fixes (one cc: stable) - pile of misc fixes all over with minor impact, 6 cc: stable, others from this window exynos: - misc minor fixes misc: - some build/Kconfig fixes - regression fix for vm scalability perf test which seems to mostly exercise dmesg/console logging ... - the vgem cache flush fix for arm64 broke the world on x86, so that's reverted again ---------------------------------------------------------------- Arnd Bergmann (1): drm/exynos: add CONFIG_MMU dependency Chris Wilson (9): 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 Revert "drm/vgem: fix cache synchronization on arm/arm64" Colin Ian King (2): drm/exynos: remove redundant assignment to pointer 'node' drm/exynos: fix missing decrement of retry counter Colin Xu (1): drm/i915/gvt: Adding ppgtt to GVT GEM context after shadow pdps settled. Daniel Vetter (3): Merge tag 'drm-intel-fixes-2019-08-02' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'drm-misc-fixes-2019-08-02' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'exynos-drm-fixes-for-v5.3-rc3' of git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes Dhinakaran Pandiyan (1): drm/i915/vbt: Fix VBT parsing for the PSR section Fuqian Huang (1): drm/exynos: using dev_get_drvdata directly 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 Maarten Lankhorst (1): Merge tag 'v5.3-rc2' into drm-misc-fixes Mika Kuoppala (1): drm/i915: Fix memleak in runtime wakeref tracking Rob Clark (1): drm/vgem: fix cache synchronization on arm/arm64 Thomas Gleixner (1): drm/i810: Use CONFIG_PREEMPTION Thomas Zimmermann (4): drm/client: Support unmapping of DRM client buffers drm/fb-helper: Map DRM client buffer only when required drm/fb-helper: Instanciate shadow FB if configured in device's mode_config drm/bochs: Use shadow buffer for bochs framebuffer console 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 YueHaibing (2): drm/bridge: lvds-encoder: Fix build error while CONFIG_DRM_KMS_HELPER=m drm/bridge: tc358764: Fix build error Zhenyu Wang (1): drm/i915/gvt: remove duplicate include of trace.h drivers/gpu/drm/Kconfig | 2 +- drivers/gpu/drm/bochs/bochs_kms.c | 1 + drivers/gpu/drm/bridge/Kconfig | 4 +- drivers/gpu/drm/drm_client.c | 60 +++++++++++++---- drivers/gpu/drm/drm_fb_helper.c | 51 +++++++++++---- drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_gsc.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_scaler.c | 4 +- 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 +++++ include/drm/drm_client.h | 2 + include/drm/drm_mode_config.h | 7 ++ 48 files changed, 526 insertions(+), 256 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
