On 08/09/16 02:23 AM, Imre Deak wrote: > This fixes the error path for platforms that don't define the new > page_flip_target() hook. > > Fixes: c229bfbbd04 ("drm: Add page_flip_target CRTC hook v2") > Testcase: igt/kms_flip/basic-flip-vs-dpms > CC: Michel Dänzer <michel.daenzer@xxxxxxx> > Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx> > --- > drivers/gpu/drm/drm_crtc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 0f797ee..d84a0ea 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -2047,7 +2047,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, > } > > out: > - if (ret) > + if (ret && crtc->funcs->page_flip_target) > drm_crtc_vblank_put(crtc); > if (fb) > drm_framebuffer_unreference(fb); > Nice catch, thanks! Reviewed-by: Michel Dänzer <michel.daenzer@xxxxxxx> -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx