[Intel-gfx] [GIT PULL] GVT-g fixes for 4.11-rc4

[Daniel Vetter]

On Fri, Mar 17, 2017 at 05:02:24PM +0800, Zhenyu Wang wrote:
> On 2017.03.17 10:58:26 +0200, Jani Nikula wrote:
> > On Fri, 17 Mar 2017, Zhenyu Wang <zhenyuw at linux.intel.com> wrote:
> > > Hi,
> > >
> > > This is gvt fixes for 4.11-rc4. Last minute rebase was to move
> > > from 70647f9163aa ("Merge tag 'gvt-fixes-2017-03-08' of https://github.com/01org/gvt-linux into drm-intel-fixes") onto 'drm-intel-fixes-2017-03-14'.
> > >
> > 
> > Why would you do that? Did you have conflicts? You know you don't have
> > to rebase unless there are issues.
> > 
> 
> I did a backmerge of drm-intel-fixes to the gvt-fixes after last pull,
> then now can't generate a sane request pull against previous
> gvt-fixes-2017-03-08...Sorry for that.

You don't generate the pull request against your last pull request, but
against latest upstream (drm-intel-fixes for you). Then it should filter
this all out if you have a backmerge that's merged already.
-Daniel

> 
> > 
> > > p.s, once this pull would hit linus tree, requires a backmerge
> > > with those gvt changes for dinq, as new 4.12 stuff would base on that.
> > >
> > > Thanks.
> > >
> > > --
> > > The following changes since commit 6aef660370a9c246956ba6d01eebd8063c4214cb:
> > >
> > >   drm/i915: Fix forcewake active domain tracking (2017-03-13 17:30:54 +0200)
> > >
> > > are available in the git repository at:
> > >
> > >   https://github.com/01org/gvt-linux.git tags/gvt-fixes-2017-03-17
> > >
> > > for you to fetch changes up to 2958b9013fcbabeeba221161d0712f5259f1e15d:
> > >
> > >   drm/i915/gvt: Fix gvt scheduler interval time (2017-03-17 16:46:45 +0800)
> > >
> > > ----------------------------------------------------------------
> > > gvt-fixes-2017-03-17
> > >
> > > - force_nonpriv reg handling in cmd parser (Yan)
> > > - gvt error message cleanup (Tina)
> > > - i915_wait_request fix from Chris
> > > - KVM srcu warning fix (Changbin)
> > > - ensure shadow ctx pinned (Chuanxiao)
> > > - critical gvt scheduler interval time fix (Zhenyu)
> > > - etc.
> > >
> > > ----------------------------------------------------------------
> > > Changbin Du (1):
> > >       drm/i915/kvmgt: fix suspicious rcu dereference usage
> > >
> > > Chris Wilson (1):
> > >       drm/i915/gvt: Remove bogus retry around i915_wait_request
> > >
> > > Chuanxiao Dong (2):
> > >       drm/i915/gvt: add enable_execlists check before enable gvt
> > >       drm/i915/gvt: GVT pin/unpin shadow context
> > >
> > > Tina Zhang (2):
> > >       drm/i915/gvt: replace the gvt_err with gvt_vgpu_err
> > >       drm/i915/gvt: scan shadow indirect context image when valid
> > >
> > > Yulei Zhang (1):
> > >       drm/i915/gvt: correct the ggtt valid bit check in pipe control command
> > >
> > > Zhao Yan (1):
> > >       drm/i915/gvt: handle force-nonpriv registers, cmd parser part
> > >
> > > Zhenyu Wang (1):
> > >       drm/i915/gvt: Fix gvt scheduler interval time
> > >
> > >  drivers/gpu/drm/i915/gvt/aperture_gm.c  |   8 +--
> > >  drivers/gpu/drm/i915/gvt/cmd_parser.c   | 109 +++++++++++++++++++++-----------
> > >  drivers/gpu/drm/i915/gvt/debug.h        |   8 +++
> > >  drivers/gpu/drm/i915/gvt/edid.c         |  13 ++--
> > >  drivers/gpu/drm/i915/gvt/execlist.c     |  29 ++++-----
> > >  drivers/gpu/drm/i915/gvt/gtt.c          |  74 +++++++++++-----------
> > >  drivers/gpu/drm/i915/gvt/handlers.c     |  45 ++++++++-----
> > >  drivers/gpu/drm/i915/gvt/kvmgt.c        |  37 +++++++----
> > >  drivers/gpu/drm/i915/gvt/mmio.c         |  38 +++++------
> > >  drivers/gpu/drm/i915/gvt/mmio.h         |   3 +
> > >  drivers/gpu/drm/i915/gvt/opregion.c     |  10 +--
> > >  drivers/gpu/drm/i915/gvt/render.c       |   2 +-
> > >  drivers/gpu/drm/i915/gvt/sched_policy.c |   4 +-
> > >  drivers/gpu/drm/i915/gvt/scheduler.c    |  61 ++++++++++++------
> > >  drivers/gpu/drm/i915/intel_gvt.c        |   5 ++
> > >  15 files changed, 268 insertions(+), 178 deletions(-)
> > 
> > -- 
> > Jani Nikula, Intel Open Source Technology Center
> 
> -- 
> Open Source Technology Center, Intel ltd.
> 
> $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827



-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch