Skip to content

Commit 0915da7

Browse files
author
yao mark
committed
drm/rockchip: vop: remove hardware cursor window
hardware cursor windows only have some fixed size, and not support width virtual, when move hardware cursor windows outside of left, the display would be wrong, so this window can't for cursor now. And Tag hardware cursor window as a overlay is wrong, will make userspace wrong behaviour. So just remove the hardware cursor window Signed-off-by: Mark Yao <[email protected]>
1 parent d3cae7d commit 0915da7

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,6 @@ static const struct vop_win_phy win23_data = {
252252
.dst_alpha_ctl = VOP_REG(WIN2_DST_ALPHA_CTRL, 0xff, 0),
253253
};
254254

255-
static const struct vop_win_phy cursor_data = {
256-
.data_formats = formats_234,
257-
.nformats = ARRAY_SIZE(formats_234),
258-
.enable = VOP_REG(HWC_CTRL0, 0x1, 0),
259-
.format = VOP_REG(HWC_CTRL0, 0x7, 1),
260-
.rb_swap = VOP_REG(HWC_CTRL0, 0x1, 12),
261-
.dsp_st = VOP_REG(HWC_DSP_ST, 0x1fff1fff, 0),
262-
.yrgb_mst = VOP_REG(HWC_MST, 0xffffffff, 0),
263-
};
264-
265255
static const struct vop_ctrl ctrl_data = {
266256
.standby = VOP_REG(SYS_CTRL, 0x1, 22),
267257
.gate_en = VOP_REG(SYS_CTRL, 0x1, 23),
@@ -301,7 +291,6 @@ static const struct vop_win_data rk3288_vop_win_data[] = {
301291
{ .base = 0x40, .phy = &win01_data, .type = DRM_PLANE_TYPE_OVERLAY },
302292
{ .base = 0x00, .phy = &win23_data, .type = DRM_PLANE_TYPE_OVERLAY },
303293
{ .base = 0x50, .phy = &win23_data, .type = DRM_PLANE_TYPE_CURSOR },
304-
{ .base = 0x00, .phy = &cursor_data, .type = DRM_PLANE_TYPE_OVERLAY },
305294
};
306295

307296
static const struct vop_data rk3288_vop = {

0 commit comments

Comments
 (0)