Commit 987940f0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-for-v6.8-rc2' of... 

Merge tag 'drm-misc-fixes-for-v6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-fixes

One regression fixup to samsung-dsim.c module
- The FORCE_STOP_STATE bit is ineffective for forcing DSI link into LP-11 mode,
  causing timing issues and potential bridge failures.
  This patch reverts previous commits and corrects this issue.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240126141130.15512-1-inki.dae@samsung.com
parents 4d7acc8f ff3d5d04

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

+2 −30
Original line number Diff line number Diff line
@@ -969,10 +969,6 @@ static int samsung_dsim_init_link(struct samsung_dsim *dsi) 
	reg = samsung_dsim_read(dsi, DSIM_ESCMODE_REG);

	reg &= ~DSIM_STOP_STATE_CNT_MASK;

	reg |= DSIM_STOP_STATE_CNT(driver_data->reg_values[STOP_STATE_CNT]);



	if (!samsung_dsim_hw_is_exynos(dsi->plat_data->hw_type))

		reg |= DSIM_FORCE_STOP_STATE;



	samsung_dsim_write(dsi, DSIM_ESCMODE_REG, reg);



	reg = DSIM_BTA_TIMEOUT(0xff) | DSIM_LPDR_TIMEOUT(0xffff);
@@ -1431,18 +1427,6 @@ static void samsung_dsim_disable_irq(struct samsung_dsim *dsi) 
	disable_irq(dsi->irq);

}



static void samsung_dsim_set_stop_state(struct samsung_dsim *dsi, bool enable)

{

	u32 reg = samsung_dsim_read(dsi, DSIM_ESCMODE_REG);



	if (enable)

		reg |= DSIM_FORCE_STOP_STATE;

	else

		reg &= ~DSIM_FORCE_STOP_STATE;



	samsung_dsim_write(dsi, DSIM_ESCMODE_REG, reg);

}



static int samsung_dsim_init(struct samsung_dsim *dsi)

{

	const struct samsung_dsim_driver_data *driver_data = dsi->driver_data;
@@ -1492,9 +1476,6 @@ static void samsung_dsim_atomic_pre_enable(struct drm_bridge *bridge, 
		ret = samsung_dsim_init(dsi);

		if (ret)

			return;



		samsung_dsim_set_display_mode(dsi);

		samsung_dsim_set_display_enable(dsi, true);

	}

}
@@ -1503,12 +1484,8 @@ static void samsung_dsim_atomic_enable(struct drm_bridge *bridge, 
{

	struct samsung_dsim *dsi = bridge_to_dsi(bridge);



	if (samsung_dsim_hw_is_exynos(dsi->plat_data->hw_type)) {

	samsung_dsim_set_display_mode(dsi);

	samsung_dsim_set_display_enable(dsi, true);

	} else {

		samsung_dsim_set_stop_state(dsi, false);

	}



	dsi->state |= DSIM_STATE_VIDOUT_AVAILABLE;

}
@@ -1521,9 +1498,6 @@ static void samsung_dsim_atomic_disable(struct drm_bridge *bridge, 
	if (!(dsi->state & DSIM_STATE_ENABLED))

		return;



	if (!samsung_dsim_hw_is_exynos(dsi->plat_data->hw_type))

		samsung_dsim_set_stop_state(dsi, true);



	dsi->state &= ~DSIM_STATE_VIDOUT_AVAILABLE;

}
@@ -1828,8 +1802,6 @@ static ssize_t samsung_dsim_host_transfer(struct mipi_dsi_host *host, 
	if (ret)

		return ret;



	samsung_dsim_set_stop_state(dsi, false);



	ret = mipi_dsi_create_packet(&xfer.packet, msg);

	if (ret < 0)

		return ret;