Skip to content

Commit ff446c0

Browse files
panghu-xinleiChun-Kuang Hu
authored andcommitted
drm/mediatek: Modify dpi power on/off sequence.
Modify dpi power on/off sequence so that the first gpio operation will take effect. Fixes: 6bd4763 ("drm/mediatek: set dpi pin mode to gpio low to avoid leakage current") Signed-off-by: Xinlei Lee <[email protected]> Signed-off-by: Chun-Kuang Hu <[email protected]>
1 parent 9abf231 commit ff446c0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/gpu/drm/mediatek/mtk_dpi.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,6 @@ static void mtk_dpi_power_off(struct mtk_dpi *dpi)
461461
if (--dpi->refcount != 0)
462462
return;
463463

464-
if (dpi->pinctrl && dpi->pins_gpio)
465-
pinctrl_select_state(dpi->pinctrl, dpi->pins_gpio);
466-
467464
mtk_dpi_disable(dpi);
468465
clk_disable_unprepare(dpi->pixel_clk);
469466
clk_disable_unprepare(dpi->engine_clk);
@@ -488,9 +485,6 @@ static int mtk_dpi_power_on(struct mtk_dpi *dpi)
488485
goto err_pixel;
489486
}
490487

491-
if (dpi->pinctrl && dpi->pins_dpi)
492-
pinctrl_select_state(dpi->pinctrl, dpi->pins_dpi);
493-
494488
return 0;
495489

496490
err_pixel:
@@ -721,12 +715,18 @@ static void mtk_dpi_bridge_disable(struct drm_bridge *bridge)
721715
struct mtk_dpi *dpi = bridge_to_dpi(bridge);
722716

723717
mtk_dpi_power_off(dpi);
718+
719+
if (dpi->pinctrl && dpi->pins_gpio)
720+
pinctrl_select_state(dpi->pinctrl, dpi->pins_gpio);
724721
}
725722

726723
static void mtk_dpi_bridge_enable(struct drm_bridge *bridge)
727724
{
728725
struct mtk_dpi *dpi = bridge_to_dpi(bridge);
729726

727+
if (dpi->pinctrl && dpi->pins_dpi)
728+
pinctrl_select_state(dpi->pinctrl, dpi->pins_dpi);
729+
730730
mtk_dpi_power_on(dpi);
731731
mtk_dpi_set_display_mode(dpi, &dpi->mode);
732732
mtk_dpi_enable(dpi);

0 commit comments

Comments
 (0)