diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-07-15 18:11:25 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-10-01 14:33:27 +0100 |
| commit | 9099ea19ca8ad21ab7f2a7abc06e270adeb8b02f (patch) | |
| tree | d1834ed3d9ee165dc2cac44df5cf66e72db22e57 /drivers/gpu/drm/armada/armada_overlay.c | |
| parent | 583268035825fc5ef0bbc467631fea0358831cbe (diff) | |
| download | linux-9099ea19ca8ad21ab7f2a7abc06e270adeb8b02f.tar.bz2 | |
drm/armada: move write to dma_ctrl0 to armada_drm_crtc_plane_disable()
Move the write to clear the DMA enable bit, and augment it with clearing
the graphics enable bit for the primary plane.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_overlay.c')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_overlay.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c index 1032f9b3d5f1..9686d79335a0 100644 --- a/drivers/gpu/drm/armada/armada_overlay.c +++ b/drivers/gpu/drm/armada/armada_overlay.c @@ -275,7 +275,6 @@ static int armada_ovl_plane_disable(struct drm_plane *plane) spin_lock_irq(&dcrtc->irq_lock); armada_drm_vbl_event_remove(dcrtc, &dplane->vbl.update); - armada_updatel(0, CFG_DMA_ENA, dcrtc->base + LCD_SPU_DMA_CTRL0); dplane->ctrl0 = 0; spin_unlock_irq(&dcrtc->irq_lock); |