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: Kaustabh Chakraborty <kauschluss@disroot.org>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c
index 325acad1f577945451f06f8cdfead84874d31230..db154418e44602847ca237afae9035c8a2bbca06 100644 (file)
--- a/drivers/gpu/drm/bridge/samsung-dsim.c
+++ b/drivers/gpu/drm/bridge/samsung-dsim.c
@@ -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

diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h
index 7f6d353f34af14f156e864c624f6eb980296c32d..9d11c3e39fe532b83d4bc3d7f950645bbb8970b3 100644 (file)
--- a/include/drm/bridge/samsung-dsim.h
+++ b/include/drm/bridge/samsung-dsim.h
@@ -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;