mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 10:58:48 +09:00
drm/rockchip: vop2: remove the plane number check in vop2_plane_mask_check()
The &vop2_data.nr_layers represents the max number of planes that can
be assigned to one VP. Therefore, when checking the max plane number for
VOP2, it may be incorrect to use the &vop2_data.nr_layers.
And the comparison of assigned plane_mask with &vop2_data.plane_mask_base
can already confirm whether every plane has been assigned to one of all
the VPs.
Fixes: 00424a589d ("drm/rockchip: vop2: add support to assign plane mask by default")
Change-Id: I9c2056dea42897150ef155c7e6fd0ad3a43c8132
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
This commit is contained in:
@@ -14927,8 +14927,7 @@ static bool vop2_plane_mask_check(struct vop2 *vop2)
|
||||
plane_mask |= vop2->vps[i].plane_mask;
|
||||
}
|
||||
|
||||
if (hweight32(plane_mask) != vop2_data->nr_layers ||
|
||||
plane_mask != vop2_data->plane_mask_base) {
|
||||
if (plane_mask != vop2_data->plane_mask_base) {
|
||||
full_plane = vop2_plane_mask_to_string(vop2_data->plane_mask_base);
|
||||
current_plane = vop2_plane_mask_to_string(plane_mask);
|
||||
DRM_WARN("all windows should be assigned, full plane mask: %s[0x%x], current plane mask: %s[0x%x]\n",
|
||||
|
||||
Reference in New Issue
Block a user