From 3483d7ceb2f38ead1feea2dc50cea079080e5dd6 Mon Sep 17 00:00:00 2001 From: Leo Wen Date: Thu, 27 Dec 2018 20:26:24 +0800 Subject: [PATCH] drm/rockchip: vop: use win1 for ui instead of win0 in px30 vopb. PX30 vopb have win0, win1 and win2 layers.the formats they support below: Win0: XR24 AR24 XB24 AB24 RG24 BG24 RG16 BG16 NV12 NV16 NV24 NA12 NA16 NA24 Win1/2: XR24 AR24 XB24 AB24 RG24 BG24 RG16 BG16 Only the win0 layer support NV12 format(video decode format). So change to use win0 for video overlay layer and win1 for ui layer. Change-Id: I7ef8bda4be908188700ca4d3f1df23a6336e02b2 Signed-off-by: Leo Wen --- drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index 17cc36093ec6..4da435842723 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -1470,12 +1470,12 @@ static const struct vop_win_phy px30_win23_data = { static const struct vop_win_data px30_vop_big_win_data[] = { { .base = 0x00, .phy = &rk3366_lit_win0_data, - .type = DRM_PLANE_TYPE_PRIMARY }, + .type = DRM_PLANE_TYPE_OVERLAY }, { .base = 0x00, .phy = &rk3366_lit_win1_data, - .type = DRM_PLANE_TYPE_CURSOR, + .type = DRM_PLANE_TYPE_PRIMARY, .feature = WIN_FEATURE_AFBDC }, { .base = 0xe0, .phy = &px30_win23_data, - .type = DRM_PLANE_TYPE_OVERLAY, + .type = DRM_PLANE_TYPE_CURSOR, .area = rk3368_area_data, .area_size = ARRAY_SIZE(rk3368_area_data), }, };