[Intel-gfx] [PULL] gvt-next for 4.17

[Zhi Wang]

Weird. I try to apply the patches one by one on 
drm-intel-next-2018-04-13. I didn't get any conflicts... Let me dig more..

On 04/19/18 17:50, Zhi Wang wrote:
> Thanks, Let me discuss with Zhenyu about how to deal with this. It must 
> be the git rebase I've done which causes the commiter change without new 
> signoff-by.
> 
> Thanks,
> Zhi.
> 
> On 04/19/18 17:34, Jani Nikula wrote:
>> On Thu, 19 Apr 2018, Zhi Wang <zhi.a.wang at intel.com> wrote:
>>> Hi:
>>>
>>> Here is the pull request of gvt-next for 4.17 with some new features and
>>> optimizations.
>>>
>>> Thanks,
>>> Zhi.
>>>
>>> -- 
>>> 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-19
>>>
>>> for you to fetch changes up to c0fb4098fc47dcaeb47085c08d8fafa42fa8e471:
>>>
>>>     drm/i915/gvt: Mark expected switch fall-through in
>>> handle_g2v_notification (2018-04-19 16:35:55 +0800)
>>>
>>> ----------------------------------------------------------------
>>> - Minor condition check improvment (Gustavo A. R. Silva)
>>> - Reverting GVT context priority hack (Weinan Li)
>>> - 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
>>>
>>> Weinan Li (1):
>>>         Revert "drm/i915/gvt: set max priority for gvt context"
>>
>> This reverts a commit in v4.15. Why is it in a -next pull and not a
>> -fixes pull?
>>
>> It also conflicts, please advise how to resolve:
>>
>> diff --cc drivers/gpu/drm/i915/gvt/scheduler.c
>> index f3d21849b0cb,080fb5027d9c..000000000000
>> --- a/drivers/gpu/drm/i915/gvt/scheduler.c
>> +++ b/drivers/gpu/drm/i915/gvt/scheduler.c
>> @@@ -1134,9 -1156,6 +1156,12 @@@ int intel_vgpu_setup_submission(struct
>>          if (IS_ERR(s->shadow_ctx))
>>                  return PTR_ERR(s->shadow_ctx);
>> ++<<<<<<< HEAD
>>   +      if (HAS_LOGICAL_RING_PREEMPTION(vgpu->gvt->dev_priv))
>>   +              s->shadow_ctx->sched.priority = INT_MAX;
>>   +
>> ++=======
>> ++>>>>>>> c2f6410ef67740ebcbf5d92dffc2679d4a0e288c
>>          bitmap_zero(s->shadow_ctx_desc_updated, I915_NUM_ENGINES);
>>          s->workloads = kmem_cache_create_usercopy("gvt-g_vgpu_workload",
>>
>> Finally, it's committed by Zhi Wang <zhi.a.wang at intel.com> but without
>> his Signed-off-by.
>>
>>
>> BR,
>> Jani.
>>
>>
>>>
>>> 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    | 69
>>> +++++++++++++++++++++------------
>>>    drivers/gpu/drm/i915/gvt/scheduler.h    |  1 +
>>>    drivers/gpu/drm/i915/gvt/trace.h        | 24 +++++++++---
>>>    8 files changed, 193 insertions(+), 56 deletions(-)
>>
> _______________________________________________
> intel-gvt-dev mailing list
> intel-gvt-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev