Skip to content

Commit ce4bc5c

Browse files
committed
drm/bridge: cdns-dsi: Use video mode and clean up cdns_dsi_mode2cfg()
The driver does all the calculations and programming with video timings (hftp, hbp, etc.) instead of the modeline values (hsync_start, ...). Thus it makes sense to use struct videomode instead of struct drm_display_mode internally. Switch to videomode and do some cleanups in cdns_dsi_mode2cfg() along the way. Tested-by: Parth Pancholi <parth.pancholi@toradex.com> Reviewed-by: Aradhya Bhatia <aradhya.bhatia@linux.dev> Tested-by: Jayesh Choudhary <j-choudhary@ti.com> Reviewed-by: Devarsh Thakkar <devarsht@ti.com> Link: https://lore.kernel.org/r/20250723-cdns-dsi-impro-v5-12-e61cc06074c2@ideasonboard.com Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
1 parent eea4f89 commit ce4bc5c

1 file changed

Lines changed: 24 additions & 21 deletions

File tree

drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <drm/drm_drv.h>
1010
#include <drm/drm_probe_helper.h>
1111
#include <video/mipi_display.h>
12+
#include <video/videomode.h>
1213

1314
#include <linux/clk.h>
1415
#include <linux/interrupt.h>
@@ -467,36 +468,35 @@ static unsigned int dpi_to_dsi_timing(unsigned int dpi_timing,
467468
}
468469

469470
static int cdns_dsi_mode2cfg(struct cdns_dsi *dsi,
470-
const struct drm_display_mode *mode,
471+
const struct videomode *vm,
471472
struct cdns_dsi_cfg *dsi_cfg)
472473
{
473474
struct cdns_dsi_output *output = &dsi->output;
474-
unsigned int tmp;
475-
bool sync_pulse = false;
475+
u32 dpi_hsa, dpi_hbp, dpi_hfp, dpi_hact;
476+
bool sync_pulse;
476477
int bpp;
477478

479+
dpi_hsa = vm->hsync_len;
480+
dpi_hbp = vm->hback_porch;
481+
dpi_hfp = vm->hfront_porch;
482+
dpi_hact = vm->hactive;
483+
478484
memset(dsi_cfg, 0, sizeof(*dsi_cfg));
479485

480-
if (output->dev->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE)
481-
sync_pulse = true;
486+
sync_pulse = output->dev->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
482487

483488
bpp = mipi_dsi_pixel_format_to_bpp(output->dev->format);
484489

485-
tmp = mode->htotal -
486-
(sync_pulse ? mode->hsync_end : mode->hsync_start);
490+
dsi_cfg->hbp = dpi_to_dsi_timing(dpi_hbp + (sync_pulse ? 0 : dpi_hsa),
491+
bpp, DSI_HBP_FRAME_OVERHEAD);
487492

488-
dsi_cfg->hbp = dpi_to_dsi_timing(tmp, bpp, DSI_HBP_FRAME_OVERHEAD);
493+
if (sync_pulse)
494+
dsi_cfg->hsa =
495+
dpi_to_dsi_timing(dpi_hsa, bpp, DSI_HSA_FRAME_OVERHEAD);
489496

490-
if (sync_pulse) {
491-
tmp = mode->hsync_end - mode->hsync_start;
497+
dsi_cfg->hact = dpi_to_dsi_timing(dpi_hact, bpp, 0);
492498

493-
dsi_cfg->hsa = dpi_to_dsi_timing(tmp, bpp,
494-
DSI_HSA_FRAME_OVERHEAD);
495-
}
496-
497-
dsi_cfg->hact = dpi_to_dsi_timing(mode->hdisplay, bpp, 0);
498-
dsi_cfg->hfp = dpi_to_dsi_timing(mode->hsync_start - mode->hdisplay,
499-
bpp, DSI_HFP_FRAME_OVERHEAD);
499+
dsi_cfg->hfp = dpi_to_dsi_timing(dpi_hfp, bpp, DSI_HFP_FRAME_OVERHEAD);
500500

501501
dsi_cfg->htotal = dsi_cfg->hbp + DSI_HBP_FRAME_OVERHEAD;
502502
if (output->dev->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE)
@@ -509,19 +509,19 @@ static int cdns_dsi_mode2cfg(struct cdns_dsi *dsi,
509509
}
510510

511511
static int cdns_dsi_check_conf(struct cdns_dsi *dsi,
512-
const struct drm_display_mode *mode,
512+
const struct videomode *vm,
513513
struct cdns_dsi_cfg *dsi_cfg)
514514
{
515515
struct cdns_dsi_output *output = &dsi->output;
516516
struct phy_configure_opts_mipi_dphy *phy_cfg = &output->phy_opts.mipi_dphy;
517517
unsigned int nlanes = output->dev->lanes;
518518
int ret;
519519

520-
ret = cdns_dsi_mode2cfg(dsi, mode, dsi_cfg);
520+
ret = cdns_dsi_mode2cfg(dsi, vm, dsi_cfg);
521521
if (ret)
522522
return ret;
523523

524-
ret = phy_mipi_dphy_get_default_config(mode->clock * 1000,
524+
ret = phy_mipi_dphy_get_default_config(vm->pixelclock,
525525
mipi_dsi_pixel_format_to_bpp(output->dev->format),
526526
nlanes, phy_cfg);
527527
if (ret)
@@ -916,12 +916,15 @@ static int cdns_dsi_bridge_atomic_check(struct drm_bridge *bridge,
916916
struct cdns_dsi_bridge_state *dsi_state = to_cdns_dsi_bridge_state(bridge_state);
917917
struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;
918918
struct cdns_dsi_cfg *dsi_cfg = &dsi_state->dsi_cfg;
919+
struct videomode vm;
919920

920921
/* cdns-dsi requires negative syncs */
921922
adjusted_mode->flags &= ~(DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC);
922923
adjusted_mode->flags |= DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC;
923924

924-
return cdns_dsi_check_conf(dsi, adjusted_mode, dsi_cfg);
925+
drm_display_mode_to_videomode(adjusted_mode, &vm);
926+
927+
return cdns_dsi_check_conf(dsi, &vm, dsi_cfg);
925928
}
926929

927930
static struct drm_bridge_state *

0 commit comments

Comments
 (0)