Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/armada: move setting primary plane position to armada_drm_primary_set()

Move the setting of the primary plane position into
armada_drm_primary_set() rather than the initialisation function.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

+3 -3
+3 -3
drivers/gpu/drm/armada/armada_crtc.c
··· 532 532 { 533 533 struct armada_plane_state *state = &drm_to_armada_plane(plane)->state; 534 534 struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc); 535 - struct armada_regs regs[7]; 535 + struct armada_regs regs[8]; 536 536 bool interlaced = dcrtc->interlaced; 537 537 unsigned i; 538 - uint32_t ctrl0; 538 + u32 ctrl0; 539 539 540 540 i = armada_drm_crtc_calc_fb(plane->fb, x, y, regs, interlaced); 541 541 542 + armada_reg_queue_set(regs, i, state->dst_yx, LCD_SPU_GRA_OVSA_HPXL_VLN); 542 543 armada_reg_queue_set(regs, i, state->src_hw, LCD_SPU_GRA_HPXL_VLN); 543 544 armada_reg_queue_set(regs, i, state->dst_hw, LCD_SPU_GZM_HPXL_VLN); 544 545 ··· 1192 1191 CFG_PDWN32x32 | CFG_PDWN16x66 | CFG_PDWN32x66 | 1193 1192 CFG_PDWN64x66, dcrtc->base + LCD_SPU_SRAM_PARA1); 1194 1193 writel_relaxed(0x2032ff81, dcrtc->base + LCD_SPU_DMA_CTRL1); 1195 - writel_relaxed(0x00000000, dcrtc->base + LCD_SPU_GRA_OVSA_HPXL_VLN); 1196 1194 writel_relaxed(dcrtc->irq_ena, dcrtc->base + LCD_SPU_IRQ_ENA); 1197 1195 writel_relaxed(0, dcrtc->base + LCD_SPU_IRQ_ISR); 1198 1196