diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-07-08 10:22:15 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-12-08 12:19:53 +0000 |
| commit | 214612f9b7ae2395d1b9d1c51d1e994fcd598b2c (patch) | |
| tree | 7f6aacaec97f0ddfdff5de5e28bc898374c7d2a0 /drivers/gpu/drm/armada/armada_overlay.c | |
| parent | eaa66279c3dd65cafede289d2485185fb389b050 (diff) | |
| download | linux-214612f9b7ae2395d1b9d1c51d1e994fcd598b2c.tar.bz2 | |
drm/armada: move writes of LCD_SPU_SRAM_PARA1 under lock
Move writes of LCD_SPU_SRAM_PARA1 under the irq lock, so that we can
add this to the frame updates at interrupt time when disabling a
plane.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_overlay.c')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_overlay.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c index 200223861bfb..e02d0d9d4c23 100644 --- a/drivers/gpu/drm/armada/armada_overlay.c +++ b/drivers/gpu/drm/armada/armada_overlay.c @@ -162,8 +162,9 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, return 0; } else if (~dplane->base.state.ctrl0 & ctrl0 & CFG_DMA_ENA) { /* Power up the Y/U/V FIFOs on ENA 0->1 transitions */ - armada_updatel(0, CFG_PDWN16x66 | CFG_PDWN32x66, - dcrtc->base + LCD_SPU_SRAM_PARA1); + armada_reg_queue_mod(work->regs, idx, + 0, CFG_PDWN16x66 | CFG_PDWN32x66, + LCD_SPU_SRAM_PARA1); } if (armada_drm_plane_work_wait(&dplane->base, HZ / 25) == 0) |