fd938b4ce0
[ Upstream commit 90144dd8b0d137d9e78ef34b3c418e51a49299ad ]
As the comment right before the mtk_dsi_stop() call advises,
mtk_dsi_stop() should only be called after
mtk_drm_crtc_atomic_disable(). That's because that function calls
drm_crtc_wait_one_vblank(), which requires the vblank irq to be enabled.
Previously mtk_dsi_stop(), being in mtk_dsi_poweroff() and guarded by a
refcount, would only be called at the end of
mtk_drm_crtc_atomic_disable(), through the call to mtk_crtc_ddp_hw_fini().
Commit cde7e2e35c28 ("drm/mediatek: Separate poweron/poweroff from
enable/disable and define new funcs") moved the mtk_dsi_stop() call to
mtk_output_dsi_disable(), causing it to be called before
mtk_drm_crtc_atomic_disable(), and consequently generating vblank
timeout warnings during suspend.
Move the mtk_dsi_stop() call back to mtk_dsi_poweroff() so that we have
a working vblank irq during mtk_drm_crtc_atomic_disable() and stop
getting vblank timeout warnings.
Fixes: cde7e2e35c28 ("drm/mediatek: Separate poweron/poweroff from enable/disable and define new funcs")
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Tested-by: Hsin-Yi Wang <hsinyi@chromium.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com>
Link: http://lists.infradead.org/pipermail/linux-mediatek/2022-August/046713.html
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
|
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| mtk_cec.c | ||
| mtk_cec.h | ||
| mtk_disp_color.c | ||
| mtk_disp_ovl.c | ||
| mtk_disp_rdma.c | ||
| mtk_dpi.c | ||
| mtk_dpi_regs.h | ||
| mtk_drm_crtc.c | ||
| mtk_drm_crtc.h | ||
| mtk_drm_ddp.c | ||
| mtk_drm_ddp.h | ||
| mtk_drm_ddp_comp.c | ||
| mtk_drm_ddp_comp.h | ||
| mtk_drm_drv.c | ||
| mtk_drm_drv.h | ||
| mtk_drm_gem.c | ||
| mtk_drm_gem.h | ||
| mtk_drm_plane.c | ||
| mtk_drm_plane.h | ||
| mtk_dsi.c | ||
| mtk_hdmi.c | ||
| mtk_hdmi.h | ||
| mtk_hdmi_ddc.c | ||
| mtk_hdmi_regs.h | ||
| mtk_mipi_tx.c | ||
| mtk_mipi_tx.h | ||
| mtk_mt8173_mipi_tx.c | ||
| mtk_mt8183_mipi_tx.c | ||