]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/rockchip: remove NR_LAYERS macro on vop2
authorAndy Yan <andy.yan@rock-chips.com>
Fri, 13 Oct 2023 12:20:51 +0000 (20:20 +0800)
committerHeiko Stuebner <heiko@sntech.de>
Mon, 16 Oct 2023 13:05:24 +0000 (15:05 +0200)
There are 8 layers on rk3588, so a fix defined macro is
not appropriate.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20231013122051.1594164-1-andyshrk@163.com
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c

index c5b8d716e49398a103ef839bfe5c57279094414d..cce9183d750d7cf57084398926e9c2572d92974a 100644 (file)
@@ -2250,8 +2250,6 @@ static struct vop2_video_port *find_vp_without_primary(struct vop2 *vop2)
        return NULL;
 }
 
-#define NR_LAYERS 6
-
 static int vop2_create_crtcs(struct vop2 *vop2)
 {
        const struct vop2_data *vop2_data = vop2->data;
@@ -2370,7 +2368,7 @@ static int vop2_create_crtcs(struct vop2 *vop2)
                struct vop2_video_port *vp = &vop2->vps[i];
 
                if (vp->crtc.port)
-                       vp->nlayers = NR_LAYERS / nvps;
+                       vp->nlayers = vop2_data->win_size / nvps;
        }
 
        return 0;