Message ID | 20180720211509.23605-7-alexandru-cosmin.gheorghe@arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi Alexandru, On Fri, 2018-07-20 at 22:15 +0100, Alexandru Gheorghe wrote: > Signed-off-by: Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com> > --- > drivers/gpu/drm/imx/ipuv3-plane.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c > index 203f247d4854..1bd4de03ce9e 100644 > --- a/drivers/gpu/drm/imx/ipuv3-plane.c > +++ b/drivers/gpu/drm/imx/ipuv3-plane.c > @@ -281,16 +281,14 @@ static void ipu_plane_state_reset(struct drm_plane *plane) > ipu_state = to_ipu_plane_state(plane->state); > __drm_atomic_helper_plane_destroy_state(plane->state); > kfree(ipu_state); > + plane->state = NULL; With __drm_atomic_helper_plane_reset as-is, this could be dropped ... > } > > ipu_state = kzalloc(sizeof(*ipu_state), GFP_KERNEL); > > - if (ipu_state) { > - ipu_state->base.plane = plane; > - ipu_state->base.rotation = DRM_MODE_ROTATE_0; > - } > + if (ipu_state) > + __drm_atomic_helper_plane_reset(plane, &ipu_state->base); ... if this is change to just __drm_atomic_helper_plane_reset(plane, &ipu_state->base); > > - plane->state = &ipu_state->base; > } > > static struct drm_plane_state * regards Philipp
On Tue, 2018-07-24 at 09:49 +0200, Philipp Zabel wrote: > Hi Alexandru, > > On Fri, 2018-07-20 at 22:15 +0100, Alexandru Gheorghe wrote: > > Signed-off-by: Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com> > > --- > > drivers/gpu/drm/imx/ipuv3-plane.c | 8 +++----- > > 1 file changed, 3 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c > > index 203f247d4854..1bd4de03ce9e 100644 > > --- a/drivers/gpu/drm/imx/ipuv3-plane.c > > +++ b/drivers/gpu/drm/imx/ipuv3-plane.c > > @@ -281,16 +281,14 @@ static void ipu_plane_state_reset(struct drm_plane *plane) > > ipu_state = to_ipu_plane_state(plane->state); > > __drm_atomic_helper_plane_destroy_state(plane->state); > > kfree(ipu_state); > > + plane->state = NULL; > > With __drm_atomic_helper_plane_reset as-is, this could be dropped ... > > > } > > > > ipu_state = kzalloc(sizeof(*ipu_state), GFP_KERNEL); > > > > - if (ipu_state) { > > - ipu_state->base.plane = plane; > > - ipu_state->base.rotation = DRM_MODE_ROTATE_0; > > - } > > + if (ipu_state) > > + __drm_atomic_helper_plane_reset(plane, &ipu_state->base); > > ... if this is change to just > > __drm_atomic_helper_plane_reset(plane, &ipu_state->base); Euh, obviously that won't be possible, sorry for the noise. I blame the heat. regards Philipp
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c index 203f247d4854..1bd4de03ce9e 100644 --- a/drivers/gpu/drm/imx/ipuv3-plane.c +++ b/drivers/gpu/drm/imx/ipuv3-plane.c @@ -281,16 +281,14 @@ static void ipu_plane_state_reset(struct drm_plane *plane) ipu_state = to_ipu_plane_state(plane->state); __drm_atomic_helper_plane_destroy_state(plane->state); kfree(ipu_state); + plane->state = NULL; } ipu_state = kzalloc(sizeof(*ipu_state), GFP_KERNEL); - if (ipu_state) { - ipu_state->base.plane = plane; - ipu_state->base.rotation = DRM_MODE_ROTATE_0; - } + if (ipu_state) + __drm_atomic_helper_plane_reset(plane, &ipu_state->base); - plane->state = &ipu_state->base; } static struct drm_plane_state *
Signed-off-by: Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com> --- drivers/gpu/drm/imx/ipuv3-plane.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)