Commit 8643bc6d authored by Dan Carpenter's avatar Dan Carpenter Committed by Thierry Reding

drm/tegra: dc: Fix bad irqsave/restore in tegra_dc_finish_page_flip()

We can't save two values to the IRQ flags at the same time so the IRQs
are not enabled at the end.  This kind of bug is easy to miss in testing
if the function is normally called with IRQs disabled so we wouldn't
enable IRQs anyway.
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 2dafd636
...@@ -867,7 +867,7 @@ static void tegra_dc_finish_page_flip(struct tegra_dc *dc) ...@@ -867,7 +867,7 @@ static void tegra_dc_finish_page_flip(struct tegra_dc *dc)
bo = tegra_fb_get_plane(crtc->primary->fb, 0); bo = tegra_fb_get_plane(crtc->primary->fb, 0);
spin_lock_irqsave(&dc->lock, flags); spin_lock(&dc->lock);
/* check if new start address has been latched */ /* check if new start address has been latched */
tegra_dc_writel(dc, WINDOW_A_SELECT, DC_CMD_DISPLAY_WINDOW_HEADER); tegra_dc_writel(dc, WINDOW_A_SELECT, DC_CMD_DISPLAY_WINDOW_HEADER);
...@@ -875,7 +875,7 @@ static void tegra_dc_finish_page_flip(struct tegra_dc *dc) ...@@ -875,7 +875,7 @@ static void tegra_dc_finish_page_flip(struct tegra_dc *dc)
base = tegra_dc_readl(dc, DC_WINBUF_START_ADDR); base = tegra_dc_readl(dc, DC_WINBUF_START_ADDR);
tegra_dc_writel(dc, 0, DC_CMD_STATE_ACCESS); tegra_dc_writel(dc, 0, DC_CMD_STATE_ACCESS);
spin_unlock_irqrestore(&dc->lock, flags); spin_unlock(&dc->lock);
if (base == bo->paddr + crtc->primary->fb->offsets[0]) { if (base == bo->paddr + crtc->primary->fb->offsets[0]) {
drm_crtc_send_vblank_event(crtc, dc->event); drm_crtc_send_vblank_event(crtc, dc->event);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment