On Mon, 23 Apr 2018, Zhi Wang <zhi.a.wang@xxxxxxxxx> wrote: > Hi Jani: > > I picked out the patch which causes conflicts and may put it back in the > next back merge from drm-intel-next to gvt-next. So there shouldn't be > any conflict in this pull. Thanks for your efforts. Thanks, pulled to drm-intel-next-queued. Just as a reminder, if you have more stuff for v4.18 the deadline is in about three weeks. BR, Jani. > > Thanks, > Zhi. > > On 04/23/18 16:11, Zhi Wang wrote: >> The following changes since commit >> fadec6eefe232696c5c471b40df33e6db616e854: >> >> drm/i915: Update DRIVER_DATE to 20180413 (2018-04-13 12:20:58 +0300) >> >> are available in the git repository at: >> >> https://github.com/intel/gvt-linux.git tags/gvt-next-2018-04-23 >> >> for you to fetch changes up to 3eda0d22ead04f81ea59c9584bcbf5b496745e92: >> >> drm/i915/gvt: Mark expected switch fall-through in >> handle_g2v_notification (2018-04-23 13:09:36 +0800) >> >> ---------------------------------------------------------------- >> - Minor condition check improvment (Gustavo A. R. Silva) >> - Non-priviliged batch buffer scan (Yan Zhao) >> - Scheduling optimizations (Zhipeng Gong) >> >> ---------------------------------------------------------------- >> Gustavo A. R. Silva (2): >> drm/i915/gvt/scheduler: Remove unnecessary NULL checks in sr_oa_regs >> drm/i915/gvt: Mark expected switch fall-through in >> handle_g2v_notification >> >> Zhao Yan (1): >> drm/i915/gvt: scan non-privileged batch buffer for debug purpose >> >> Zhipeng Gong (2): >> drm/i915/gvt: Use real time to do timer check >> drm/i915/gvt: Update time slice more frequently >> >> drivers/gpu/drm/i915/gvt/cmd_parser.c | 55 ++++++++++++++++++++------- >> drivers/gpu/drm/i915/gvt/debugfs.c | 67 >> +++++++++++++++++++++++++++++++++ >> drivers/gpu/drm/i915/gvt/gvt.h | 1 + >> drivers/gpu/drm/i915/gvt/handlers.c | 1 + >> drivers/gpu/drm/i915/gvt/sched_policy.c | 31 ++++++++------- >> drivers/gpu/drm/i915/gvt/scheduler.c | 66 >> +++++++++++++++++++++----------- >> drivers/gpu/drm/i915/gvt/scheduler.h | 1 + >> drivers/gpu/drm/i915/gvt/trace.h | 24 +++++++++--- >> 8 files changed, 193 insertions(+), 53 deletions(-) >> -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
