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

Commit cf1cc6f2 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

drm: rcar-du: Switch mode config to atomic helpers 



This removes the legacy mode config code. The CRTC and encoder prepare
and commit operations are not used anymore, remove them.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
parent 336d04a1

drivers/gpu/drm/rcar-du/rcar_du_crtc.c

+6 −49
Original line number Original line Diff line number Diff line
@@ -362,12 +362,10 @@ static void rcar_du_crtc_start(struct rcar_du_crtc *rcrtc) 
	/* FIXME: Commit the planes state. This is required here as the CRTC can

	/* FIXME: Commit the planes state. This is required here as the CRTC can

	 * be started from the DPMS and system resume handler, which don't go

	 * be started from the DPMS and system resume handler, which don't go

	 * through .atomic_plane_update() and .atomic_flush() to commit plane

	 * through .atomic_plane_update() and .atomic_flush() to commit plane

	 * state. Similarly a mode set operation without any update to planes

	 * state. Additionally, given that the plane state atomic commit occurs

	 * will not go through atomic plane configuration either. Additionally,

	 * between CRTC disable and enable, the hardware state could also be

	 * given that the plane state atomic commit occurs between CRTC disable

	 * lost due to runtime PM, requiring a full commit here. This will be

	 * and enable, the hardware state could also be lost due to runtime PM,

	 * fixed later after switching to atomic updates completely.

	 * requiring a full commit here. This will be fixed later after

	 * switching to atomic updates completely.

	 */

	 */

	mutex_lock(&rcrtc->group->planes.lock);

	mutex_lock(&rcrtc->group->planes.lock);

	rcar_du_crtc_update_planes(crtc);

	rcar_du_crtc_update_planes(crtc);
@@ -474,6 +472,7 @@ static void rcar_du_crtc_disable(struct drm_crtc *crtc) 
	rcar_du_crtc_put(rcrtc);

	rcar_du_crtc_put(rcrtc);





	rcrtc->enabled = false;

	rcrtc->enabled = false;

	rcrtc->outputs = 0;

}

}





static void rcar_du_crtc_dpms(struct drm_crtc *crtc, int mode)

static void rcar_du_crtc_dpms(struct drm_crtc *crtc, int mode)
@@ -492,43 +491,6 @@ static bool rcar_du_crtc_mode_fixup(struct drm_crtc *crtc, 
	return true;

	return true;

}

}





static void rcar_du_crtc_mode_prepare(struct drm_crtc *crtc)

{

	struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);



	/* We need to access the hardware during mode set, acquire a reference

	 * to the CRTC.

	 */

	rcar_du_crtc_get(rcrtc);



	/* Stop the CRTC, force enabled to false as a result. */

	rcar_du_crtc_stop(rcrtc);



	rcrtc->enabled = false;

	rcrtc->outputs = 0;

}



static void rcar_du_crtc_mode_set_nofb(struct drm_crtc *crtc)

{

	/* No-op. We should configure the display timings here, but as we're

	 * called with the CRTC disabled clocks might be off, and we thus can't

	 * access the hardware. Let's just configure everything when enabling

	 * the CRTC.

	 */

}



static void rcar_du_crtc_mode_commit(struct drm_crtc *crtc)

{

	struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);



	/* We're done, restart the CRTC and set enabled to true. The reference

	 * to the DU acquired at prepare() time will thus be released by the

	 * disable() handler.

	 */

	rcar_du_crtc_start(rcrtc);

	rcrtc->enabled = true;

}



static void rcar_du_crtc_atomic_begin(struct drm_crtc *crtc)

static void rcar_du_crtc_atomic_begin(struct drm_crtc *crtc)

