[PATCH] drm/crtc-helper: Fixup error handling in drm_helper_crtc_mode_set

Daniel Vetter daniel at ffwll.ch
Thu Jul 2 07:29:10 PDT 2015


On Thu, Jul 02, 2015 at 02:27:30PM +0100, Daniel Stone wrote:
> Hi,
> 
> > On 2 Jul 2015, at 2:16 pm, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> > 
> > In
> > 
> > commit 9f658b7b62e7aefc1ee067136126eca3f58cabfd
> > Author: Daniel Stone <daniels at collabora.com>
> > Date:   Fri May 22 13:34:45 2015 +0100
> > 
> >    drm/crtc_helper: Replace open-coded CRTC state helpers
> > 
> > error handling code was broken, resulting in the first path not being
> > checked correctly. Fix this by using the same pattern as in the
> > transitional plane helper function drm_plane_helper_update.
> > 
> > v2: Simplify the cleanup code while at it too.
> > 
> > v3: After some debugging with John we realized that the above patch
> > from Daniel also accidentally removed the if (crtc_state) check. This
> > is legal when transitioning to atomic, when the initial state reset
> > isn't all wired up yet properly. Reinstate that check to fix the bug
> > John has hit.
> 
> Still misses the crtc_state->crtc assignment in the kzalloc path.

Yeah I was random-walking over that code badly. Please disregard v4 too.
I'll follow up with a patch to use the reset helper if crtc->state isnt'
set both here and for plane transitional helpers too.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list