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

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

drm: rcar-du: Replace encoder mode_fixup with atomic_check 



The encoder .mode_fixup() operation is legacy, atomic updates uses the
new .atomic_check() operation. Convert the encoders drivers.

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

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

+12 −23
Original line number Diff line number Diff line
@@ -58,35 +58,24 @@ static void rcar_du_encoder_enable(struct drm_encoder *encoder) 
		rcar_du_lvdsenc_enable(renc->lvds, encoder->crtc, true);

}



static bool rcar_du_encoder_mode_fixup(struct drm_encoder *encoder,

				       const struct drm_display_mode *mode,

				       struct drm_display_mode *adjusted_mode)

static int rcar_du_encoder_atomic_check(struct drm_encoder *encoder,

					struct drm_crtc_state *crtc_state,

					struct drm_connector_state *conn_state)

{

	struct rcar_du_encoder *renc = to_rcar_encoder(encoder);

	struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;

	const struct drm_display_mode *mode = &crtc_state->mode;

	const struct drm_display_mode *panel_mode;

	struct drm_connector *connector = conn_state->connector;

	struct drm_device *dev = encoder->dev;

	struct drm_connector *connector;

	bool found = false;



	/* DAC encoders have currently no restriction on the mode. */

	if (encoder->encoder_type == DRM_MODE_ENCODER_DAC)

		return true;



	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

		if (connector->encoder == encoder) {

			found = true;

			break;

		}

	}



	if (!found) {

		dev_dbg(dev->dev, "mode_fixup: no connector found\n");

		return false;

	}

		return 0;



	if (list_empty(&connector->modes)) {

		dev_dbg(dev->dev, "mode_fixup: empty modes list\n");

		return false;

		dev_dbg(dev->dev, "encoder: empty modes list\n");

		return -EINVAL;

	}



	panel_mode = list_first_entry(&connector->modes,
@@ -95,7 +84,7 @@ static bool rcar_du_encoder_mode_fixup(struct drm_encoder *encoder, 
	/* We're not allowed to modify the resolution. */

	if (mode->hdisplay != panel_mode->hdisplay ||

	    mode->vdisplay != panel_mode->vdisplay)

		return false;

		return -EINVAL;



	/* The flat panel mode is fixed, just copy it to the adjusted mode. */

	drm_mode_copy(adjusted_mode, panel_mode);
@@ -107,7 +96,7 @@ static bool rcar_du_encoder_mode_fixup(struct drm_encoder *encoder, 
		adjusted_mode->clock = clamp(adjusted_mode->clock,

					     30000, 150000);



	return true;

	return 0;

}



static void rcar_du_encoder_mode_set(struct drm_encoder *encoder,
@@ -120,10 +109,10 @@ static void rcar_du_encoder_mode_set(struct drm_encoder *encoder, 
}



static const struct drm_encoder_helper_funcs encoder_helper_funcs = {

	.mode_fixup = rcar_du_encoder_mode_fixup,

	.mode_set = rcar_du_encoder_mode_set,

	.disable = rcar_du_encoder_disable,

	.enable = rcar_du_encoder_enable,

	.atomic_check = rcar_du_encoder_atomic_check,

};



static const struct drm_encoder_funcs encoder_funcs = {

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

+8 −6
Original line number Diff line number Diff line
@@ -62,12 +62,14 @@ static void rcar_du_hdmienc_enable(struct drm_encoder *encoder) 
	hdmienc->enabled = true;

}



static bool rcar_du_hdmienc_mode_fixup(struct drm_encoder *encoder,

				       const struct drm_display_mode *mode,

				       struct drm_display_mode *adjusted_mode)

static int rcar_du_hdmienc_atomic_check(struct drm_encoder *encoder,

					struct drm_crtc_state *crtc_state,

					struct drm_connector_state *conn_state)

{

	struct rcar_du_hdmienc *hdmienc = to_rcar_hdmienc(encoder);

	struct drm_encoder_slave_funcs *sfuncs = to_slave_funcs(encoder);

	struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;

	const struct drm_display_mode *mode = &crtc_state->mode;



	/* The internal LVDS encoder has a clock frequency operating range of

	 * 30MHz to 150MHz. Clamp the clock accordingly.
@@ -77,9 +79,9 @@ static bool rcar_du_hdmienc_mode_fixup(struct drm_encoder *encoder, 
					     30000, 150000);



	if (sfuncs->mode_fixup == NULL)

		return true;

		return 0;



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

	return sfuncs->mode_fixup(encoder, mode, adjusted_mode) ? 0 : -EINVAL;

}



static void rcar_du_hdmienc_mode_set(struct drm_encoder *encoder,
@@ -96,10 +98,10 @@ static void rcar_du_hdmienc_mode_set(struct drm_encoder *encoder, 
}



static const struct drm_encoder_helper_funcs encoder_helper_funcs = {

	.mode_fixup = rcar_du_hdmienc_mode_fixup,

	.mode_set = rcar_du_hdmienc_mode_set,

	.disable = rcar_du_hdmienc_disable,

	.enable = rcar_du_hdmienc_enable,

	.atomic_check = rcar_du_hdmienc_atomic_check,

};



static void rcar_du_hdmienc_cleanup(struct drm_encoder *encoder)