leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/armada: add missing interlaced support for overlay frame

Browse Source 
Interlaced support has been missing from the overlay frame, which is
sub-optimal.  Add support for this missing feature.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
This commit is contained in:
Russell King
2018-07-01 17:01:26 +01:00
parent 1d1547ec12
commit 89e0c53ccf
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/armada/armada_overlay.c
View File

@@ -106,12 +106,13 @@ static void armada_drm_overlay_plane_atomic_update(struct drm_plane *plane,
/* FIXME: overlay on an interlaced display */ /* FIXME: overlay on an interlaced display */
if (old_state->src.x1 != state->src.x1 || if (old_state->src.x1 != state->src.x1 ||
old_state->src.y1 != state->src.y1 || old_state->src.y1 != state->src.y1 ||
old_state->fb != state->fb) { old_state->fb != state->fb ||
state->crtc->state->mode_changed) {
const struct drm_format_info *format; const struct drm_format_info *format;
u16 src_x, pitches[3]; u16 src_x, pitches[3];
u32 addrs[2][3]; u32 addrs[2][3];
armada_drm_plane_calc(state, addrs, pitches, false); armada_drm_plane_calc(state, addrs, pitches, dcrtc->interlaced);
armada_reg_queue_set(regs, idx, addrs[0][0], armada_reg_queue_set(regs, idx, addrs[0][0],
LCD_SPU_DMA_START_ADDR_Y0); LCD_SPU_DMA_START_ADDR_Y0);
@@ -146,6 +147,8 @@ static void armada_drm_overlay_plane_atomic_update(struct drm_plane *plane,
src_x = state->src.x1 >> 16; src_x = state->src.x1 >> 16;
if (format->num_planes == 1 && src_x & (format->hsub - 1)) if (format->num_planes == 1 && src_x & (format->hsub - 1))
cfg ^= CFG_DMA_MOD(CFG_SWAPUV); cfg ^= CFG_DMA_MOD(CFG_SWAPUV);
if (dcrtc->interlaced)
cfg |= CFG_DMA_FTOGGLE;
cfg_mask = CFG_CBSH_ENA | CFG_DMAFORMAT | cfg_mask = CFG_CBSH_ENA | CFG_DMAFORMAT |
CFG_DMA_MOD(CFG_SWAPRB | CFG_SWAPUV | CFG_DMA_MOD(CFG_SWAPRB | CFG_SWAPUV |
CFG_SWAPYU | CFG_YUV2RGB) | CFG_SWAPYU | CFG_YUV2RGB) |