]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/tegra: dc: Fix bad irqsave/restore in tegra_dc_finish_page_flip()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 7 Jan 2015 11:01:26 +0000 (14:01 +0300)
committerThierry Reding <treding@nvidia.com>
Tue, 27 Jan 2015 09:14:40 +0000 (10:14 +0100)
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: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
drivers/gpu/drm/tegra/dc.c

index c2ab1a2da6a330196e6e19913204d1d37c2e10a5..aca886e03b28f48b81c4eb1ae50fe4e257db7e04 100644 (file)
@@ -867,7 +867,7 @@ static void tegra_dc_finish_page_flip(struct tegra_dc *dc)
 
        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 */
        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)
        base = tegra_dc_readl(dc, DC_WINBUF_START_ADDR);
        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]) {
                drm_crtc_send_vblank_event(crtc, dc->event);