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

Commit e79a7dfa authored Nov 18, 2016 by Laurent Pinchart

drm: rcar-du: Switch to encoder .atomic_mode_set() helper function



The native encoder mode set helper function for atomic drivers is
.atomic_mode_set(). Replace the legacy .mode_set() implementation.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

parent 7c9dff5b

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

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -83,16 +83,16 @@ static int rcar_du_encoder_atomic_check(struct drm_encoder *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_crtc_state *crtc_state,
	struct drm_display_mode *adjusted_mode)		struct drm_connector_state *conn_state)
	{		{
	struct rcar_du_encoder *renc = to_rcar_encoder(encoder);		struct rcar_du_encoder *renc = to_rcar_encoder(encoder);

	rcar_du_crtc_route_output(encoder->crtc, renc->output);		rcar_du_crtc_route_output(crtc_state->crtc, renc->output);
	}		}

	static const struct drm_encoder_helper_funcs encoder_helper_funcs = {		static const struct drm_encoder_helper_funcs encoder_helper_funcs = {
	.mode_set = rcar_du_encoder_mode_set,		.atomic_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,
	.atomic_check = rcar_du_encoder_atomic_check,		.atomic_check = rcar_du_encoder_atomic_check,

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

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -67,16 +67,16 @@ static int rcar_du_hdmienc_atomic_check(struct drm_encoder *encoder,


	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_crtc_state *crtc_state,
	struct drm_display_mode *adjusted_mode)		struct drm_connector_state *conn_state)
	{		{
	struct rcar_du_hdmienc *hdmienc = to_rcar_hdmienc(encoder);		struct rcar_du_hdmienc *hdmienc = to_rcar_hdmienc(encoder);

	rcar_du_crtc_route_output(encoder->crtc, hdmienc->renc->output);		rcar_du_crtc_route_output(crtc_state->crtc, hdmienc->renc->output);
	}		}

	static const struct drm_encoder_helper_funcs encoder_helper_funcs = {		static const struct drm_encoder_helper_funcs encoder_helper_funcs = {
	.mode_set = rcar_du_hdmienc_mode_set,		.atomic_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,
	.atomic_check = rcar_du_hdmienc_atomic_check,		.atomic_check = rcar_du_hdmienc_atomic_check,