diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2018-07-30 11:52:34 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2018-07-30 11:52:34 +0100 |
| commit | 0239520e0290e7d5f186f7fb7f7ce307c478a439 (patch) | |
| tree | d19c62cc463847c3bf6f8e1d9ca03c488c3649d5 /drivers/gpu/drm/armada/armada_crtc.c | |
| parent | 1729f56010a960f182a36e09ce8d6504fa637d76 (diff) | |
| download | linux-0239520e0290e7d5f186f7fb7f7ce307c478a439.tar.bz2 | |
drm/armada: add rectangle helpers
Add helpers to convert rectangle width/height and x/y to register
values.
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 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index 78bb3d51417b..205d5dc7ba81 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -1158,11 +1158,9 @@ static void armada_drm_primary_update_state(struct drm_plane_state *state, 0, CFG_PDWN64x66, LCD_SPU_SRAM_PARA1); dplane->state.ctrl0 = val; - dplane->state.src_hw = (drm_rect_height(&state->src) & 0xffff0000) | - drm_rect_width(&state->src) >> 16; - dplane->state.dst_hw = drm_rect_height(&state->dst) << 16 | - drm_rect_width(&state->dst); - dplane->state.dst_yx = state->dst.y1 << 16 | state->dst.x1; + dplane->state.src_hw = armada_rect_hw_fp(&state->src); + dplane->state.dst_hw = armada_rect_hw(&state->dst); + dplane->state.dst_yx = armada_rect_yx(&state->dst); armada_drm_gra_plane_regs(regs + idx, &dfb->fb, &dplane->state, state->src.x1 >> 16, state->src.y1 >> 16, |