Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec2dc6a0 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Drop crtc argument from __drm_atomic_helper_crtc_destroy_state 



It's unused, and really this helper should only look at the state
structure and nothing else.

v2: Rebase on top of rockchip changes

v3: Drop unrelated hunk, spotted by Laurent.

v4: Rebase onto mtk driver merge.

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: default avatarThierry Reding <thierry.reding@gmail.com>
Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1462804451-15318-1-git-send-email-daniel.vetter@ffwll.ch
parent a8ad0bd8

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

drivers/gpu/drm/drm_atomic_helper.c

+3 −5
Original line number Diff line number Diff line
@@ -2530,7 +2530,7 @@ EXPORT_SYMBOL(drm_atomic_helper_best_encoder); 
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);
@@ -2595,15 +2595,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);
@@ -2623,7 +2621,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);

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -12924,7 +12924,7 @@ verify_crtc_state(struct drm_crtc *crtc, 
	bool active;



	old_state = old_crtc_state->state;

	__drm_atomic_helper_crtc_destroy_state(crtc, old_crtc_state);

	__drm_atomic_helper_crtc_destroy_state(old_crtc_state);

	pipe_config = to_intel_crtc_state(old_crtc_state);

	memset(pipe_config, 0, sizeof(*pipe_config));

	pipe_config->base.crtc = crtc;
@@ -15760,7 +15760,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) 
		struct intel_crtc_state *crtc_state = crtc->config;

		int pixclk = 0;



		__drm_atomic_helper_crtc_destroy_state(&crtc->base, &crtc_state->base);

		__drm_atomic_helper_crtc_destroy_state(&crtc_state->base);

		memset(crtc_state, 0, sizeof(*crtc_state));

		crtc_state->base.crtc = &crtc->base;

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static struct drm_crtc_state *mtk_drm_crtc_duplicate_state(struct drm_crtc *crtc 
static void mtk_drm_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(to_mtk_crtc_state(state));

}

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ static void vop_crtc_destroy_state(struct drm_crtc *crtc, 
{

	struct rockchip_crtc_state *s = to_rockchip_crtc_state(state);



	__drm_atomic_helper_crtc_destroy_state(crtc, &s->base);

	__drm_atomic_helper_crtc_destroy_state(&s->base);

	kfree(s);

}