* [PULL] gvt-next for 4.17
@ 2018-03-08 2:31 Zhenyu Wang
2018-03-08 13:20 ` Joonas Lahtinen
0 siblings, 1 reply; 10+ messages in thread
From: Zhenyu Wang @ 2018-03-08 2:31 UTC (permalink / raw)
To: Joonas Lahtinen, Vivi, Rodrigo, Jani Nikula
Cc: intel-gfx, intel-gvt-dev, Lv, Zhiyuan, Yuan, Hang
[-- Attachment #1.1: Type: text/plain, Size: 4339 bytes --]
Hi,
Here's gvt-next update for 4.17. Biggest update is for huge code
refactor of shadow ppgtt from Changbin which is the most obscured
part, and with KBL context save/restore improvement from Weinan,
with other fixes.
Thanks.
--
The following changes since commit 1f267a572b573b0b155022750cba93001f4367a8:
drm/i915: Update DRIVER_DATE to 20180305 (2018-03-05 11:56:15 +0200)
are available in the Git repository at:
https://github.com/intel/gvt-linux.git tags/gvt-next-2018-03-08
for you to fetch changes up to 991ecefbdd4b81719597d6c406df8d26ef5c1546:
drm/i915/gvt: Return error at the failure of finding page_track (2018-03-06 14:49:38 +0800)
----------------------------------------------------------------
gvt-next-2018-03-08
- big refactor for shadow ppgtt (Changbin)
- KBL context save/restore via LRI cmd (Weinan)
- misc smatch fixes (Zhenyu)
- Properly unmap dma for guest page (Changbin)
- other misc fixes (Xiong, etc.)
----------------------------------------------------------------
Changbin Du (18):
drm/i915/gvt: Rework shadow graphic memory management code
drm/i915/gvt: Refine the intel_vgpu_mm reference management
drm/i915/gvt: Refine ggtt and ppgtt root entry ops
drm/i915/gvt: Refine ggtt_set_shadow_entry
drm/i915/gvt: Add verbose gtt shadow logs
drm/i915/gvt: Rename ggtt related functions to be more specific
drm/i915/gvt: Factor out intel_vgpu_{get, put}_ppgtt_mm interface
drm/i915/gvt: Use standard pte bit definition
drm/i915/gvt: Refine pte shadowing process
drm/i915/gvt: Rework shadow page management code
drm/i915/gvt: Rename shadow_page to short name spt
drm/i915/gvt: Rename mpt api {set, unset}_wp_page to {enable, disable}_page_track
drm/i915/gvt: Don't extend page_track to mpt layer
drm/i915/gvt: Provide generic page_track infrastructure for write-protected page
drm/i915/gvt: Manage shadow pages with radix tree
drm/i915/gvt: Define PTE addr mask with GENMASK_ULL
drm/i915/gvt: Fix guest vGPU hang caused by very high dma setup overhead
drm/i915/kvmgt: Add kvmgt debugfs entry nr_cache_entries under vgpu
Weinan Li (3):
drm/i915/gvt: add define GEN9_MOCS_SIZE
drm/i915/gvt: add interface to check if context is inhibit
drm/i915/gvt: init mmio by lri command in vgpu inhibit context
Xiong Zhang (2):
drm/i915/gvt: Release gvt->lock at the failure of finding page track
drm/i915/gvt: Return error at the failure of finding page_track
Zhenyu Wang (7):
drm/i915/gvt: Fix one gvt_vgpu_error() use in dmabuf.c
drm/i915/gvt: remove gvt max port definition
drm/i915/gvt: Fix vGPU sched timeslice calculation warning
drm/i915/gvt: Fix check error of vgpu create failure message
drm/i915/gvt: Fix check error on fence mmio handler
drm/i915/gvt: Fix one indent error
drm/i915/gvt: Fix check error on hws_pga_write() fail message
drivers/gpu/drm/i915/gvt/Makefile | 2 +-
drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +-
drivers/gpu/drm/i915/gvt/gtt.c | 1457 ++++++++++++++-----------------
drivers/gpu/drm/i915/gvt/gtt.h | 189 ++--
drivers/gpu/drm/i915/gvt/gvt.c | 2 +-
drivers/gpu/drm/i915/gvt/gvt.h | 21 +-
drivers/gpu/drm/i915/gvt/handlers.c | 38 +-
drivers/gpu/drm/i915/gvt/hypercall.h | 9 +-
drivers/gpu/drm/i915/gvt/kvmgt.c | 313 ++++---
drivers/gpu/drm/i915/gvt/mmio.c | 9 +-
drivers/gpu/drm/i915/gvt/mmio_context.c | 210 ++++-
drivers/gpu/drm/i915/gvt/mmio_context.h | 5 +
drivers/gpu/drm/i915/gvt/mpt.h | 67 +-
drivers/gpu/drm/i915/gvt/page_track.c | 184 ++++
drivers/gpu/drm/i915/gvt/page_track.h | 56 ++
drivers/gpu/drm/i915/gvt/sched_policy.c | 5 +-
drivers/gpu/drm/i915/gvt/scheduler.c | 44 +-
drivers/gpu/drm/i915/gvt/trace.h | 10 +-
drivers/gpu/drm/i915/gvt/vgpu.c | 1 +
19 files changed, 1468 insertions(+), 1156 deletions(-)
create mode 100644 drivers/gpu/drm/i915/gvt/page_track.c
create mode 100644 drivers/gpu/drm/i915/gvt/page_track.h
--
Open Source Technology Center, Intel ltd.
$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PULL] gvt-next for 4.17
2018-03-08 2:31 [PULL] gvt-next for 4.17 Zhenyu Wang
@ 2018-03-08 13:20 ` Joonas Lahtinen
2018-03-09 10:30 ` Jani Nikula
0 siblings, 1 reply; 10+ messages in thread
From: Joonas Lahtinen @ 2018-03-08 13:20 UTC (permalink / raw)
To: Vivi, Rodrigo, Jani Nikula, Zhenyu Wang
Cc: intel-gfx, intel-gvt-dev, Lv, Zhiyuan, Yuan, Hang
Pulled.
Regards, Joonas
Quoting Zhenyu Wang (2018-03-08 04:31:52)
>
> Hi,
>
> Here's gvt-next update for 4.17. Biggest update is for huge code
> refactor of shadow ppgtt from Changbin which is the most obscured
> part, and with KBL context save/restore improvement from Weinan,
> with other fixes.
>
> Thanks.
> --
> The following changes since commit 1f267a572b573b0b155022750cba93001f4367a8:
>
> drm/i915: Update DRIVER_DATE to 20180305 (2018-03-05 11:56:15 +0200)
>
> are available in the Git repository at:
>
> https://github.com/intel/gvt-linux.git tags/gvt-next-2018-03-08
>
> for you to fetch changes up to 991ecefbdd4b81719597d6c406df8d26ef5c1546:
>
> drm/i915/gvt: Return error at the failure of finding page_track (2018-03-06 14:49:38 +0800)
>
> ----------------------------------------------------------------
> gvt-next-2018-03-08
>
> - big refactor for shadow ppgtt (Changbin)
> - KBL context save/restore via LRI cmd (Weinan)
> - misc smatch fixes (Zhenyu)
> - Properly unmap dma for guest page (Changbin)
> - other misc fixes (Xiong, etc.)
>
> ----------------------------------------------------------------
> Changbin Du (18):
> drm/i915/gvt: Rework shadow graphic memory management code
> drm/i915/gvt: Refine the intel_vgpu_mm reference management
> drm/i915/gvt: Refine ggtt and ppgtt root entry ops
> drm/i915/gvt: Refine ggtt_set_shadow_entry
> drm/i915/gvt: Add verbose gtt shadow logs
> drm/i915/gvt: Rename ggtt related functions to be more specific
> drm/i915/gvt: Factor out intel_vgpu_{get, put}_ppgtt_mm interface
> drm/i915/gvt: Use standard pte bit definition
> drm/i915/gvt: Refine pte shadowing process
> drm/i915/gvt: Rework shadow page management code
> drm/i915/gvt: Rename shadow_page to short name spt
> drm/i915/gvt: Rename mpt api {set, unset}_wp_page to {enable, disable}_page_track
> drm/i915/gvt: Don't extend page_track to mpt layer
> drm/i915/gvt: Provide generic page_track infrastructure for write-protected page
> drm/i915/gvt: Manage shadow pages with radix tree
> drm/i915/gvt: Define PTE addr mask with GENMASK_ULL
> drm/i915/gvt: Fix guest vGPU hang caused by very high dma setup overhead
> drm/i915/kvmgt: Add kvmgt debugfs entry nr_cache_entries under vgpu
>
> Weinan Li (3):
> drm/i915/gvt: add define GEN9_MOCS_SIZE
> drm/i915/gvt: add interface to check if context is inhibit
> drm/i915/gvt: init mmio by lri command in vgpu inhibit context
>
> Xiong Zhang (2):
> drm/i915/gvt: Release gvt->lock at the failure of finding page track
> drm/i915/gvt: Return error at the failure of finding page_track
>
> Zhenyu Wang (7):
> drm/i915/gvt: Fix one gvt_vgpu_error() use in dmabuf.c
> drm/i915/gvt: remove gvt max port definition
> drm/i915/gvt: Fix vGPU sched timeslice calculation warning
> drm/i915/gvt: Fix check error of vgpu create failure message
> drm/i915/gvt: Fix check error on fence mmio handler
> drm/i915/gvt: Fix one indent error
> drm/i915/gvt: Fix check error on hws_pga_write() fail message
>
> drivers/gpu/drm/i915/gvt/Makefile | 2 +-
> drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +-
> drivers/gpu/drm/i915/gvt/gtt.c | 1457 ++++++++++++++-----------------
> drivers/gpu/drm/i915/gvt/gtt.h | 189 ++--
> drivers/gpu/drm/i915/gvt/gvt.c | 2 +-
> drivers/gpu/drm/i915/gvt/gvt.h | 21 +-
> drivers/gpu/drm/i915/gvt/handlers.c | 38 +-
> drivers/gpu/drm/i915/gvt/hypercall.h | 9 +-
> drivers/gpu/drm/i915/gvt/kvmgt.c | 313 ++++---
> drivers/gpu/drm/i915/gvt/mmio.c | 9 +-
> drivers/gpu/drm/i915/gvt/mmio_context.c | 210 ++++-
> drivers/gpu/drm/i915/gvt/mmio_context.h | 5 +
> drivers/gpu/drm/i915/gvt/mpt.h | 67 +-
> drivers/gpu/drm/i915/gvt/page_track.c | 184 ++++
> drivers/gpu/drm/i915/gvt/page_track.h | 56 ++
> drivers/gpu/drm/i915/gvt/sched_policy.c | 5 +-
> drivers/gpu/drm/i915/gvt/scheduler.c | 44 +-
> drivers/gpu/drm/i915/gvt/trace.h | 10 +-
> drivers/gpu/drm/i915/gvt/vgpu.c | 1 +
> 19 files changed, 1468 insertions(+), 1156 deletions(-)
> create mode 100644 drivers/gpu/drm/i915/gvt/page_track.c
> create mode 100644 drivers/gpu/drm/i915/gvt/page_track.h
>
>
> --
> Open Source Technology Center, Intel ltd.
>
> $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PULL] gvt-next for 4.17
2018-03-08 13:20 ` Joonas Lahtinen
@ 2018-03-09 10:30 ` Jani Nikula
2018-03-12 11:25 ` Joonas Lahtinen
0 siblings, 1 reply; 10+ messages in thread
From: Jani Nikula @ 2018-03-09 10:30 UTC (permalink / raw)
To: Joonas Lahtinen, Vivi, Rodrigo, Zhenyu Wang
Cc: intel-gfx, intel-gvt-dev, Lv, Zhiyuan, Yuan, Hang
Joonas, so did this miss the deadline for v4.17? You're not making
another pull request?
BR,
Jani.
On Thu, 08 Mar 2018, Joonas Lahtinen <joonas.lahtinen@linux.intel.com> wrote:
> Pulled.
>
> Regards, Joonas
>
> Quoting Zhenyu Wang (2018-03-08 04:31:52)
>>
>> Hi,
>>
>> Here's gvt-next update for 4.17. Biggest update is for huge code
>> refactor of shadow ppgtt from Changbin which is the most obscured
>> part, and with KBL context save/restore improvement from Weinan,
>> with other fixes.
>>
>> Thanks.
>> --
>> The following changes since commit 1f267a572b573b0b155022750cba93001f4367a8:
>>
>> drm/i915: Update DRIVER_DATE to 20180305 (2018-03-05 11:56:15 +0200)
>>
>> are available in the Git repository at:
>>
>> https://github.com/intel/gvt-linux.git tags/gvt-next-2018-03-08
>>
>> for you to fetch changes up to 991ecefbdd4b81719597d6c406df8d26ef5c1546:
>>
>> drm/i915/gvt: Return error at the failure of finding page_track (2018-03-06 14:49:38 +0800)
>>
>> ----------------------------------------------------------------
>> gvt-next-2018-03-08
>>
>> - big refactor for shadow ppgtt (Changbin)
>> - KBL context save/restore via LRI cmd (Weinan)
>> - misc smatch fixes (Zhenyu)
>> - Properly unmap dma for guest page (Changbin)
>> - other misc fixes (Xiong, etc.)
>>
>> ----------------------------------------------------------------
>> Changbin Du (18):
>> drm/i915/gvt: Rework shadow graphic memory management code
>> drm/i915/gvt: Refine the intel_vgpu_mm reference management
>> drm/i915/gvt: Refine ggtt and ppgtt root entry ops
>> drm/i915/gvt: Refine ggtt_set_shadow_entry
>> drm/i915/gvt: Add verbose gtt shadow logs
>> drm/i915/gvt: Rename ggtt related functions to be more specific
>> drm/i915/gvt: Factor out intel_vgpu_{get, put}_ppgtt_mm interface
>> drm/i915/gvt: Use standard pte bit definition
>> drm/i915/gvt: Refine pte shadowing process
>> drm/i915/gvt: Rework shadow page management code
>> drm/i915/gvt: Rename shadow_page to short name spt
>> drm/i915/gvt: Rename mpt api {set, unset}_wp_page to {enable, disable}_page_track
>> drm/i915/gvt: Don't extend page_track to mpt layer
>> drm/i915/gvt: Provide generic page_track infrastructure for write-protected page
>> drm/i915/gvt: Manage shadow pages with radix tree
>> drm/i915/gvt: Define PTE addr mask with GENMASK_ULL
>> drm/i915/gvt: Fix guest vGPU hang caused by very high dma setup overhead
>> drm/i915/kvmgt: Add kvmgt debugfs entry nr_cache_entries under vgpu
>>
>> Weinan Li (3):
>> drm/i915/gvt: add define GEN9_MOCS_SIZE
>> drm/i915/gvt: add interface to check if context is inhibit
>> drm/i915/gvt: init mmio by lri command in vgpu inhibit context
>>
>> Xiong Zhang (2):
>> drm/i915/gvt: Release gvt->lock at the failure of finding page track
>> drm/i915/gvt: Return error at the failure of finding page_track
>>
>> Zhenyu Wang (7):
>> drm/i915/gvt: Fix one gvt_vgpu_error() use in dmabuf.c
>> drm/i915/gvt: remove gvt max port definition
>> drm/i915/gvt: Fix vGPU sched timeslice calculation warning
>> drm/i915/gvt: Fix check error of vgpu create failure message
>> drm/i915/gvt: Fix check error on fence mmio handler
>> drm/i915/gvt: Fix one indent error
>> drm/i915/gvt: Fix check error on hws_pga_write() fail message
>>
>> drivers/gpu/drm/i915/gvt/Makefile | 2 +-
>> drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +-
>> drivers/gpu/drm/i915/gvt/gtt.c | 1457 ++++++++++++++-----------------
>> drivers/gpu/drm/i915/gvt/gtt.h | 189 ++--
>> drivers/gpu/drm/i915/gvt/gvt.c | 2 +-
>> drivers/gpu/drm/i915/gvt/gvt.h | 21 +-
>> drivers/gpu/drm/i915/gvt/handlers.c | 38 +-
>> drivers/gpu/drm/i915/gvt/hypercall.h | 9 +-
>> drivers/gpu/drm/i915/gvt/kvmgt.c | 313 ++++---
>> drivers/gpu/drm/i915/gvt/mmio.c | 9 +-
>> drivers/gpu/drm/i915/gvt/mmio_context.c | 210 ++++-
>> drivers/gpu/drm/i915/gvt/mmio_context.h | 5 +
>> drivers/gpu/drm/i915/gvt/mpt.h | 67 +-
>> drivers/gpu/drm/i915/gvt/page_track.c | 184 ++++
>> drivers/gpu/drm/i915/gvt/page_track.h | 56 ++
>> drivers/gpu/drm/i915/gvt/sched_policy.c | 5 +-
>> drivers/gpu/drm/i915/gvt/scheduler.c | 44 +-
>> drivers/gpu/drm/i915/gvt/trace.h | 10 +-
>> drivers/gpu/drm/i915/gvt/vgpu.c | 1 +
>> 19 files changed, 1468 insertions(+), 1156 deletions(-)
>> create mode 100644 drivers/gpu/drm/i915/gvt/page_track.c
>> create mode 100644 drivers/gpu/drm/i915/gvt/page_track.h
>>
>>
>> --
>> Open Source Technology Center, Intel ltd.
>>
>> $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PULL] gvt-next for 4.17
2018-03-09 10:30 ` Jani Nikula
@ 2018-03-12 11:25 ` Joonas Lahtinen
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Lahtinen @ 2018-03-12 11:25 UTC (permalink / raw)
To: Vivi, Rodrigo, Jani Nikula, Zhenyu Wang
Cc: intel-gfx, intel-gvt-dev, Lv, Zhiyuan, Yuan, Hang
Quoting Jani Nikula (2018-03-09 12:30:13)
>
> Joonas, so did this miss the deadline for v4.17? You're not making
> another pull request?
As discussed in the IRC, it got merged. Only in the final pull request
generation I'll summarize all the intermediate tags.
Regards, Joonas
>
> BR,
> Jani.
>
> On Thu, 08 Mar 2018, Joonas Lahtinen <joonas.lahtinen@linux.intel.com> wrote:
> > Pulled.
> >
> > Regards, Joonas
> >
> > Quoting Zhenyu Wang (2018-03-08 04:31:52)
> >>
> >> Hi,
> >>
> >> Here's gvt-next update for 4.17. Biggest update is for huge code
> >> refactor of shadow ppgtt from Changbin which is the most obscured
> >> part, and with KBL context save/restore improvement from Weinan,
> >> with other fixes.
> >>
> >> Thanks.
> >> --
> >> The following changes since commit 1f267a572b573b0b155022750cba93001f4367a8:
> >>
> >> drm/i915: Update DRIVER_DATE to 20180305 (2018-03-05 11:56:15 +0200)
> >>
> >> are available in the Git repository at:
> >>
> >> https://github.com/intel/gvt-linux.git tags/gvt-next-2018-03-08
> >>
> >> for you to fetch changes up to 991ecefbdd4b81719597d6c406df8d26ef5c1546:
> >>
> >> drm/i915/gvt: Return error at the failure of finding page_track (2018-03-06 14:49:38 +0800)
> >>
> >> ----------------------------------------------------------------
> >> gvt-next-2018-03-08
> >>
> >> - big refactor for shadow ppgtt (Changbin)
> >> - KBL context save/restore via LRI cmd (Weinan)
> >> - misc smatch fixes (Zhenyu)
> >> - Properly unmap dma for guest page (Changbin)
> >> - other misc fixes (Xiong, etc.)
> >>
> >> ----------------------------------------------------------------
> >> Changbin Du (18):
> >> drm/i915/gvt: Rework shadow graphic memory management code
> >> drm/i915/gvt: Refine the intel_vgpu_mm reference management
> >> drm/i915/gvt: Refine ggtt and ppgtt root entry ops
> >> drm/i915/gvt: Refine ggtt_set_shadow_entry
> >> drm/i915/gvt: Add verbose gtt shadow logs
> >> drm/i915/gvt: Rename ggtt related functions to be more specific
> >> drm/i915/gvt: Factor out intel_vgpu_{get, put}_ppgtt_mm interface
> >> drm/i915/gvt: Use standard pte bit definition
> >> drm/i915/gvt: Refine pte shadowing process
> >> drm/i915/gvt: Rework shadow page management code
> >> drm/i915/gvt: Rename shadow_page to short name spt
> >> drm/i915/gvt: Rename mpt api {set, unset}_wp_page to {enable, disable}_page_track
> >> drm/i915/gvt: Don't extend page_track to mpt layer
> >> drm/i915/gvt: Provide generic page_track infrastructure for write-protected page
> >> drm/i915/gvt: Manage shadow pages with radix tree
> >> drm/i915/gvt: Define PTE addr mask with GENMASK_ULL
> >> drm/i915/gvt: Fix guest vGPU hang caused by very high dma setup overhead
> >> drm/i915/kvmgt: Add kvmgt debugfs entry nr_cache_entries under vgpu
> >>
> >> Weinan Li (3):
> >> drm/i915/gvt: add define GEN9_MOCS_SIZE
> >> drm/i915/gvt: add interface to check if context is inhibit
> >> drm/i915/gvt: init mmio by lri command in vgpu inhibit context
> >>
> >> Xiong Zhang (2):
> >> drm/i915/gvt: Release gvt->lock at the failure of finding page track
> >> drm/i915/gvt: Return error at the failure of finding page_track
> >>
> >> Zhenyu Wang (7):
> >> drm/i915/gvt: Fix one gvt_vgpu_error() use in dmabuf.c
> >> drm/i915/gvt: remove gvt max port definition
> >> drm/i915/gvt: Fix vGPU sched timeslice calculation warning
> >> drm/i915/gvt: Fix check error of vgpu create failure message
> >> drm/i915/gvt: Fix check error on fence mmio handler
> >> drm/i915/gvt: Fix one indent error
> >> drm/i915/gvt: Fix check error on hws_pga_write() fail message
> >>
> >> drivers/gpu/drm/i915/gvt/Makefile | 2 +-
> >> drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +-
> >> drivers/gpu/drm/i915/gvt/gtt.c | 1457 ++++++++++++++-----------------
> >> drivers/gpu/drm/i915/gvt/gtt.h | 189 ++--
> >> drivers/gpu/drm/i915/gvt/gvt.c | 2 +-
> >> drivers/gpu/drm/i915/gvt/gvt.h | 21 +-
> >> drivers/gpu/drm/i915/gvt/handlers.c | 38 +-
> >> drivers/gpu/drm/i915/gvt/hypercall.h | 9 +-
> >> drivers/gpu/drm/i915/gvt/kvmgt.c | 313 ++++---
> >> drivers/gpu/drm/i915/gvt/mmio.c | 9 +-
> >> drivers/gpu/drm/i915/gvt/mmio_context.c | 210 ++++-
> >> drivers/gpu/drm/i915/gvt/mmio_context.h | 5 +
> >> drivers/gpu/drm/i915/gvt/mpt.h | 67 +-
> >> drivers/gpu/drm/i915/gvt/page_track.c | 184 ++++
> >> drivers/gpu/drm/i915/gvt/page_track.h | 56 ++
> >> drivers/gpu/drm/i915/gvt/sched_policy.c | 5 +-
> >> drivers/gpu/drm/i915/gvt/scheduler.c | 44 +-
> >> drivers/gpu/drm/i915/gvt/trace.h | 10 +-
> >> drivers/gpu/drm/i915/gvt/vgpu.c | 1 +
> >> 19 files changed, 1468 insertions(+), 1156 deletions(-)
> >> create mode 100644 drivers/gpu/drm/i915/gvt/page_track.c
> >> create mode 100644 drivers/gpu/drm/i915/gvt/page_track.h
> >>
> >>
> >> --
> >> Open Source Technology Center, Intel ltd.
> >>
> >> $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
>
> --
> Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PULL] gvt-fixes for 4.17
@ 2018-04-19 7:39 Zhenyu Wang
2018-04-19 9:17 ` [PULL] gvt-next " Zhi Wang
0 siblings, 1 reply; 10+ messages in thread
From: Zhenyu Wang @ 2018-04-19 7:39 UTC (permalink / raw)
To: Joonas Lahtinen, Jani Nikula, Vivi, Rodrigo
Cc: intel-gfx, intel-gvt-dev, Lv, Zhiyuan, Yuan, Hang
[-- Attachment #1.1: Type: text/plain, Size: 1756 bytes --]
Hi,
Here's current gvt fixes for 4.17 with several kernel warning
and other misc fixes as detailed below.
p.s: I'll be on vacation from next week till May 2, Zhi will cover for me.
Thanks
--
The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338:
Linux 4.17-rc1 (2018-04-15 18:24:20 -0700)
are available in the Git repository at:
https://github.com/intel/gvt-linux.git tags/gvt-fixes-2018-04-19
for you to fetch changes up to 39b4cbadb9a95bf3f13ea102d6ec841940916ee2:
drm/i915/kvmgt: Check the pfn got from vfio_pin_pages (2018-04-17 10:46:49 +0800)
----------------------------------------------------------------
gvt-fixes-2018-04-19
- cmd parser error path mem leak fix (Colin)
- fix dp aux header validation (Changbin)
- sanity check on pfn after vfio pin page (Changbin)
- fix msi eventfd put (Xiong)
----------------------------------------------------------------
Changbin Du (2):
drm/i915/gvt: Fix the validation on size field of dp aux header
drm/i915/kvmgt: Check the pfn got from vfio_pin_pages
Colin Ian King (1):
drm/i915/gvt: fix memory leak of a cmd_entry struct on error exit path
Xiong Zhang (1):
drm/i915/gvt: Dereference msi eventfd_ctx when it isn't used anymore
Zhenyu Wang (1):
Back merge 'drm-intel-fixes' into gvt-fixes
drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 +
drivers/gpu/drm/i915/gvt/display.h | 2 +-
drivers/gpu/drm/i915/gvt/handlers.c | 13 +++++++++----
drivers/gpu/drm/i915/gvt/kvmgt.c | 34 +++++++++++++++++++++++++++++++++-
4 files changed, 44 insertions(+), 6 deletions(-)
--
Open Source Technology Center, Intel ltd.
$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* [PULL] gvt-next for 4.17
2018-04-19 7:39 [PULL] gvt-fixes " Zhenyu Wang
@ 2018-04-19 9:17 ` Zhi Wang
2018-04-19 9:21 ` Zhi Wang
2018-04-19 9:34 ` Jani Nikula
0 siblings, 2 replies; 10+ messages in thread
From: Zhi Wang @ 2018-04-19 9:17 UTC (permalink / raw)
To: Zhenyu Wang, Joonas Lahtinen, Jani Nikula, Vivi, Rodrigo
Cc: intel-gfx, intel-gvt-dev, Lv, Zhiyuan, Yuan, Hang
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"
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-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PULL] gvt-next for 4.17
2018-04-19 9:17 ` [PULL] gvt-next " Zhi Wang
@ 2018-04-19 9:21 ` Zhi Wang
2018-04-19 9:34 ` Jani Nikula
1 sibling, 0 replies; 10+ messages in thread
From: Zhi Wang @ 2018-04-19 9:21 UTC (permalink / raw)
To: Zhenyu Wang, Joonas Lahtinen, Jani Nikula, Vivi, Rodrigo
Cc: intel-gfx, intel-gvt-dev, Lv, Zhiyuan, Yuan, Hang
Sorry it's gvt-next, so it should be for 4.18.
Thanks,
Zhi.
On 04/19/18 17:17, Zhi Wang 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"
>
> 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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PULL] gvt-next for 4.17
2018-04-19 9:17 ` [PULL] gvt-next " Zhi Wang
2018-04-19 9:21 ` Zhi Wang
@ 2018-04-19 9:34 ` Jani Nikula
2018-04-19 9:41 ` Zhenyu Wang
2018-04-19 9:50 ` Zhi Wang
1 sibling, 2 replies; 10+ messages in thread
From: Jani Nikula @ 2018-04-19 9:34 UTC (permalink / raw)
To: Zhi Wang, Zhenyu Wang, Joonas Lahtinen, Vivi, Rodrigo
Cc: intel-gfx, intel-gvt-dev, Lv, Zhiyuan, Yuan, Hang
On Thu, 19 Apr 2018, Zhi Wang <zhi.a.wang@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@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(-)
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PULL] gvt-next for 4.17
2018-04-19 9:34 ` Jani Nikula
@ 2018-04-19 9:41 ` Zhenyu Wang
2018-04-19 9:50 ` Zhi Wang
1 sibling, 0 replies; 10+ messages in thread
From: Zhenyu Wang @ 2018-04-19 9:41 UTC (permalink / raw)
To: Jani Nikula
Cc: intel-gfx, Yuan, Hang, Lv, Zhiyuan, Vivi, Rodrigo, intel-gvt-dev
[-- Attachment #1.1: Type: text/plain, Size: 3702 bytes --]
On 2018.04.19 12:34:16 +0300, Jani Nikula wrote:
> On Thu, 19 Apr 2018, Zhi Wang <zhi.a.wang@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?
This one was originally queued for 4.17 in gvt-next-fixes, but declined as
Joonas thought this is new feature as enabling vGPU priority scheduling,
https://lists.freedesktop.org/archives/intel-gfx/2018-March/160431.html
>
> 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@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(-)
>
> --
> Jani Nikula, Intel Open Source Technology Center
--
Open Source Technology Center, Intel ltd.
$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PULL] gvt-next for 4.17
2018-04-19 9:34 ` Jani Nikula
2018-04-19 9:41 ` Zhenyu Wang
@ 2018-04-19 9:50 ` Zhi Wang
2018-04-19 10:16 ` Zhi Wang
1 sibling, 1 reply; 10+ messages in thread
From: Zhi Wang @ 2018-04-19 9:50 UTC (permalink / raw)
To: Jani Nikula, Zhenyu Wang, Joonas Lahtinen, Vivi, Rodrigo
Cc: intel-gfx, intel-gvt-dev, Lv, Zhiyuan, Yuan, Hang
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@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@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-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PULL] gvt-next for 4.17
2018-04-19 9:50 ` Zhi Wang
@ 2018-04-19 10:16 ` Zhi Wang
0 siblings, 0 replies; 10+ messages in thread
From: Zhi Wang @ 2018-04-19 10:16 UTC (permalink / raw)
To: Jani Nikula, Zhenyu Wang, Joonas Lahtinen, Vivi, Rodrigo
Cc: intel-gfx, intel-gvt-dev, Lv, Zhiyuan, Yuan, Hang
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@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@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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-04-19 10:16 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-08 2:31 [PULL] gvt-next for 4.17 Zhenyu Wang
2018-03-08 13:20 ` Joonas Lahtinen
2018-03-09 10:30 ` Jani Nikula
2018-03-12 11:25 ` Joonas Lahtinen
2018-04-19 7:39 [PULL] gvt-fixes " Zhenyu Wang
2018-04-19 9:17 ` [PULL] gvt-next " Zhi Wang
2018-04-19 9:21 ` Zhi Wang
2018-04-19 9:34 ` Jani Nikula
2018-04-19 9:41 ` Zhenyu Wang
2018-04-19 9:50 ` Zhi Wang
2018-04-19 10:16 ` Zhi Wang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.