Unverified Commit d6dbefb2 authored by Kaustabh Chakraborty's avatar Kaustabh Chakraborty Committed by Inki Dae
Browse files

drm/bridge: samsung-dsim: allow configuring the VIDEO_MODE bit 



The VIDEO_MODE bit of DSIM_CONFIG is hardcoded to BIT(25), but
Exynos7870's DSIM has it in BIT(18) as per downstream kernel sources.

In order to support both, move this bit value to the driver data struct
and define it for every driver compatible. Reference the value from
there instead, in functions wherever required.

Signed-off-by: default avatarKaustabh Chakraborty <kauschluss@disroot.org>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 4d244122

drivers/gpu/drm/bridge/samsung-dsim.c

+7 −2
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
 */

#define DSIM_HSE_DISABLE_MODE		BIT(23)

#define DSIM_AUTO_MODE			BIT(24)

#define DSIM_VIDEO_MODE			BIT(25)

#define DSIM_BURST_MODE			BIT(26)

#define DSIM_SYNC_INFORM		BIT(27)

#define DSIM_EOT_DISABLE		BIT(28)
@@ -417,6 +416,7 @@ static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = { 
	.wait_for_hdr_fifo = 1,

	.wait_for_reset = 1,

	.num_bits_resol = 11,

	.video_mode_bit = 25,

	.esc_clken_bit = 28,

	.byte_clken_bit = 24,

	.tx_req_hsclk_bit = 31,
@@ -444,6 +444,7 @@ static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = { 
	.wait_for_hdr_fifo = 1,

	.wait_for_reset = 1,

	.num_bits_resol = 11,

	.video_mode_bit = 25,

	.esc_clken_bit = 28,

	.byte_clken_bit = 24,

	.tx_req_hsclk_bit = 31,
@@ -469,6 +470,7 @@ static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = { 
	.wait_for_hdr_fifo = 1,

	.wait_for_reset = 1,

	.num_bits_resol = 11,

	.video_mode_bit = 25,

	.esc_clken_bit = 28,

	.byte_clken_bit = 24,

	.tx_req_hsclk_bit = 31,
@@ -494,6 +496,7 @@ static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = { 
	.wait_for_hdr_fifo = 1,

	.wait_for_reset = 0,

	.num_bits_resol = 12,

	.video_mode_bit = 25,

	.esc_clken_bit = 28,

	.byte_clken_bit = 24,

	.tx_req_hsclk_bit = 31,
@@ -519,6 +522,7 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { 
	.wait_for_hdr_fifo = 1,

	.wait_for_reset = 1,

	.num_bits_resol = 12,

	.video_mode_bit = 25,

	.esc_clken_bit = 28,

	.byte_clken_bit = 24,

	.tx_req_hsclk_bit = 31,
@@ -544,6 +548,7 @@ static const struct samsung_dsim_driver_data imx8mm_dsi_driver_data = { 
	.wait_for_hdr_fifo = 1,

	.wait_for_reset = 0,

	.num_bits_resol = 12,

	.video_mode_bit = 25,

	.esc_clken_bit = 28,

	.byte_clken_bit = 24,

	.tx_req_hsclk_bit = 31,
@@ -952,7 +957,7 @@ static int samsung_dsim_init_link(struct samsung_dsim *dsi) 
	 * mode, otherwise it will support command mode.

	 */

	if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO) {

		reg |= DSIM_VIDEO_MODE;

		reg |= BIT(driver_data->video_mode_bit);



		/*

		 * The user manual describes that following bits are ignored in

include/drm/bridge/samsung-dsim.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ struct samsung_dsim_driver_data { 
	unsigned int wait_for_hdr_fifo;

	unsigned int wait_for_reset;

	unsigned int num_bits_resol;

	unsigned int video_mode_bit;

	unsigned int esc_clken_bit;

	unsigned int byte_clken_bit;

	unsigned int tx_req_hsclk_bit;