Skip to content

Commit 3b2a999

Browse files
Liu YingpH5
authored andcommitted
drm/imx: imx-ldb: Disable both channels for split mode in enc->disable()
Both of the two LVDS channels should be disabled for split mode in the encoder's ->disable() callback, because they are enabled in the encoder's ->enable() callback. Fixes: 6556f7f ("drm: imx: Move imx-drm driver out of staging") Cc: Philipp Zabel <[email protected]> Cc: Sascha Hauer <[email protected]> Cc: Pengutronix Kernel Team <[email protected]> Cc: NXP Linux Team <[email protected]> Cc: <[email protected]> Signed-off-by: Liu Ying <[email protected]> Signed-off-by: Philipp Zabel <[email protected]>
1 parent 853fe4f commit 3b2a999

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/gpu/drm/imx/imx-ldb.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,18 +296,19 @@ static void imx_ldb_encoder_disable(struct drm_encoder *encoder)
296296
{
297297
struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);
298298
struct imx_ldb *ldb = imx_ldb_ch->ldb;
299+
int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
299300
int mux, ret;
300301

301302
drm_panel_disable(imx_ldb_ch->panel);
302303

303-
if (imx_ldb_ch == &ldb->channel[0])
304+
if (imx_ldb_ch == &ldb->channel[0] || dual)
304305
ldb->ldb_ctrl &= ~LDB_CH0_MODE_EN_MASK;
305-
else if (imx_ldb_ch == &ldb->channel[1])
306+
if (imx_ldb_ch == &ldb->channel[1] || dual)
306307
ldb->ldb_ctrl &= ~LDB_CH1_MODE_EN_MASK;
307308

308309
regmap_write(ldb->regmap, IOMUXC_GPR2, ldb->ldb_ctrl);
309310

310-
if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) {
311+
if (dual) {
311312
clk_disable_unprepare(ldb->clk[0]);
312313
clk_disable_unprepare(ldb->clk[1]);
313314
}

0 commit comments

Comments
 (0)