Skip to content

Commit 4d24412

Browse files
Kaustabh Chakrabortydaeinki
authored andcommitted
drm/bridge: samsung-dsim: allow configuring the MAIN_VSA offset
The MAIN_VSA offset of DSIM_MSYNC is hardcoded to a 22-bit offset, but Exynos7870's DSIM has it in a 16-bit offset as per the downstream kernel sources. In order to support both, move this offset 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>
1 parent f6ba4c1 commit 4d24412

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@
125125
#define DSIM_MAIN_HBP_MASK ((0xffff) << 0)
126126

127127
/* DSIM_MSYNC */
128-
#define DSIM_MAIN_VSA(x) ((x) << 22)
128+
#define DSIM_MAIN_VSA(x, offset) ((x) << offset)
129129
#define DSIM_MAIN_HSA(x) ((x) << 0)
130-
#define DSIM_MAIN_VSA_MASK ((0x3ff) << 22)
130+
#define DSIM_MAIN_VSA_MASK(offset) ((0x3ff) << offset)
131131
#define DSIM_MAIN_HSA_MASK ((0xffff) << 0)
132132

133133
/* DSIM_SDRESOL */
@@ -423,6 +423,7 @@ static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = {
423423
.lane_esc_clk_bit = 19,
424424
.lane_esc_data_offset = 20,
425425
.pll_p_offset = 13,
426+
.main_vsa_offset = 22,
426427
.reg_values = reg_values,
427428
.pll_fin_min = 6,
428429
.pll_fin_max = 12,
@@ -449,6 +450,7 @@ static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = {
449450
.lane_esc_clk_bit = 19,
450451
.lane_esc_data_offset = 20,
451452
.pll_p_offset = 13,
453+
.main_vsa_offset = 22,
452454
.reg_values = reg_values,
453455
.pll_fin_min = 6,
454456
.pll_fin_max = 12,
@@ -473,6 +475,7 @@ static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = {
473475
.lane_esc_clk_bit = 19,
474476
.lane_esc_data_offset = 20,
475477
.pll_p_offset = 13,
478+
.main_vsa_offset = 22,
476479
.reg_values = reg_values,
477480
.pll_fin_min = 6,
478481
.pll_fin_max = 12,
@@ -497,6 +500,7 @@ static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = {
497500
.lane_esc_clk_bit = 19,
498501
.lane_esc_data_offset = 20,
499502
.pll_p_offset = 13,
503+
.main_vsa_offset = 22,
500504
.reg_values = exynos5433_reg_values,
501505
.pll_fin_min = 6,
502506
.pll_fin_max = 12,
@@ -521,6 +525,7 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = {
521525
.lane_esc_clk_bit = 19,
522526
.lane_esc_data_offset = 20,
523527
.pll_p_offset = 13,
528+
.main_vsa_offset = 22,
524529
.reg_values = exynos5422_reg_values,
525530
.pll_fin_min = 6,
526531
.pll_fin_max = 12,
@@ -549,6 +554,7 @@ static const struct samsung_dsim_driver_data imx8mm_dsi_driver_data = {
549554
* downstream driver - drivers/gpu/drm/bridge/sec-dsim.c
550555
*/
551556
.pll_p_offset = 14,
557+
.main_vsa_offset = 22,
552558
.reg_values = imx8mm_dsim_reg_values,
553559
.pll_fin_min = 2,
554560
.pll_fin_max = 30,
@@ -1041,6 +1047,7 @@ static void samsung_dsim_set_display_mode(struct samsung_dsim *dsi)
10411047
{
10421048
struct drm_display_mode *m = &dsi->mode;
10431049
unsigned int num_bits_resol = dsi->driver_data->num_bits_resol;
1050+
unsigned int main_vsa_offset = dsi->driver_data->main_vsa_offset;
10441051
u32 reg;
10451052

10461053
if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO) {
@@ -1067,7 +1074,7 @@ static void samsung_dsim_set_display_mode(struct samsung_dsim *dsi)
10671074
reg = DSIM_MAIN_HFP(hfp) | DSIM_MAIN_HBP(hbp);
10681075
samsung_dsim_write(dsi, DSIM_MHPORCH_REG, reg);
10691076

1070-
reg = DSIM_MAIN_VSA(m->vsync_end - m->vsync_start)
1077+
reg = DSIM_MAIN_VSA(m->vsync_end - m->vsync_start, main_vsa_offset)
10711078
| DSIM_MAIN_HSA(hsa);
10721079
samsung_dsim_write(dsi, DSIM_MSYNC_REG, reg);
10731080
}

include/drm/bridge/samsung-dsim.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ struct samsung_dsim_driver_data {
7070
unsigned int lane_esc_clk_bit;
7171
unsigned int lane_esc_data_offset;
7272
unsigned int pll_p_offset;
73+
unsigned int main_vsa_offset;
7374
const unsigned int *reg_values;
7475
unsigned int pll_fin_min;
7576
unsigned int pll_fin_max;

0 commit comments

Comments
 (0)