[Intel-gfx] [PULL] gvt-next-fixes

[Vetter, Daniel]

On Mon, 2019-09-09 at 15:35 -0700, Rodrigo Vivi wrote:
> On Mon, Sep 09, 2019 at 02:54:59PM -0700, Vetter, Daniel wrote:
> > On Mon, 2019-09-09 at 10:24 -0700, Rodrigo Vivi wrote:
> > > Hi guys,
> > > 
> > > On Fri, Sep 06, 2019 at 01:42:55PM +0800, Zhenyu Wang wrote:
> > > > Hi,
> > > > 
> > > > Here's gvt-next-fixes with two recent fixes, one for recent
> > > > guest hang regression and another for guest reset fix.
> > > > 
> > > > Thanks.
> > > > --
> > > > The following changes since commit
> > > > c36beba6b296b3c05a0f29753b04775e5ae23886:
> > > > 
> > > >   drm/i915: Seal races between async GPU cancellation,
> > > > retirement
> > > > and signaling (2019-05-13 13:53:35 +0300)
> > > > 
> > > > are available in the Git repository at:
> > > > 
> > > >   https://github.com/intel/gvt-linux.git tags/gvt-next-fixes-
> > > > 2019-
> > > > 09-06
> > > > 
> > > > for you to fetch changes up to
> > > > 4a5322560aa235efa84c0aa34c00e5749a0792fd:
> > > > 
> > > >   drm/i915/gvt: update RING_START reg of vGPU when the context
> > > > is
> > > > submitted to i915 (2019-09-06 13:39:09 +0800)
> > > 
> > > $ dim pull-request-next-fixes
> > > Using drm/drm-next as the upstream
> > > dim: 4a5322560aa2 ("drm/i915/gvt: update RING_START reg of vGPU
> > > when
> > > the context is submitted to i915"): Link tag missing.
> > > dim: 0a3242bdb477 ("drm/i915/gvt: update vgpu workload head
> > > pointer
> > > correctly"): Link tag missing.
> > > dim: ERROR: issues in commits detected, aborting
> > > 
> > > I wonder how I should proceed here. In the past I was always
> > > bypasssing dim,
> > > but now that drm maintainers also use dim I'm sure this will blow
> > > up
> > > there anyways.
> > > 
> > > But gvt patches are not tracked on our CI individually hence they
> > > don't
> > > have Links.
> > > 
> > > Jani, Joonas, how are you guys handling this?
> > > 
> > > Daniel, Dave, ideas?
> > 
> > dim doesn't require Link: tags yet for pull requests (because most
> > drm
> > trees aren't managed by dim and so lack them).
> 
> I'm confused now.
> 
> function dim_pull_request
> calls
> checkpatch_commit_push_range 1 "$upstream..$branch"
> (except for drm-intel-next)
> 
> and checkpatch_commit_push checks for the link.
> 
> So if you also use dim for your pull request I'm wondering how you
> are not getting that....

On the push side we set dim_managed_branch (or whatever it's called) to
1, on the pull side it's side 0. That disables certain checks like the
Link: tag check. Also push should only check commits authored by you,
so this is only really an issue with cherry-picks.

That was at least the idea behind all this, maybe it stopped working.
-Daniel

> 
> In the past whenever I had this problem on dinf I commented out the
> link check but end up never coming back to solve the problem
> properly.
> I just wondering that now that dim is in use on drm level if I bypass
> here it becomes a problem for you.
> 
> thoughts?
> 
> > Until we change that,
> > with some doc patches and proper bikeshed on dri-devel I think it's
> > fine if gvt is missing them. At least from a drm.git pov.
> > 
> > What you guys want to do for drm-intel.git is entirely up to you.
> > -Daniel
> > > Thanks,
> > > Rodrigo.
> > > 
> > > > -------------------------------------------------------------
> > > > ---
> > > > gvt-next-fixes-2019-09-06
> > > > 
> > > > - Fix guest context head pointer update for hang (Xiaolin)
> > > > - Fix guest context ring state for reset (Weinan)
> > > > 
> > > > -------------------------------------------------------------
> > > > ---
> > > > Weinan Li (1):
> > > >       drm/i915/gvt: update RING_START reg of vGPU when the
> > > > context
> > > > is submitted to i915
> > > > 
> > > > Xiaolin Zhang (1):
> > > >       drm/i915/gvt: update vgpu workload head pointer correctly
> > > > 
> > > >  drivers/gpu/drm/i915/gvt/scheduler.c | 45
> > > > +++++++++++++++++++++++++-----------
> > > >  1 file changed, 32 insertions(+), 13 deletions(-)
> > > > 
> > > > 
> > > > -- 
> > > > Open Source Technology Center, Intel ltd.
> > > > 
> > > > $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
Intel Semiconductor AG
Registered No. 020.30.913.786-7
Registered Office: Badenerstrasse 549, 8048 Zurich, Switzerland