Skip to content

Commit

Permalink
drm: omapdrm: Fix plane state free in plane reset handler
Browse files Browse the repository at this point in the history
The plane reset handler frees the plane state and allocates a new
default state, but when doing so attempt to free the plane state using
the base plane state pointer instead of casting it to the
driver-specific state object that has been allocated. Fix it by using
the omap_plane_atomic_destroy_state() function to destroy the plane
state instead of duplicating the code.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
[tomi.valkeinen@ti.com: move of the func into separate patch]
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Laurent Pinchart authored and Tomi Valkeinen committed Dec 31, 2015
1 parent e07323c commit f8ef29e
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/gpu/drm/omapdrm/omap_plane.c
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,10 @@ static void omap_plane_reset(struct drm_plane *plane)
struct omap_plane *omap_plane = to_omap_plane(plane);
struct omap_plane_state *omap_state;

if (plane->state && plane->state->fb)
drm_framebuffer_unreference(plane->state->fb);

kfree(plane->state);
plane->state = NULL;
if (plane->state) {
omap_plane_atomic_destroy_state(plane, plane->state);
plane->state = NULL;
}

omap_state = kzalloc(sizeof(*omap_state), GFP_KERNEL);
if (omap_state == NULL)
Expand Down

0 comments on commit f8ef29e

Please sign in to comment.