From nobody Wed Dec 17 18:04:05 2025 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.4]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E8C4116F27E; Sat, 14 Dec 2024 08:19:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734164351; cv=none; b=Y80zzY7J7oViKWNB6QiIVtioRsMqdhKIodNQ5LChssTGgtJsbLMRSPN9ngJSng232wuenb9n4D+wwoylOIEqmXHNLyPo/u03w79cJrZq9WZ3y0i4qRIW3gl1ZRQBEAvlsilct2UMTvfHeOe8grKuRLJtC4Ars2CkWdnWkK9al50= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734164351; c=relaxed/simple; bh=7CXxdWr3MnjFjmU52nRhOXUQ0YYzl5uhJz6VFn0+dtQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ecOQbyfa3MzLYMiJ906bpbXq6XkrGTeZj/z7pMb7l5gtqZRic56ZYlbWsjv4ggLWGqFtyZ8DYFhV7FJj0JDVYVGWjV/vON+fr0cvLVFhnW6aX5E5xZunWH9MWUZtDzxo3rfkITiBOsmpXCV6fCrnqsP4joTQC4jcmYxqs3t7zow= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=O/gUWJ4P; arc=none smtp.client-ip=117.135.210.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="O/gUWJ4P" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=CL+tH lR4lKzc2U2SGjqODYL/l83JKFW8NqAox/P2eEQ=; b=O/gUWJ4PesMwBnzIKwF7C 5uwfYhpKMHhs9JpCOnVCEiqf8PZTld4OfWOJ/ihbRN2aICJ3g9yicqr4AoMKi6Wb 5kwmhM07aK4T+MBbGsolGs2MZJmv1J3dN0jKc+FCZUn52hsIpCiQuwuV/Y/qYSGj H13bQhzf5Ou+l5VQvj2cvY= Received: from ProDesk.. (unknown [58.22.7.114]) by gzsmtp3 (Coremail) with SMTP id PigvCgCX4chkP11nuLVXFg--.10768S2; Sat, 14 Dec 2024 16:18:48 +0800 (CST) From: Andy Yan To: heiko@sntech.de Cc: hjc@rock-chips.com, krzk+dt@kernel.org, s.hauer@pengutronix.de, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, derek.foreman@collabora.com, detlev.casanova@collabora.com, Andy Yan , Michael Riesch Subject: [PATCH v6 12/16] drm/rockchip: vop2: Register the primary plane and overlay plane separately Date: Sat, 14 Dec 2024 16:18:42 +0800 Message-ID: <20241214081843.3330756-1-andyshrk@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241214081719.3330518-1-andyshrk@163.com> References: <20241214081719.3330518-1-andyshrk@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgCX4chkP11nuLVXFg--.10768S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxGFWxtw4ktFWkKFWDKrWruFg_yoWrZrW3pa 13ta90qr4xWrsFgry8JF4UAFWYyan2kay7Crn8Jw1a934fKr93ur4UKF1DAF1ruFnrWFya kFW3K39Y9FWj9r7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jF38nUUUUU= X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/1tbiMwS1XmddNByzIwAAse Content-Type: text/plain; charset="utf-8" From: Andy Yan In the upcoming VOP of rk3576, a Window cannot attach to all Video Ports, so make sure all VP find it's suitable primary plane, then register the remain windows as overlay plane will make code easier. Signed-off-by: Andy Yan Tested-by: Michael Riesch # on RK3568 Tested-by: Detlev Casanova --- (no changes since v3) Changes in v3: - Add comments for why we should treat rk3566 with special care. drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 100 +++++++++++-------- 1 file changed, 61 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.c index c87c98a8fb3a..e588d5d01e0a 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2223,22 +2223,29 @@ static int vop2_plane_init(struct vop2 *vop2, struc= t vop2_win *win, return 0; } =20 -static struct vop2_video_port *find_vp_without_primary(struct vop2 *vop2) +/* + * On RK3566 these windows don't have an independent + * framebuffer. They can only share/mirror the framebuffer + * with smart0, esmart0 and cluster0 respectively. + * And RK3566 share the same vop version with Rk3568, so we + * need to use soc_id for identification here. + */ +static bool vop2_is_mirror_win(struct vop2_win *win) { - int i; - - for (i =3D 0; i < vop2->data->nr_vps; i++) { - struct vop2_video_port *vp =3D &vop2->vps[i]; - - if (!vp->crtc.port) - continue; - if (vp->primary_plane) - continue; + struct vop2 *vop2 =3D win->vop2; =20 - return vp; + if (vop2->data->soc_id =3D=3D 3566) { + switch (win->data->phys_id) { + case ROCKCHIP_VOP2_SMART1: + case ROCKCHIP_VOP2_ESMART1: + case ROCKCHIP_VOP2_CLUSTER1: + return true; + default: + return false; + } + } else { + return false; } - - return NULL; } =20 static int vop2_create_crtcs(struct vop2 *vop2) @@ -2249,7 +2256,9 @@ static int vop2_create_crtcs(struct vop2 *vop2) struct drm_plane *plane; struct device_node *port; struct vop2_video_port *vp; - int i, nvp, nvps =3D 0; + struct vop2_win *win; + u32 possible_crtcs; + int i, j, nvp, nvps =3D 0; int ret; =20 for (i =3D 0; i < vop2_data->nr_vps; i++) { @@ -2288,42 +2297,55 @@ static int vop2_create_crtcs(struct vop2 *vop2) } =20 nvp =3D 0; - for (i =3D 0; i < vop2->registered_num_wins; i++) { - struct vop2_win *win =3D &vop2->win[i]; - u32 possible_crtcs =3D 0; - - if (vop2->data->soc_id =3D=3D 3566) { - /* - * On RK3566 these windows don't have an independent - * framebuffer. They share the framebuffer with smart0, - * esmart0 and cluster0 respectively. - */ - switch (win->data->phys_id) { - case ROCKCHIP_VOP2_SMART1: - case ROCKCHIP_VOP2_ESMART1: - case ROCKCHIP_VOP2_CLUSTER1: + /* Register a primary plane for every crtc */ + for (i =3D 0; i < vop2_data->nr_vps; i++) { + vp =3D &vop2->vps[i]; + + if (!vp->crtc.port) + continue; + + for (j =3D 0; j < vop2->registered_num_wins; j++) { + win =3D &vop2->win[j]; + + /* Aready registered as primary plane */ + if (win->base.type =3D=3D DRM_PLANE_TYPE_PRIMARY) + continue; + + if (vop2_is_mirror_win(win)) continue; - } - } =20 - if (win->type =3D=3D DRM_PLANE_TYPE_PRIMARY) { - vp =3D find_vp_without_primary(vop2); - if (vp) { + if (win->type =3D=3D DRM_PLANE_TYPE_PRIMARY) { possible_crtcs =3D BIT(nvp); vp->primary_plane =3D win; + ret =3D vop2_plane_init(vop2, win, possible_crtcs); + if (ret) { + drm_err(vop2->drm, "failed to init primary plane %s: %d\n", + win->data->name, ret); + return ret; + } nvp++; - } else { - /* change the unused primary window to overlay window */ - win->type =3D DRM_PLANE_TYPE_OVERLAY; + break; } } + } + + /* Register all unused window as overlay plane */ + for (i =3D 0; i < vop2->registered_num_wins; i++) { + win =3D &vop2->win[i]; + + /* Aready registered as primary plane */ + if (win->base.type =3D=3D DRM_PLANE_TYPE_PRIMARY) + continue; + + if (vop2_is_mirror_win(win)) + continue; =20 - if (win->type =3D=3D DRM_PLANE_TYPE_OVERLAY) - possible_crtcs =3D (1 << nvps) - 1; + win->type =3D DRM_PLANE_TYPE_OVERLAY; =20 + possible_crtcs =3D (1 << nvps) - 1; ret =3D vop2_plane_init(vop2, win, possible_crtcs); if (ret) { - drm_err(vop2->drm, "failed to init plane %s: %d\n", + drm_err(vop2->drm, "failed to init overlay plane %s: %d\n", win->data->name, ret); return ret; } --=20 2.34.1