.. | .. |
---|
367 | 367 | if (--dpi->refcount != 0) |
---|
368 | 368 | return; |
---|
369 | 369 | |
---|
370 | | - if (dpi->pinctrl && dpi->pins_gpio) |
---|
371 | | - pinctrl_select_state(dpi->pinctrl, dpi->pins_gpio); |
---|
372 | | - |
---|
373 | 370 | mtk_dpi_disable(dpi); |
---|
374 | 371 | clk_disable_unprepare(dpi->pixel_clk); |
---|
375 | 372 | clk_disable_unprepare(dpi->engine_clk); |
---|
.. | .. |
---|
393 | 390 | dev_err(dpi->dev, "Failed to enable pixel clock: %d\n", ret); |
---|
394 | 391 | goto err_pixel; |
---|
395 | 392 | } |
---|
396 | | - |
---|
397 | | - if (dpi->pinctrl && dpi->pins_dpi) |
---|
398 | | - pinctrl_select_state(dpi->pinctrl, dpi->pins_dpi); |
---|
399 | 393 | |
---|
400 | 394 | return 0; |
---|
401 | 395 | |
---|
.. | .. |
---|
525 | 519 | struct mtk_dpi *dpi = bridge_to_dpi(bridge); |
---|
526 | 520 | |
---|
527 | 521 | mtk_dpi_power_off(dpi); |
---|
| 522 | + |
---|
| 523 | + if (dpi->pinctrl && dpi->pins_gpio) |
---|
| 524 | + pinctrl_select_state(dpi->pinctrl, dpi->pins_gpio); |
---|
528 | 525 | } |
---|
529 | 526 | |
---|
530 | 527 | static void mtk_dpi_bridge_enable(struct drm_bridge *bridge) |
---|
531 | 528 | { |
---|
532 | 529 | struct mtk_dpi *dpi = bridge_to_dpi(bridge); |
---|
533 | 530 | |
---|
| 531 | + if (dpi->pinctrl && dpi->pins_dpi) |
---|
| 532 | + pinctrl_select_state(dpi->pinctrl, dpi->pins_dpi); |
---|
| 533 | + |
---|
534 | 534 | mtk_dpi_power_on(dpi); |
---|
535 | 535 | mtk_dpi_set_display_mode(dpi, &dpi->mode); |
---|
536 | 536 | mtk_dpi_enable(dpi); |
---|