Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0915da7d authored by yao mark's avatar yao mark Committed by Mark Yao
Browse files

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: default avatarMark Yao <mark.yao@rock-chips.com>
parent d3cae7df

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

+0 −11
Original line number Diff line number Diff line
@@ -252,16 +252,6 @@ static const struct vop_win_phy win23_data = { 
	.dst_alpha_ctl = VOP_REG(WIN2_DST_ALPHA_CTRL, 0xff, 0),

};



static const struct vop_win_phy cursor_data = {

	.data_formats = formats_234,

	.nformats = ARRAY_SIZE(formats_234),

	.enable = VOP_REG(HWC_CTRL0, 0x1, 0),

	.format = VOP_REG(HWC_CTRL0, 0x7, 1),

	.rb_swap = VOP_REG(HWC_CTRL0, 0x1, 12),

	.dsp_st = VOP_REG(HWC_DSP_ST, 0x1fff1fff, 0),

	.yrgb_mst = VOP_REG(HWC_MST, 0xffffffff, 0),

};



static const struct vop_ctrl ctrl_data = {

	.standby = VOP_REG(SYS_CTRL, 0x1, 22),

	.gate_en = VOP_REG(SYS_CTRL, 0x1, 23),
@@ -301,7 +291,6 @@ static const struct vop_win_data rk3288_vop_win_data[] = { 
	{ .base = 0x40, .phy = &win01_data, .type = DRM_PLANE_TYPE_OVERLAY },

	{ .base = 0x00, .phy = &win23_data, .type = DRM_PLANE_TYPE_OVERLAY },

	{ .base = 0x50, .phy = &win23_data, .type = DRM_PLANE_TYPE_CURSOR },

	{ .base = 0x00, .phy = &cursor_data, .type = DRM_PLANE_TYPE_OVERLAY },

};



static const struct vop_data rk3288_vop = {