diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-07-08 10:16:47 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-12-08 12:18:44 +0000 |
commit | d76dcc7236b8b1b8c2c61b380e7d803d47b20ffa (patch) | |
tree | 2547d7bc9b4789963c1d9e7bbacef0e25bff8eb9 /drivers/gpu/drm/armada/armada_crtc.c | |
parent | drm/armada: clean up armada_drm_crtc_plane_disable() (diff) | |
download | linux-dev-d76dcc7236b8b1b8c2c61b380e7d803d47b20ffa.tar.xz linux-dev-d76dcc7236b8b1b8c2c61b380e7d803d47b20ffa.zip |
drm/armada: clear plane enable bit when disabling
Clear the plane enable bit in the software state within
armada_drm_plane_disable() when disabling either the primary or
overlay planes.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_crtc.c')
-rw-r--r-- | drivers/gpu/drm/armada/armada_crtc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index 3287b72e48cc..bedcaed81ffa 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -1128,7 +1128,7 @@ int armada_drm_plane_disable(struct drm_plane *plane, { struct armada_plane *dplane = drm_to_armada_plane(plane); struct armada_crtc *dcrtc; - u32 sram_para1, dma_ctrl0_mask; + u32 sram_para1, enable_mask; if (!plane->crtc) return 0; @@ -1147,13 +1147,15 @@ int armada_drm_plane_disable(struct drm_plane *plane, if (plane->type == DRM_PLANE_TYPE_PRIMARY) { sram_para1 = CFG_PDWN256x32 | CFG_PDWN256x24 | CFG_PDWN256x8 | CFG_PDWN32x32 | CFG_PDWN64x66; - dma_ctrl0_mask = CFG_GRA_ENA; + enable_mask = CFG_GRA_ENA; } else { /* Power down the Y/U/V FIFOs */ sram_para1 = CFG_PDWN16x66 | CFG_PDWN32x66; - dma_ctrl0_mask = CFG_DMA_ENA; + enable_mask = CFG_DMA_ENA; } + dplane->state.ctrl0 &= ~enable_mask; + dcrtc = drm_to_armada_crtc(plane->crtc); /* Wait for any preceding work to complete, but don't wedge */ @@ -1161,7 +1163,7 @@ int armada_drm_plane_disable(struct drm_plane *plane, armada_drm_plane_work_cancel(dcrtc, dplane); spin_lock_irq(&dcrtc->irq_lock); - armada_updatel(0, dma_ctrl0_mask, dcrtc->base + LCD_SPU_DMA_CTRL0); + armada_updatel(0, enable_mask, dcrtc->base + LCD_SPU_DMA_CTRL0); spin_unlock_irq(&dcrtc->irq_lock); armada_updatel(sram_para1, 0, dcrtc->base + LCD_SPU_SRAM_PARA1); |