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

Commit eb10d635 authored by Steve Longerbeam's avatar Steve Longerbeam Committed by Philipp Zabel
Browse files

imx-drm: encoder prepare/mode_set must use adjusted mode 



The encoder ->prepare() and ->mode_set() methods need to use the
hw adjusted mode, not the original mode.

Signed-off-by: default avatarSteve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 0c460a55

drivers/gpu/drm/bridge/dw_hdmi.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1341,8 +1341,8 @@ static void dw_hdmi_poweroff(struct dw_hdmi *hdmi) 
}

}





static void dw_hdmi_bridge_mode_set(struct drm_bridge *bridge,

static void dw_hdmi_bridge_mode_set(struct drm_bridge *bridge,

				    struct drm_display_mode *mode,

				    struct drm_display_mode *orig_mode,

				    struct drm_display_mode *adjusted_mode)

				    struct drm_display_mode *mode)

{

{

	struct dw_hdmi *hdmi = bridge->driver_private;

	struct dw_hdmi *hdmi = bridge->driver_private;

drivers/gpu/drm/imx/imx-ldb.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -163,7 +163,7 @@ static void imx_ldb_encoder_prepare(struct drm_encoder *encoder) 
{

{

	struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);

	struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);

	struct imx_ldb *ldb = imx_ldb_ch->ldb;

	struct imx_ldb *ldb = imx_ldb_ch->ldb;

	struct drm_display_mode *mode = &encoder->crtc->mode;

	struct drm_display_mode *mode = &encoder->crtc->hwmode;

	u32 pixel_fmt;

	u32 pixel_fmt;

	unsigned long serial_clk;

	unsigned long serial_clk;

	unsigned long di_clk = mode->clock * 1000;

	unsigned long di_clk = mode->clock * 1000;
@@ -241,8 +241,8 @@ static void imx_ldb_encoder_commit(struct drm_encoder *encoder) 
}

}





static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder,

static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder,

			 struct drm_display_mode *mode,

			 struct drm_display_mode *orig_mode,

			 struct drm_display_mode *adjusted_mode)

			 struct drm_display_mode *mode)

{

{

	struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);

	struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);

	struct imx_ldb *ldb = imx_ldb_ch->ldb;

	struct imx_ldb *ldb = imx_ldb_ch->ldb;

drivers/gpu/drm/imx/imx-tve.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -307,8 +307,8 @@ static void imx_tve_encoder_prepare(struct drm_encoder *encoder) 
}

}





static void imx_tve_encoder_mode_set(struct drm_encoder *encoder,

static void imx_tve_encoder_mode_set(struct drm_encoder *encoder,

				     struct drm_display_mode *mode,

				     struct drm_display_mode *orig_mode,

				     struct drm_display_mode *adjusted_mode)

				     struct drm_display_mode *mode)

{

{

	struct imx_tve *tve = enc_to_tve(encoder);

	struct imx_tve *tve = enc_to_tve(encoder);

	unsigned long rounded_rate;

	unsigned long rounded_rate;

drivers/gpu/drm/imx/parallel-display.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -130,8 +130,8 @@ static void imx_pd_encoder_commit(struct drm_encoder *encoder) 
}

}





static void imx_pd_encoder_mode_set(struct drm_encoder *encoder,

static void imx_pd_encoder_mode_set(struct drm_encoder *encoder,

			 struct drm_display_mode *mode,

			 struct drm_display_mode *orig_mode,

			 struct drm_display_mode *adjusted_mode)

			 struct drm_display_mode *mode)

{

{

}

}