Commit 5439c4f3 authored by Andy Yan's avatar Andy Yan Committed by Heiko Stuebner
Browse files

drm/rockchip: vop2: Support for different layer select configuration between VPs 



In the upcoming VOP for rk3576, every VP has it's own LAYER_SEL
register, and the configuration value of each VP for the same
window maybe different, so extend the layer_sel_id to array,
let it can descption the layer select configuration value for
different VP.

Signed-off-by: default avatarAndy Yan <andy.yan@rock-chips.com>
Tested-by: Michael Riesch <michael.riesch@wolfvision.net> # on RK3568
Tested-by: default avatarDetlev Casanova <detlev.casanova@collabora.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20250218112744.34433-6-andyshrk@163.com
parent 145c9b36

drivers/gpu/drm/rockchip/rockchip_drm_vop2.h

+2 −2
Original line number Diff line number Diff line
@@ -166,9 +166,9 @@ struct vop2_win_data { 
	const unsigned int supported_rotations;



	/**

	 * @layer_sel_id: defined by register OVERLAY_LAYER_SEL of VOP2

	 * @layer_sel_id: defined by register OVERLAY_LAYER_SEL or PORTn_LAYER_SEL

	 */

	unsigned int layer_sel_id;

	unsigned int layer_sel_id[ROCKCHIP_MAX_CRTC];

	uint64_t feature;



	uint8_t axi_bus_id;

drivers/gpu/drm/rockchip/rockchip_vop2_reg.c

+20 −18
Original line number Diff line number Diff line
@@ -350,7 +350,8 @@ static const struct vop2_win_data rk3568_vop_win_data[] = { 
		.formats = formats_smart,

		.nformats = ARRAY_SIZE(formats_smart),

		.format_modifiers = format_modifiers,

		.layer_sel_id = 3,

		/* 0xf means this layer can't attached to this VP */

		.layer_sel_id = { 3, 3, 3, 0xf },

		.supported_rotations = DRM_MODE_REFLECT_Y,

		.type = DRM_PLANE_TYPE_PRIMARY,

		.max_upscale_factor = 8,
@@ -363,7 +364,7 @@ static const struct vop2_win_data rk3568_vop_win_data[] = { 
		.nformats = ARRAY_SIZE(formats_smart),

		.format_modifiers = format_modifiers,

		.base = 0x1e00,

		.layer_sel_id = 7,

		.layer_sel_id = { 7, 7, 7, 0xf },

		.supported_rotations = DRM_MODE_REFLECT_Y,

		.type = DRM_PLANE_TYPE_PRIMARY,

		.max_upscale_factor = 8,
@@ -376,7 +377,7 @@ static const struct vop2_win_data rk3568_vop_win_data[] = { 
		.nformats = ARRAY_SIZE(formats_rk356x_esmart),

		.format_modifiers = format_modifiers,

		.base = 0x1a00,

		.layer_sel_id = 6,

		.layer_sel_id = { 6, 6, 6, 0xf },

		.supported_rotations = DRM_MODE_REFLECT_Y,

		.type = DRM_PLANE_TYPE_PRIMARY,

		.max_upscale_factor = 8,
@@ -389,7 +390,7 @@ static const struct vop2_win_data rk3568_vop_win_data[] = { 
		.nformats = ARRAY_SIZE(formats_rk356x_esmart),

		.format_modifiers = format_modifiers,

		.base = 0x1800,

		.layer_sel_id = 2,

		.layer_sel_id = { 2, 2, 2, 0xf },

		.supported_rotations = DRM_MODE_REFLECT_Y,

		.type = DRM_PLANE_TYPE_PRIMARY,

		.max_upscale_factor = 8,
@@ -402,7 +403,7 @@ static const struct vop2_win_data rk3568_vop_win_data[] = { 
		.formats = formats_cluster,

		.nformats = ARRAY_SIZE(formats_cluster),

		.format_modifiers = format_modifiers_afbc,

		.layer_sel_id = 0,

		.layer_sel_id = { 0, 0, 0, 0xf },

		.supported_rotations = DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270 |

					DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y,

		.max_upscale_factor = 4,
@@ -417,7 +418,7 @@ static const struct vop2_win_data rk3568_vop_win_data[] = { 
		.formats = formats_cluster,

		.nformats = ARRAY_SIZE(formats_cluster),

		.format_modifiers = format_modifiers_afbc,

		.layer_sel_id = 1,

		.layer_sel_id = { 1, 1, 1, 0xf },

		.supported_rotations = DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270 |

					DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y,

		.type = DRM_PLANE_TYPE_OVERLAY,
@@ -582,7 +583,7 @@ static const struct vop2_win_data rk3588_vop_win_data[] = { 
		.formats = formats_cluster,

		.nformats = ARRAY_SIZE(formats_cluster),

		.format_modifiers = format_modifiers_afbc,

		.layer_sel_id = 0,

		.layer_sel_id = { 0, 0, 0, 0 },

		.supported_rotations = DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270 |

				       DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y,

		.axi_bus_id = 0,
@@ -600,7 +601,7 @@ static const struct vop2_win_data rk3588_vop_win_data[] = { 
		.formats = formats_cluster,

		.nformats = ARRAY_SIZE(formats_cluster),

		.format_modifiers = format_modifiers_afbc,

		.layer_sel_id = 1,

		.layer_sel_id = { 1, 1, 1, 1 },

		.supported_rotations = DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270 |

				       DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y,

		.type = DRM_PLANE_TYPE_PRIMARY,
@@ -618,7 +619,7 @@ static const struct vop2_win_data rk3588_vop_win_data[] = { 
		.formats = formats_cluster,

		.nformats = ARRAY_SIZE(formats_cluster),

		.format_modifiers = format_modifiers_afbc,

		.layer_sel_id = 4,

		.layer_sel_id = { 4, 4, 4, 4 },

		.supported_rotations = DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270 |

				       DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y,

		.type = DRM_PLANE_TYPE_PRIMARY,
@@ -636,7 +637,7 @@ static const struct vop2_win_data rk3588_vop_win_data[] = { 
		.formats = formats_cluster,

		.nformats = ARRAY_SIZE(formats_cluster),

		.format_modifiers = format_modifiers_afbc,

		.layer_sel_id = 5,

		.layer_sel_id =  { 5, 5, 5, 5 },

		.supported_rotations = DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270 |

				       DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y,

		.type = DRM_PLANE_TYPE_PRIMARY,
@@ -654,7 +655,7 @@ static const struct vop2_win_data rk3588_vop_win_data[] = { 
		.nformats = ARRAY_SIZE(formats_esmart),

		.format_modifiers = format_modifiers,

		.base = 0x1800,

		.layer_sel_id = 2,

		.layer_sel_id = { 2, 2, 2, 2 },

		.supported_rotations = DRM_MODE_REFLECT_Y,

		.type = DRM_PLANE_TYPE_OVERLAY,

		.axi_bus_id = 0,
@@ -670,7 +671,7 @@ static const struct vop2_win_data rk3588_vop_win_data[] = { 
		.nformats = ARRAY_SIZE(formats_esmart),

		.format_modifiers = format_modifiers,

		.base = 0x1a00,

		.layer_sel_id = 3,

		.layer_sel_id = { 3, 3, 3, 3 },

		.supported_rotations = DRM_MODE_REFLECT_Y,

		.type = DRM_PLANE_TYPE_OVERLAY,

		.axi_bus_id = 0,
@@ -686,7 +687,7 @@ static const struct vop2_win_data rk3588_vop_win_data[] = { 
		.formats = formats_esmart,

		.nformats = ARRAY_SIZE(formats_esmart),

		.format_modifiers = format_modifiers,

		.layer_sel_id = 6,

		.layer_sel_id =  { 6, 6, 6, 6 },

		.supported_rotations = DRM_MODE_REFLECT_Y,

		.type = DRM_PLANE_TYPE_OVERLAY,

		.axi_bus_id = 1,
@@ -702,7 +703,7 @@ static const struct vop2_win_data rk3588_vop_win_data[] = { 
		.nformats = ARRAY_SIZE(formats_esmart),

		.format_modifiers = format_modifiers,

		.base = 0x1e00,

		.layer_sel_id = 7,

		.layer_sel_id =  { 7, 7, 7, 7 },

		.supported_rotations = DRM_MODE_REFLECT_Y,

		.type = DRM_PLANE_TYPE_OVERLAY,

		.axi_bus_id = 1,
@@ -1454,7 +1455,7 @@ static void rk3568_vop2_setup_layer_mixer(struct vop2_video_port *vp) 
		 */

		for (old_layer_id = 0; old_layer_id < vop2->data->win_size; old_layer_id++) {

			layer_sel_id = (layer_sel >> (4 * old_layer_id)) & 0xf;

			if (layer_sel_id == win->data->layer_sel_id)

			if (layer_sel_id == win->data->layer_sel_id[vp->id])

				break;

		}
@@ -1464,7 +1465,7 @@ static void rk3568_vop2_setup_layer_mixer(struct vop2_video_port *vp) 
		for (i = 0; i < vop2->data->win_size; i++) {

			old_win = &vop2->win[i];

			layer_sel_id = (layer_sel >> (4 * layer_id)) & 0xf;

			if (layer_sel_id == old_win->data->layer_sel_id)

			if (layer_sel_id == old_win->data->layer_sel_id[vp->id])

				break;

		}
@@ -1512,13 +1513,14 @@ static void rk3568_vop2_setup_layer_mixer(struct vop2_video_port *vp) 
		}



		layer_sel &= ~RK3568_OVL_LAYER_SEL__LAYER(layer_id, 0x7);

		layer_sel |= RK3568_OVL_LAYER_SEL__LAYER(layer_id, win->data->layer_sel_id);

		layer_sel |= RK3568_OVL_LAYER_SEL__LAYER(layer_id, win->data->layer_sel_id[vp->id]);

		/*

		 * When we bind a window from layerM to layerN, we also need to move the old

		 * window on layerN to layerM to avoid one window selected by two or more layers.

		 */

		layer_sel &= ~RK3568_OVL_LAYER_SEL__LAYER(old_layer_id, 0x7);

		layer_sel |= RK3568_OVL_LAYER_SEL__LAYER(old_layer_id, old_win->data->layer_sel_id);

		layer_sel |= RK3568_OVL_LAYER_SEL__LAYER(old_layer_id,

			     old_win->data->layer_sel_id[vp->id]);

	}



	vop2_writel(vop2, RK3568_OVL_LAYER_SEL, layer_sel);