shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: vop2: add plane mask assignment rule for rk3566

Browse Source 
There are 3 planes and 3 mirror plane for rk3566. If both
exist in one vp, the mirror planes should be removed in
plane_mask drm_property.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I15b776224ebfbaa19a0d9d3dca56828a980e0c54
This commit is contained in:
Damon Ding
2022-07-28 17:47:44 +08:00
committed by Tao Huang
parent 787097d01b
commit 4b8c0aef05
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
View File

@@ -8798,7 +8798,8 @@ static int vop2_gamma_init(struct vop2 *vop2)
}
static int vop2_crtc_create_plane_mask_property(struct vop2 *vop2,
struct drm_crtc *crtc)
struct drm_crtc *crtc,
uint32_t plane_mask)
{
struct drm_property *prop;
struct vop2_video_port *vp = to_vop2_video_port(crtc);
@@ -8826,7 +8827,7 @@ static int vop2_crtc_create_plane_mask_property(struct vop2 *vop2,
}
vp->plane_mask_prop = prop;
drm_object_attach_property(&crtc->base, vp->plane_mask_prop, vp->plane_mask);
drm_object_attach_property(&crtc->base, vp->plane_mask_prop, plane_mask);
return 0;
}
@@ -8867,6 +8868,9 @@ static int vop2_crtc_create_feature_property(struct vop2 *vop2, struct drm_crtc
return 0;
}
#define RK3566_MIRROR_PLANE_MASK (BIT(ROCKCHIP_VOP2_CLUSTER1) | BIT(ROCKCHIP_VOP2_ESMART1) | \
BIT(ROCKCHIP_VOP2_SMART1))
/*
* Returns:
* Registered crtc number on success, negative error code on failure.
@@ -8886,6 +8890,7 @@ static int vop2_create_crtc(struct vop2 *vop2)
uint32_t possible_crtcs;
uint64_t soc_id;
uint32_t registered_num_crtcs = 0;
uint32_t plane_mask = 0;
char clk_name[16];
int i = 0, j = 0, k = 0;
int ret = 0;
@@ -8969,6 +8974,14 @@ static int vop2_create_crtc(struct vop2 *vop2)
crtc->port = port;
of_property_read_u32(port, "cursor-win-id", &vp->cursor_win_id);
plane_mask = vp->plane_mask;
if (vop2_soc_is_rk3566()) {
if ((vp->plane_mask & RK3566_MIRROR_PLANE_MASK) &&
(vp->plane_mask & ~RK3566_MIRROR_PLANE_MASK)) {
plane_mask &= ~RK3566_MIRROR_PLANE_MASK;
}
}
if (vp->primary_plane_phy_id >= 0) {
win = vop2_find_win_by_phys_id(vop2, vp->primary_plane_phy_id);
if (win) {
@@ -9060,7 +9073,7 @@ static int vop2_create_crtc(struct vop2 *vop2)
drm_object_attach_property(&crtc->base,
drm_dev->mode_config.tv_bottom_margin_property, 100);
}
vop2_crtc_create_plane_mask_property(vop2, crtc);
vop2_crtc_create_plane_mask_property(vop2, crtc, plane_mask);
vop2_crtc_create_feature_property(vop2, crtc);
ret = drm_self_refresh_helper_init(crtc);