{

{

	struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);

	struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
@@ -556,11 +518,6 @@ static void rcar_du_crtc_atomic_flush(struct drm_crtc *crtc) 
static const struct drm_crtc_helper_funcs crtc_helper_funcs = {

static const struct drm_crtc_helper_funcs crtc_helper_funcs = {

	.dpms = rcar_du_crtc_dpms,

	.dpms = rcar_du_crtc_dpms,

	.mode_fixup = rcar_du_crtc_mode_fixup,

	.mode_fixup = rcar_du_crtc_mode_fixup,

	.prepare = rcar_du_crtc_mode_prepare,

	.commit = rcar_du_crtc_mode_commit,

	.mode_set = drm_helper_crtc_mode_set,

	.mode_set_nofb = rcar_du_crtc_mode_set_nofb,

	.mode_set_base = drm_helper_crtc_mode_set_base,

	.disable = rcar_du_crtc_disable,

	.disable = rcar_du_crtc_disable,

	.enable = rcar_du_crtc_enable,

	.enable = rcar_du_crtc_enable,

	.atomic_begin = rcar_du_crtc_atomic_begin,

	.atomic_begin = rcar_du_crtc_atomic_begin,
@@ -602,7 +559,7 @@ static int rcar_du_crtc_page_flip(struct drm_crtc *crtc, 
static const struct drm_crtc_funcs crtc_funcs = {

static const struct drm_crtc_funcs crtc_funcs = {

	.reset = drm_atomic_helper_crtc_reset,

	.reset = drm_atomic_helper_crtc_reset,

	.destroy = drm_crtc_cleanup,

	.destroy = drm_crtc_cleanup,

	.set_config = drm_crtc_helper_set_config,

	.set_config = drm_atomic_helper_set_config,

	.page_flip = rcar_du_crtc_page_flip,

	.page_flip = rcar_du_crtc_page_flip,

	.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,

	.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,

	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,

drivers/gpu/drm/rcar-du/rcar_du_encoder.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -118,16 +118,6 @@ static bool rcar_du_encoder_mode_fixup(struct drm_encoder *encoder, 
	return true;

	return true;

}

}





static void rcar_du_encoder_mode_prepare(struct drm_encoder *encoder)

{

	rcar_du_encoder_disable(encoder);

}



static void rcar_du_encoder_mode_commit(struct drm_encoder *encoder)

{

	rcar_du_encoder_enable(encoder);

}



static void rcar_du_encoder_mode_set(struct drm_encoder *encoder,

static void rcar_du_encoder_mode_set(struct drm_encoder *encoder,

				     struct drm_display_mode *mode,

				     struct drm_display_mode *mode,

				     struct drm_display_mode *adjusted_mode)

				     struct drm_display_mode *adjusted_mode)
@@ -140,8 +130,6 @@ static void rcar_du_encoder_mode_set(struct drm_encoder *encoder, 
static const struct drm_encoder_helper_funcs encoder_helper_funcs = {

static const struct drm_encoder_helper_funcs encoder_helper_funcs = {

	.dpms = rcar_du_encoder_dpms,

	.dpms = rcar_du_encoder_dpms,

	.mode_fixup = rcar_du_encoder_mode_fixup,

	.mode_fixup = rcar_du_encoder_mode_fixup,

	.prepare = rcar_du_encoder_mode_prepare,

	.commit = rcar_du_encoder_mode_commit,

	.mode_set = rcar_du_encoder_mode_set,

	.mode_set = rcar_du_encoder_mode_set,

	.disable = rcar_du_encoder_disable,

	.disable = rcar_du_encoder_disable,

	.enable = rcar_du_encoder_enable,

	.enable = rcar_du_encoder_enable,

drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -96,16 +96,6 @@ static bool rcar_du_hdmienc_mode_fixup(struct drm_encoder *encoder, 
	return sfuncs->mode_fixup(encoder, mode, adjusted_mode);

	return sfuncs->mode_fixup(encoder, mode, adjusted_mode);

}

}





static void rcar_du_hdmienc_mode_prepare(struct drm_encoder *encoder)

{

	rcar_du_hdmienc_dpms(encoder, DRM_MODE_DPMS_OFF);

}



static void rcar_du_hdmienc_mode_commit(struct drm_encoder *encoder)

{

	rcar_du_hdmienc_dpms(encoder, DRM_MODE_DPMS_ON);

}



static void rcar_du_hdmienc_mode_set(struct drm_encoder *encoder,

static void rcar_du_hdmienc_mode_set(struct drm_encoder *encoder,

				     struct drm_display_mode *mode,

				     struct drm_display_mode *mode,

				     struct drm_display_mode *adjusted_mode)

				     struct drm_display_mode *adjusted_mode)
@@ -122,8 +112,6 @@ static void rcar_du_hdmienc_mode_set(struct drm_encoder *encoder, 
static const struct drm_encoder_helper_funcs encoder_helper_funcs = {

static const struct drm_encoder_helper_funcs encoder_helper_funcs = {

	.dpms = rcar_du_hdmienc_dpms,

	.dpms = rcar_du_hdmienc_dpms,

	.mode_fixup = rcar_du_hdmienc_mode_fixup,

	.mode_fixup = rcar_du_hdmienc_mode_fixup,

	.prepare = rcar_du_hdmienc_mode_prepare,

	.commit = rcar_du_hdmienc_mode_commit,

	.mode_set = rcar_du_hdmienc_mode_set,

	.mode_set = rcar_du_hdmienc_mode_set,

	.disable = rcar_du_hdmienc_disable,

	.disable = rcar_du_hdmienc_disable,

	.enable = rcar_du_hdmienc_enable,

	.enable = rcar_du_hdmienc_enable,