Support reflect-x/y on RK3328, RK3368, and RK3399
Subsystems (4)
cover Support reflect-x/y on RK3328, RK3368, and RK3399
Here's a small series supporting plane reflection (aka. mirroring) properties on RK3328, RK3368, and RK3399 SoCs.
Note that RK3288 specification doesn't seem to document registers for plane mirroring, but instead it only seems to support mirroring at the display (CRTC) level.
A small typo cleanup patch is included, in patch 1. Not related to the rotation stuff.
In order to support this feature, patch 2 separates the register set for win0 and win1.
Once that's done, patch 3 creates the properties, if supported by each plane/SoC.
The following modetest commands would test this feature, where 30 is the plane ID, and 49 = rotate_0 + relect_y + reflect_x.
X mirror:
modetest -s 43@33:1920x1080@XR24 -w 30:rotation:17
Y mirror:
modetest -s 43@33:1920x1080@XR24 -w 30:rotation:33
XY mirror:
modetest -s 43@33:1920x1080@XR24 -w 30:rotation:49
This work has been originally by Daniele. I just cleaned up the implementation a it, and ported the code to upstream.
This series is based on drm-misc-next plus https://patchwork.kernel.org/patch/10752893/.
Daniele Castagna (1):
drm/rockchip: Add reflection properties
Ezequiel Garcia (2):
drm/rockchip: Fix typo in VOP macros argument drm/rockchip: Separate RK3288 from RK3368 win01 registers
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 47 ++++++++++++++++++--- drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 2 + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 34 ++++++++++++--- 3 files changed, 70 insertions(+), 13 deletions(-)
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/3 drm/rockchip: Fix typo in VOP macros argument
Fix a small typo in the macros VOP argument. The macro argument is currently wrongly named "x", and then never used. The code built fine almost by accident, as the macros are always used in a context where a proper "vop" symbol exists.
This fix is almost cosmetic, as the resulting code shouldn't change.
--- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/rockchip/rockchip_drm_vop.c +7 -7
@@ -45,21 +45,21 @@#include "rockchip_drm_vop.h" #include "rockchip_rgb.h" -#define VOP_WIN_SET (x, win, name, v) \ +#define VOP_WIN_SET (vop, win, name, v) \ vop_reg_set(vop, &win->phy->name, win->base, ~0, v, #name) -#define VOP_SCL_SET (x, win, name, v) \ +#define VOP_SCL_SET (vop, win, name, v) \ vop_reg_set(vop, &win->phy->scl->name, win->base, ~0, v, #name) -#define VOP_SCL_SET_EXT (x, win, name, v) \ +#define VOP_SCL_SET_EXT (vop, win, name, v) \ vop_reg_set(vop, &win->phy->scl->ext->name, \ win->base, ~0, v, #name) -#define VOP_WIN_YUV2YUV_SET (x, win_yuv2yuv, name, v) \ +#define VOP_WIN_YUV2YUV_SET (vop, win_yuv2yuv, name, v) \ do { \ if (win_yuv2yuv && win_yuv2yuv->name.mask) \ vop_reg_set(vop, &win_yuv2yuv->name, 0, ~0, v, #name); \ } while (0) -#define VOP_WIN_YUV2YUV_COEFFICIENT_SET (x, win_yuv2yuv, name, v) \ +#define VOP_WIN_YUV2YUV_COEFFICIENT_SET (vop, win_yuv2yuv, name, v) \ do { \ if (win_yuv2yuv && win_yuv2yuv->phy->name.mask) \ vop_reg_set(vop, &win_yuv2yuv->phy->name, win_yuv2yuv->base, ~0, v, #name); \
@@ -85,8 +85,8 @@#define VOP_INTR_GET_TYPE (vop, name, type) \ vop_get_intr_type(vop, &vop->data->intr->name, type) -#define VOP_WIN_GET (x, win, name) \ - vop_read_reg(x, win->offset, win->phy->name) +#define VOP_WIN_GET (vop, win, name) \ + vop_read_reg(vop, win->offset, win->phy->name)#define VOP_WIN_GET_YRGBADDR (vop, win) \ vop_readl(vop, win->base + win->phy->yrgb_mst.offset)
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/3 drm/rockchip: Separate RK3288 from RK3368 win01 registers
In reply to Ezequiel GarciaThis commit splits the registers for RK3288 from those for RK3328, RK3368 and RK3399. It seems RK3288 does not support plane x-y-mirroring, and so in order to support this for the other SoCs, we need to have separate set of registers for win0 and win1.
--- drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 31 +++++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-)
drivers/gpu/drm/rockchip/rockchip_vop_reg.c +25 -6
@@ -550,6 +550,25 @@ static const struct vop_intr rk3368_vop_intr = { .clear = VOP_REG_MASK_SYNC(RK3368_INTR_CLEAR, 0x3fff, 0), }; +static const struct vop_win_phy rk3368_win01_data = { + .scl = &rk3288_win_full_scl, + .data_formats = formats_win_full, + .nformats =ARRAY_SIZE (formats_win_full), + .enable =VOP_REG (RK3368_WIN0_CTRL0 ,0x1 ,0 ), + .format =VOP_REG (RK3368_WIN0_CTRL0 ,0x7 ,1 ), + .rb_swap =VOP_REG (RK3368_WIN0_CTRL0 ,0x1 ,12 ), + .act_info =VOP_REG (RK3368_WIN0_ACT_INFO ,0x1fff1fff ,0 ), + .dsp_info =VOP_REG (RK3368_WIN0_DSP_INFO ,0x0fff0fff ,0 ), + .dsp_st =VOP_REG (RK3368_WIN0_DSP_ST ,0x1fff1fff ,0 ), + .yrgb_mst =VOP_REG (RK3368_WIN0_YRGB_MST ,0xffffffff ,0 ), + .uv_mst =VOP_REG (RK3368_WIN0_CBR_MST ,0xffffffff ,0 ), + .yrgb_vir =VOP_REG (RK3368_WIN0_VIR ,0x3fff ,0 ), + .uv_vir =VOP_REG (RK3368_WIN0_VIR ,0x3fff ,16 ), + .src_alpha_ctl =VOP_REG (RK3368_WIN0_SRC_ALPHA_CTRL ,0xff ,0 ), + .dst_alpha_ctl =VOP_REG (RK3368_WIN0_DST_ALPHA_CTRL ,0xff ,0 ), + .channel =VOP_REG (RK3368_WIN0_CTRL2 ,0xff ,0 ), +}; +static const struct vop_win_phy rk3368_win23_data = { .data_formats = formats_win_lite, .nformats =ARRAY_SIZE (formats_win_lite),
@@ -566,9 +585,9 @@ static const struct vop_win_phy rk3368_win23_data = { };static const struct vop_win_data rk3368_vop_win_data[] = { - { .base =0x00 , .phy = &rk3288_win01_data, + { .base =0x00 , .phy = &rk3368_win01_data, .type =DRM_PLANE_TYPE_PRIMARY }, - { .base =0x40 , .phy = &rk3288_win01_data, + { .base =0x40 , .phy = &rk3368_win01_data, .type =DRM_PLANE_TYPE_OVERLAY }, { .base =0x00 , .phy = &rk3368_win23_data, .type =DRM_PLANE_TYPE_OVERLAY },
@@ -679,7 +698,7 @@ static const struct vop_data rk3399_vop_big = { };static const struct vop_win_data rk3399_vop_lit_win_data[] = { - { .base =0x00 , .phy = &rk3288_win01_data, + { .base =0x00 , .phy = &rk3368_win01_data, .type =DRM_PLANE_TYPE_PRIMARY }, { .base =0x00 , .phy = &rk3368_win23_data, .type =DRM_PLANE_TYPE_CURSOR },
@@ -766,11 +785,11 @@ static const struct vop_intr rk3328_vop_intr = { };static const struct vop_win_data rk3328_vop_win_data[] = { - { .base =0xd0 , .phy = &rk3288_win01_data, + { .base =0xd0 , .phy = &rk3368_win01_data, .type =DRM_PLANE_TYPE_PRIMARY }, - { .base =0x1d0 , .phy = &rk3288_win01_data, + { .base =0x1d0 , .phy = &rk3368_win01_data, .type =DRM_PLANE_TYPE_OVERLAY }, - { .base =0x2d0 , .phy = &rk3288_win01_data, + { .base =0x2d0 , .phy = &rk3368_win01_data, .type =DRM_PLANE_TYPE_CURSOR }, };
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/3 drm/rockchip: Add reflection properties
In reply to Ezequiel GarciaFrom: Daniele Castagna <[email protected]>
Add the KMS plane rotation property to the DRM rockchip driver, for SoCs RK3328, RK3368 and RK3399.
RK3288 only supports rotation at the display level (i.e. CRTC), but for now we are only interested in plane rotation.
This commit only adds support for the value of reflect-y and reflect-x (i.e. mirroring).
Note that y-mirroring is not compatible with YUV.
The following modetest commands would test this feature, where 30 is the plane ID, and 49 = rotate_0 + relect_y + reflect_x.
X mirror:
modetest -s 43@33:1920x1080@XR24 -w 30:rotation:17
Y mirror:
modetest -s 43@33:1920x1080@XR24 -w 30:rotation:33
XY mirror:
modetest -s 43@33:1920x1080@XR24 -w 30:rotation:49
--- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 33 +++++++++++++++++++++ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 2 ++ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 3 ++ 3 files changed, 38 insertions(+)
drivers/gpu/drm/rockchip/rockchip_drm_vop.c +33 -0
@@ -88,6 +88,9 @@#define VOP_WIN_GET (vop, win, name) \ vop_read_reg(vop, win->offset, win->phy->name) +#define VOP_WIN_HAS_REG (win, name) \ + !!(win->phy->name.mask) +#define VOP_WIN_GET_YRGBADDR (vop, win) \ vop_readl(vop, win->base + win->phy->yrgb_mst.offset)
@@ -711,6 +714,11 @@ static int vop_plane_atomic_check(struct drm_plane *plane,return -EINVAL ; } +if (fb->format->is_yuv && state->rotation &DRM_MODE_REFLECT_Y ) { +DRM_ERROR ("Invalid Source: Yuv format does not support this rotation\n" ); +return -EINVAL ; + } +return 0 ; }
@@ -789,6 +797,13 @@ static void vop_plane_atomic_update(struct drm_plane *plane, offset += (src->y1 >>16 ) * fb->pitches[0 ]; dma_addr = rk_obj->dma_addr + offset + fb->offsets[0 ]; +/* +* For y-mirroring we need to move address +* to the beginning of the last line. +*/ +if (state->rotation &DRM_MODE_REFLECT_Y ) + dma_addr += (actual_h -1 ) * fb->pitches[0 ]; + format =vop_convert_format (fb->format->format);spin_lock (&vop->reg_lock);
@@ -797,6 +812,10 @@ static void vop_plane_atomic_update(struct drm_plane *plane,VOP_WIN_SET (vop, win, yrgb_vir,DIV_ROUND_UP (fb->pitches[0 ],4 ));VOP_WIN_SET (vop, win, yrgb_mst, dma_addr);VOP_WIN_YUV2YUV_SET (vop, win_yuv2yuv, y2r_en, is_yuv); +VOP_WIN_SET (vop, win, y_mir_en, + (state->rotation &DRM_MODE_REFLECT_Y ) ?1 :0 ); +VOP_WIN_SET (vop, win, x_mir_en, + (state->rotation &DRM_MODE_REFLECT_X ) ?1 :0 );if (is_yuv) {int hsub =drm_format_horz_chroma_subsampling (fb->format->format);
@@ -1311,6 +1330,18 @@ static irqreturn_t vop_isr(int irq, void *data)return ret; } +static void vop_plane_add_properties (struct drm_plane *plane, +const struct vop_win_data *win_data) +{ +unsigned int flags =0 ; + + flags |=VOP_WIN_HAS_REG (win_data, x_mir_en) ?DRM_MODE_REFLECT_X :0 ; + flags |=VOP_WIN_HAS_REG (win_data, y_mir_en) ?DRM_MODE_REFLECT_Y :0 ; +if (flags) +drm_plane_create_rotation_property (plane,DRM_MODE_ROTATE_0 , +DRM_MODE_ROTATE_0 | flags); +} +static int vop_create_crtc (struct vop *vop) {const struct vop_data *vop_data = vop->data;
@@ -1348,6 +1379,7 @@ static int vop_create_crtc(struct vop *vop) plane = &vop_win->base;drm_plane_helper_add (plane, &plane_helper_funcs); +vop_plane_add_properties (plane, win_data);if (plane->type ==DRM_PLANE_TYPE_PRIMARY ) primary = plane;else if (plane->type ==DRM_PLANE_TYPE_CURSOR )
@@ -1385,6 +1417,7 @@ static int vop_create_crtc(struct vop *vop) goto err_cleanup_crtc; }drm_plane_helper_add (&vop_win->base, &plane_helper_funcs); +vop_plane_add_properties (&vop_win->base, win_data); } port =of_get_child_by_name (dev->of_node,"port" );
drivers/gpu/drm/rockchip/rockchip_drm_vop.h +2 -0
@@ -146,6 +146,8 @@ struct vop_win_phy {struct vop_reg uv_mst;struct vop_reg yrgb_vir;struct vop_reg uv_vir; +struct vop_reg y_mir_en; +struct vop_reg x_mir_en;struct vop_reg dst_alpha_ctl;struct vop_reg src_alpha_ctl;
drivers/gpu/drm/rockchip/rockchip_vop_reg.c +3 -0
@@ -557,6 +557,8 @@ static const struct vop_win_phy rk3368_win01_data = { .enable = VOP_REG(RK3368_WIN0_CTRL0, 0x1, 0), .format = VOP_REG(RK3368_WIN0_CTRL0, 0x7, 1), .rb_swap = VOP_REG(RK3368_WIN0_CTRL0, 0x1, 12), + .x_mir_en = VOP_REG(RK3368_WIN0_CTRL0, 0x1, 21), + .y_mir_en = VOP_REG(RK3368_WIN0_CTRL0, 0x1, 22), .act_info = VOP_REG(RK3368_WIN0_ACT_INFO, 0x1fff1fff, 0), .dsp_info = VOP_REG(RK3368_WIN0_DSP_INFO, 0x0fff0fff, 0), .dsp_st = VOP_REG(RK3368_WIN0_DSP_ST, 0x1fff1fff, 0),
@@ -576,6 +578,7 @@ static const struct vop_win_phy rk3368_win23_data = { .enable = VOP_REG(RK3368_WIN2_CTRL0, 0x1, 4), .format = VOP_REG(RK3368_WIN2_CTRL0, 0x3, 5), .rb_swap = VOP_REG(RK3368_WIN2_CTRL0, 0x1, 20), + .y_mir_en = VOP_REG(RK3368_WIN2_CTRL1, 0x1, 15), .dsp_info = VOP_REG(RK3368_WIN2_DSP_INFO0, 0x0fff0fff, 0), .dsp_st = VOP_REG(RK3368_WIN2_DSP_ST0, 0x1fff1fff, 0), .yrgb_mst = VOP_REG(RK3368_WIN2_MST0, 0xffffffff, 0),
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am Mittwoch, 9. Januar 2019, 19:56:36 CET schrieb Ezequiel Garcia:
Quoted 25 lines
Here's a small series supporting plane reflection (aka. mirroring) properties on RK3328, RK3368, and RK3399 SoCs.
Note that RK3288 specification doesn't seem to document registers for plane mirroring, but instead it only seems to support mirroring at the display (CRTC) level.
A small typo cleanup patch is included, in patch 1. Not related to the rotation stuff.
In order to support this feature, patch 2 separates the register set for win0 and win1.
Once that's done, patch 3 creates the properties, if supported by each plane/SoC.
The following modetest commands would test this feature, where 30 is the plane ID, and 49 =
rotate_0+relect_y+reflect_x.X mirror:
modetest -s 43@33:1920x1080@XR24 -w 30:rotation:17Y mirror:
modetest -s 43@33:1920x1080@XR24 -w 30:rotation:33
Quoted 7 lines
XY mirror:
modetest -s 43@33:1920x1080@XR24 -w 30:rotation:49This work has been originally by Daniele. I just cleaned up the implementation a it, and ported the code to upstream.
This series is based on drm-misc-next plus https://patchwork.kernel.org/patch/10752893/.
applied all 3 to drm-misc-next
Thanks a lot for also catching that register issue. Heiko
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel