Commit 74056092 authored by Anitha Chrisanthus's avatar Anitha Chrisanthus Committed by Maarten Lankhorst
Browse files

drm/kmb: Enable ADV bridge after modeset 



On KMB, ADV bridge must be programmed and powered on prior to
MIPI DSI HW initialization.

v2: changed to atomic_bridge_chain_enable (Sam)

Fixes: 98521f4d ("drm/kmb: Mipi DSI part of the display driver")
Co-developed-by: default avatarEdmund Dea <edmund.j.dea@intel.com>
Signed-off-by: default avatarEdmund Dea <edmund.j.dea@intel.com>
Signed-off-by: default avatarAnitha Chrisanthus <anitha.chrisanthus@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211019230719.789958-1-anitha.chrisanthus@intel.com


Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 004d2719

drivers/gpu/drm/kmb/kmb_crtc.c

+4 −3
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ static const struct drm_crtc_funcs kmb_crtc_funcs = { 
	.disable_vblank = kmb_crtc_disable_vblank,

};



static void kmb_crtc_set_mode(struct drm_crtc *crtc)

static void kmb_crtc_set_mode(struct drm_crtc *crtc,

			      struct drm_atomic_state *old_state)

{

	struct drm_device *dev = crtc->dev;

	struct drm_display_mode *m = &crtc->state->adjusted_mode;
@@ -75,7 +76,7 @@ static void kmb_crtc_set_mode(struct drm_crtc *crtc) 
	unsigned int val = 0;



	/* Initialize mipi */

	kmb_dsi_mode_set(kmb->kmb_dsi, m, kmb->sys_clk_mhz);

	kmb_dsi_mode_set(kmb->kmb_dsi, m, kmb->sys_clk_mhz, old_state);

	drm_info(dev,

		 "vfp= %d vbp= %d vsync_len=%d hfp=%d hbp=%d hsync_len=%d\n",

		 m->crtc_vsync_start - m->crtc_vdisplay,
@@ -138,7 +139,7 @@ static void kmb_crtc_atomic_enable(struct drm_crtc *crtc, 
	struct kmb_drm_private *kmb = crtc_to_kmb_priv(crtc);



	clk_prepare_enable(kmb->kmb_clk.clk_lcd);

	kmb_crtc_set_mode(crtc);

	kmb_crtc_set_mode(crtc, state);

	drm_crtc_vblank_on(crtc);

}

drivers/gpu/drm/kmb/kmb_dsi.c

+5 −4
Original line number Diff line number Diff line
@@ -1331,7 +1331,8 @@ static u32 mipi_tx_init_dphy(struct kmb_dsi *kmb_dsi, 
	return 0;

}



static void connect_lcd_to_mipi(struct kmb_dsi *kmb_dsi)

static void connect_lcd_to_mipi(struct kmb_dsi *kmb_dsi,

				struct drm_atomic_state *old_state)

{

	struct regmap *msscam;
@@ -1340,7 +1341,7 @@ static void connect_lcd_to_mipi(struct kmb_dsi *kmb_dsi) 
		dev_dbg(kmb_dsi->dev, "failed to get msscam syscon");

		return;

	}



	drm_atomic_bridge_chain_enable(adv_bridge, old_state);

	/* DISABLE MIPI->CIF CONNECTION */

	regmap_write(msscam, MSS_MIPI_CIF_CFG, 0);
@@ -1351,7 +1352,7 @@ static void connect_lcd_to_mipi(struct kmb_dsi *kmb_dsi) 
}



int kmb_dsi_mode_set(struct kmb_dsi *kmb_dsi, struct drm_display_mode *mode,

		     int sys_clk_mhz)

		     int sys_clk_mhz, struct drm_atomic_state *old_state)

{

	u64 data_rate;
@@ -1399,7 +1400,7 @@ int kmb_dsi_mode_set(struct kmb_dsi *kmb_dsi, struct drm_display_mode *mode, 
	/* Dphy initialization */

	mipi_tx_init_dphy(kmb_dsi, &mipi_tx_init_cfg);



	connect_lcd_to_mipi(kmb_dsi);

	connect_lcd_to_mipi(kmb_dsi, old_state);

	dev_info(kmb_dsi->dev, "mipi hw initialized");



	return 0;

drivers/gpu/drm/kmb/kmb_dsi.h

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ int kmb_dsi_host_bridge_init(struct device *dev); 
struct kmb_dsi *kmb_dsi_init(struct platform_device *pdev);

void kmb_dsi_host_unregister(struct kmb_dsi *kmb_dsi);

int kmb_dsi_mode_set(struct kmb_dsi *kmb_dsi, struct drm_display_mode *mode,

		     int sys_clk_mhz);

		     int sys_clk_mhz, struct drm_atomic_state *old_state);

int kmb_dsi_map_mmio(struct kmb_dsi *kmb_dsi);

int kmb_dsi_clk_init(struct kmb_dsi *kmb_dsi);

int kmb_dsi_encoder_init(struct drm_device *dev, struct kmb_dsi *kmb_dsi);