On Thu, Jun 29, 2017 at 04:57:25PM +0300, Ville Syrjälä wrote: > On Thu, Jun 29, 2017 at 01:59:54PM +0200, Maarten Lankhorst wrote: > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > > --- > > drivers/gpu/drm/drm_framebuffer.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c > > index fc8ef42203ec..b3ef4f1c2630 100644 > > --- a/drivers/gpu/drm/drm_framebuffer.c > > +++ b/drivers/gpu/drm/drm_framebuffer.c > > @@ -832,6 +832,7 @@ static int atomic_remove_fb(struct drm_framebuffer *fb) > > drm_atomic_clean_old_fb(dev, plane_mask, ret); > > > > if (ret == -EDEADLK) { > > + drm_atomic_state_clear(state); > > Hmm. We seem to be missing this all over. Do those other places need it > as well? Hard to say without a commit message explaining why we need it > here. > > Should we just back it into drm_modeset_backoff() if it's always needed? s/back/bake/ > > > drm_modeset_backoff(&ctx); > > goto retry; > > } > > -- > > 2.11.0 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@xxxxxxxxxxxxxxxxxxxxx > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > -- > Ville Syrjälä > Intel OTC > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx