[Intel-gfx] [PATCH] drm/atomic: Don't try to free a NULL state

Daniel Vetter daniel at ffwll.ch
Mon Mar 30 07:52:43 PDT 2015


On Mon, Mar 30, 2015 at 02:35:33PM +0300, David Weinehall wrote:
> On Mon, Mar 30, 2015 at 02:05:43PM +0300, Ander Conselvan de Oliveira wrote:
> > Consistently with other free functions, handle the NULL case without
> > oopsing.
> > 
> > Cc: dri-devel at lists.freedesktop.org
> > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
> > ---
> >  drivers/gpu/drm/drm_atomic.c | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> > index 23034e8..88b2790 100644
> > --- a/drivers/gpu/drm/drm_atomic.c
> > +++ b/drivers/gpu/drm/drm_atomic.c
> > @@ -179,6 +179,9 @@ EXPORT_SYMBOL(drm_atomic_state_clear);
> >   */
> >  void drm_atomic_state_free(struct drm_atomic_state *state)
> >  {
> > +	if (!state)
> > +		return;
> > +
> >  	drm_atomic_state_clear(state);
> >  
> >  	DRM_DEBUG_ATOMIC("Freeing atomic state %p\n", state);
> 
> It'd probably make sense to fix all code that uses
> drm_atomic_state_free() at the same time.

Imo we can do that as follow-ups as needed. Applied to topic/drm-misc,
thanks.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list