Re: [PATCH 1/3] drm: Drop crtc argument from __drm_atomic_helper_crtc_destroy_state

Daniel Vetter
2016-05-09T14:35:04Z

On Mon, May 09, 2016 at 02:47:58PM +0300, Laurent Pinchart wrote:
> Hi Daniel,
>
> Thank you for the patch.
>
> On Friday 06 May 2016 10:32:28 Daniel Vetter wrote:
> > It's unused, and really this helper should only look at the state
> > structure and nothing else.
> >
> > v2: Rebase on top of rockchip changes
> >
> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > Cc: Thierry Reding <thierry.reding@gmail.com>
> > Cc: Eric Anholt <eric@anholt.net>
> > Cc: Mark Yao <mark.yao@rock-chips.com>
> > Acked-by: Thierry Reding <thierry.reding@gmail.com>
> > Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 2 +-
> > drivers/gpu/drm/drm_atomic_helper.c | 8 +++-----
> > drivers/gpu/drm/drm_crtc.c | 4 ++--
> > drivers/gpu/drm/i915/intel_display.c | 4 ++--
> > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +-
> > drivers/gpu/drm/tegra/dc.c | 4 ++--
> > drivers/gpu/drm/vc4/vc4_crtc.c | 2 +-
> > include/drm/drm_atomic_helper.h | 3 +--
> > 8 files changed, 13 insertions(+), 16 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> > b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c index
> > 8df0aaf98725..cf23a755f777 100644
> > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> > @@ -430,7 +430,7 @@ static void atmel_hlcdc_crtc_destroy_state(struct
> > drm_crtc *crtc, struct atmel_hlcdc_crtc_state *state;
> >
> > state = drm_crtc_state_to_atmel_hlcdc_crtc_state(s);
> > - __drm_atomic_helper_crtc_destroy_state(crtc, s);
> > + __drm_atomic_helper_crtc_destroy_state(s);
> > kfree(state);
> > }
> >
> > diff --git a/drivers/gpu/drm/drm_atomic_helper.c
> > b/drivers/gpu/drm/drm_atomic_helper.c index 997fd21e5388..137bb51269c2
> > 100644
> > --- a/drivers/gpu/drm/drm_atomic_helper.c
> > +++ b/drivers/gpu/drm/drm_atomic_helper.c
> > @@ -2511,7 +2511,7 @@ EXPORT_SYMBOL(drm_atomic_helper_connector_dpms);
> > void drm_atomic_helper_crtc_reset(struct drm_crtc *crtc)
> > {
> > if (crtc->state)
> > - __drm_atomic_helper_crtc_destroy_state(crtc, crtc->state);
> > + __drm_atomic_helper_crtc_destroy_state(crtc->state);
> >
> > kfree(crtc->state);
> > crtc->state = kzalloc(sizeof(*crtc->state), GFP_KERNEL);
> > @@ -2576,15 +2576,13 @@
> > EXPORT_SYMBOL(drm_atomic_helper_crtc_duplicate_state);
> >
> > /**
> > * __drm_atomic_helper_crtc_destroy_state - release CRTC state
> > - * @crtc: CRTC object
> > * @state: CRTC state object to release
> > *
> > * Releases all resources stored in the CRTC state without actually freeing
> > * the memory of the CRTC state. This is useful for drivers that subclass
> > the * CRTC state.
> > */
> > -void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc,
> > - struct drm_crtc_state *state)
> > +void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc_state *state)
> > {
> > drm_property_unreference_blob(state->mode_blob);
> > drm_property_unreference_blob(state->degamma_lut);
> > @@ -2604,7 +2602,7 @@ EXPORT_SYMBOL(__drm_atomic_helper_crtc_destroy_state);
> > void drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc,
> > struct drm_crtc_state *state)
> > {
> > - __drm_atomic_helper_crtc_destroy_state(crtc, state);
> > + __drm_atomic_helper_crtc_destroy_state(state);
> > kfree(state);
> > }
> > EXPORT_SYMBOL(drm_atomic_helper_crtc_destroy_state);
> > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> > index 1e7692a10c83..cde9b5af7553 100644
> > --- a/drivers/gpu/drm/drm_crtc.c
> > +++ b/drivers/gpu/drm/drm_crtc.c
> > @@ -897,7 +897,7 @@ int drm_connector_init(struct drm_device *dev,
> > struct ida *connector_ida =
> > &drm_connector_enum_list[connector_type].ida;
> >
> > - drm_modeset_lock_all(dev);
> > + mutex_lock(&config->mutex);
>
> Is this related to $SUBJECT ?

Totally misplaced hunk. I've fixed up all the things you've spotted and
resent. Thanks for the comments.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation