On Tue, Jun 18, 2019 at 11:17:34PM -0300, Rodrigo Siqueira wrote: > On 06/07, Daniel Vetter wrote: > > The crc core code can cope with some late crc, the race is kinda > > unavoidable. So no need to flush pending workers, they'll complete in > > time. > > > > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> > > Cc: Rodrigo Siqueira <rodrigosiqueiramelo@xxxxxxxxx> > > Cc: Haneen Mohammed <hamohammed.sa@xxxxxxxxx> > > Cc: Daniel Vetter <daniel@xxxxxxxx> > > --- > > drivers/gpu/drm/vkms/vkms_crc.c | 3 --- > > 1 file changed, 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/vkms/vkms_crc.c b/drivers/gpu/drm/vkms/vkms_crc.c > > index 96806cd35ad4..9d15e5e85830 100644 > > --- a/drivers/gpu/drm/vkms/vkms_crc.c > > +++ b/drivers/gpu/drm/vkms/vkms_crc.c > > @@ -249,9 +249,6 @@ int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name) > > > > ret = vkms_crc_parse_source(src_name, &enabled); > > > > - /* make sure nothing is scheduled on crtc workq */ > > - flush_workqueue(out->crc_workq); > > - > > spin_lock_irq(&out->lock); > > out->crc_enabled = enabled; > > spin_unlock_irq(&out->lock); > > -- > > 2.20.1 > > > Hi, > > I tried to apply this patch, but git complained about it. I fixed the > problem manually (it was very simple), but I noticed that dim did not > add the tag "Link". Because of this, I decided to check with you before > I apply this patch. Is it ok to fix conflict without dim? Is it ok apply > a patch without the tag Link? If you've manually resolved a conflict, use dim apply-link to just extract the Link: tag from the same patch file, and apply it to the topmost commit. If you don't have a Link: tag then dim push will refuse to work. In general resolving conflicts is ok, but again except for extremely trivial things I prefer not to. For this I'd just wait until you're ready to pull in the entire series in sequence. Otherwise you'll need to resolve even more conflicts since the other patches also wont apply cleanly anymore. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
