Re: [Intel-xe] [PATCH] drm/xe: Update to upstream DRM scheduler code

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Wed, Oct 25, 2023 at 05:45:24PM -0400, Rodrigo Vivi wrote:
> > > This is based on the upstream series [1] that hopefully gets merged
> > > soon. To create this patch I just dropped in the new drm-scheduler code
> > > (copied drivers/gpu/drm/scheduler/*.c / *.h into this repo) and updated
> > > the Xe code as required. The DRM scheduler coded so much in the baseline
> > > I'm not sure if it worth trying to do fixup patches, rather we just
> > > merge it on tip and find a proper place these changes during the next
> > > rebase. Open to other ideas too.
> > 
> > I don't think we should do fixup patches neither, but it's important to
> > keep documented in the commit message how and what was changed. Like you
> > did now.
> > 
> > However I think it will be quite troublesome to rebase the branch in
> > future since you are also changing other parts of the code. So it's not
> > a matter of just dropping this one patch when we rebase.  Lately it's
> > usually Rodrigo who is rebasing drm-xe-next, so +Rodrigo.
> 
> the rebase won't be easy indeed.
> Another aspect is that we will likely need to wait that to propagate
> from drm-misc-next to drm-next before we can rebase on drm-next and do
> the first pull-request.
> 
> > 
> > One alternative that comes to mind is: can you do the rebase and post
> > the result to a remote branch? Assuming your remote is called xe:
> > 
> > 	git fetch xe
> > 	git reset --hard xe/drm-xe-next
> > 	git rebase -i bb46e837b7e59c22a567ae6913ff4d6bf0e9211a
> 
> Yes, please! We had a similar situation with the display case and this
> is what I asked Jouni to do. Having the reference branch when rebasing
> was super helpful.
> 
> Besides the reference branch, we need a top commit on drm-xe-next.
> (Maybe this commit here?, maybe something more)
> 
> But in a way that the
> $ git diff drm-xe-next..reference-branch
> should be empty
> 
> Then we force-push origin/drm-xe-next
> 
> and when the rebase on drm-next comes, the drm-sched base patches
> will disappear and we won't have any conflict.

Hi Matt, will we have some update here now that the patches got merged?
I'd like to get the update in so we can send the update to the xe.rst
confirming that that is done and the patches here will be vanished on
drm-next rebase.

Thanks,
Rodrigo.

> 
> > 
> > Then drop the patches as you see fit and add the ones from this series.
> > 
> > Lucas De Marchi