The patch which causes conflict:
---
From 2e8ea2777af45fe651dbd14b8b8e000e94467c24 Mon Sep 17 00:00:00 2001
From: Weinan Li <weinan.z.li@xxxxxxxxx>
Date: Wed, 21 Mar 2018 15:40:32 +0800
Subject: [PATCH] Revert "drm/i915/gvt: set max priority for gvt context"
This reverts commit 11474e9091cf2002e948647fd9f63a7f027e488a.
There are issues which will block the host preemption before, instead of
disabling it use one workaround "setting max priority for gvt context"
to avoid the gvt context be preempted by the host. Now the issues have been
cleared, so revert this patch to enable host preemption.
v2:
- refine description(Zhenyu)
Signed-off-by: Weinan Li <weinan.z.li@xxxxxxxxx>
Signed-off-by: Zhenyu Wang <zhenyuw@xxxxxxxxxxxxxxx>
Signed-off-by: Zhi Wang <zhi.a.wang@xxxxxxxxx>
---
has a dependency with the following patch which is missing in git tag
drm-next-intel-2018-04-13:
---
commit b7268c5eed0ab4f052d614b4b0e3fe8a51c9d5a1
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Wed Apr 18 19:40:52 2018 +0100
drm/i915: Pack params to engine->schedule() into a struct
Today we only want to pass along the priority to
engine->schedule(), but
in the future we want to have much more control over the various
aspects
of the GPU during a context's execution, for example controlling the
frequency allowed. As we need an ever growing number of parameters for
scheduling, move those into a struct for convenience.
v2: Move the anonymous struct into its own function for legibility and
ye olde gcc.
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
Link:
https://patchwork.freedesktop.org/patch/msgid/20180418184052.7129-3-chris@xxxxxxxxxxxxxxxxxx
---
I found it in drm-tip. Looks I have to send another pull request when
the patch above is in a new drm-intel-next tag.
Thanks for everyone's efforts.
Thanks,
Zhi.
On 04/23/18 16:13, Zhi Wang 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,
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(-)
_______________________________________________
intel-gvt-dev mailing list
intel-gvt-dev@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
