From bba5e44c03a3198be98219d241a1a82b995e39f4 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Wed, 16 Jun 2021 15:51:15 +0800 Subject: [PATCH] drm/rockchip: vop2: Move Primary window to head and Cluster to tail This make primary win register first to get the lower zpos. Also hide the cluster win to the tail, give it a lower chance to be found by some tradional display sorftware(etc X11). Change-Id: I20e4885c6b18d7eec6ecc32fbf1ac5620fbb8a30 Signed-off-by: Andy Yan --- drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 176 +++++++++---------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c index 835571bbbc22..59c101307eed 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -1001,6 +1001,94 @@ static const struct vop2_win_regs rk3568_esmart_win_data = { * @TODO describe the wind like cpu-map dt nodes; */ static const struct vop2_win_data rk3568_vop_win_data[] = { + { + .name = "Smart0-win0", + .phys_id = 4, + .base = 0x400, + .formats = formats_win_lite, + .nformats = ARRAY_SIZE(formats_win_lite), + .format_modifiers = format_modifiers, + .layer_sel_id = 3, + .supported_rotations = DRM_MODE_REFLECT_Y, + .hsu_filter_mode = VOP2_SCALE_UP_BIC, + .hsd_filter_mode = VOP2_SCALE_DOWN_BIL, + .vsu_filter_mode = VOP2_SCALE_UP_BIL, + .vsd_filter_mode = VOP2_SCALE_DOWN_BIL, + .regs = &rk3568_esmart_win_data, + .area = rk3568_area_data, + .area_size = ARRAY_SIZE(rk3568_area_data), + .type = DRM_PLANE_TYPE_PRIMARY, + .max_upscale_factor = 8, + .max_downscale_factor = 8, + .dly = { 20, 47, 41 }, + }, + + { + .name = "Smart1-win0", + .phys_id = 5, + .formats = formats_win_lite, + .nformats = ARRAY_SIZE(formats_win_lite), + .format_modifiers = format_modifiers, + .base = 0x600, + .layer_sel_id = 7, + .supported_rotations = DRM_MODE_REFLECT_Y, + .hsu_filter_mode = VOP2_SCALE_UP_BIC, + .hsd_filter_mode = VOP2_SCALE_DOWN_BIL, + .vsu_filter_mode = VOP2_SCALE_UP_BIL, + .vsd_filter_mode = VOP2_SCALE_DOWN_BIL, + .regs = &rk3568_esmart_win_data, + .area = rk3568_area_data, + .area_size = ARRAY_SIZE(rk3568_area_data), + .type = DRM_PLANE_TYPE_PRIMARY, + .max_upscale_factor = 8, + .max_downscale_factor = 8, + .dly = { 20, 47, 41 }, + }, + + { + .name = "Esmart1-win0", + .phys_id = 3, + .formats = formats_win_full_10bit_yuyv, + .nformats = ARRAY_SIZE(formats_win_full_10bit_yuyv), + .format_modifiers = format_modifiers, + .base = 0x200, + .layer_sel_id = 6, + .supported_rotations = DRM_MODE_REFLECT_Y, + .hsu_filter_mode = VOP2_SCALE_UP_BIC, + .hsd_filter_mode = VOP2_SCALE_DOWN_BIL, + .vsu_filter_mode = VOP2_SCALE_UP_BIL, + .vsd_filter_mode = VOP2_SCALE_DOWN_BIL, + .regs = &rk3568_esmart_win_data, + .area = rk3568_area_data, + .area_size = ARRAY_SIZE(rk3568_area_data), + .type = DRM_PLANE_TYPE_PRIMARY, + .max_upscale_factor = 8, + .max_downscale_factor = 8, + .dly = { 20, 47, 41 }, + }, + + { + .name = "Esmart0-win0", + .phys_id = 2, + .formats = formats_win_full_10bit_yuyv, + .nformats = ARRAY_SIZE(formats_win_full_10bit_yuyv), + .format_modifiers = format_modifiers, + .base = 0x0, + .layer_sel_id = 2, + .supported_rotations = DRM_MODE_REFLECT_Y, + .hsu_filter_mode = VOP2_SCALE_UP_BIC, + .hsd_filter_mode = VOP2_SCALE_DOWN_BIL, + .vsu_filter_mode = VOP2_SCALE_UP_BIL, + .vsd_filter_mode = VOP2_SCALE_DOWN_BIL, + .regs = &rk3568_esmart_win_data, + .area = rk3568_area_data, + .area_size = ARRAY_SIZE(rk3568_area_data), + .type = DRM_PLANE_TYPE_OVERLAY, + .max_upscale_factor = 8, + .max_downscale_factor = 8, + .dly = { 20, 47, 41 }, + }, + { .name = "Cluster0-win0", .phys_id = 0, @@ -1084,94 +1172,6 @@ static const struct vop2_win_data rk3568_vop_win_data[] = { .max_downscale_factor = 4, .feature = WIN_FEATURE_AFBDC | WIN_FEATURE_CLUSTER_SUB, }, - - { - .name = "Esmart0-win0", - .phys_id = 2, - .formats = formats_win_full_10bit_yuyv, - .nformats = ARRAY_SIZE(formats_win_full_10bit_yuyv), - .format_modifiers = format_modifiers, - .base = 0x0, - .layer_sel_id = 2, - .supported_rotations = DRM_MODE_REFLECT_Y, - .hsu_filter_mode = VOP2_SCALE_UP_BIC, - .hsd_filter_mode = VOP2_SCALE_DOWN_BIL, - .vsu_filter_mode = VOP2_SCALE_UP_BIL, - .vsd_filter_mode = VOP2_SCALE_DOWN_BIL, - .regs = &rk3568_esmart_win_data, - .area = rk3568_area_data, - .area_size = ARRAY_SIZE(rk3568_area_data), - .type = DRM_PLANE_TYPE_OVERLAY, - .max_upscale_factor = 8, - .max_downscale_factor = 8, - .dly = { 20, 47, 41 }, - }, - - { - .name = "Esmart1-win0", - .phys_id = 3, - .formats = formats_win_full_10bit_yuyv, - .nformats = ARRAY_SIZE(formats_win_full_10bit_yuyv), - .format_modifiers = format_modifiers, - .base = 0x200, - .layer_sel_id = 6, - .supported_rotations = DRM_MODE_REFLECT_Y, - .hsu_filter_mode = VOP2_SCALE_UP_BIC, - .hsd_filter_mode = VOP2_SCALE_DOWN_BIL, - .vsu_filter_mode = VOP2_SCALE_UP_BIL, - .vsd_filter_mode = VOP2_SCALE_DOWN_BIL, - .regs = &rk3568_esmart_win_data, - .area = rk3568_area_data, - .area_size = ARRAY_SIZE(rk3568_area_data), - .type = DRM_PLANE_TYPE_PRIMARY, - .max_upscale_factor = 8, - .max_downscale_factor = 8, - .dly = { 20, 47, 41 }, - }, - - { - .name = "Smart0-win0", - .phys_id = 4, - .base = 0x400, - .formats = formats_win_lite, - .nformats = ARRAY_SIZE(formats_win_lite), - .format_modifiers = format_modifiers, - .layer_sel_id = 3, - .supported_rotations = DRM_MODE_REFLECT_Y, - .hsu_filter_mode = VOP2_SCALE_UP_BIC, - .hsd_filter_mode = VOP2_SCALE_DOWN_BIL, - .vsu_filter_mode = VOP2_SCALE_UP_BIL, - .vsd_filter_mode = VOP2_SCALE_DOWN_BIL, - .regs = &rk3568_esmart_win_data, - .area = rk3568_area_data, - .area_size = ARRAY_SIZE(rk3568_area_data), - .type = DRM_PLANE_TYPE_PRIMARY, - .max_upscale_factor = 8, - .max_downscale_factor = 8, - .dly = { 20, 47, 41 }, - }, - - { - .name = "Smart1-win0", - .phys_id = 5, - .formats = formats_win_lite, - .nformats = ARRAY_SIZE(formats_win_lite), - .format_modifiers = format_modifiers, - .base = 0x600, - .layer_sel_id = 7, - .supported_rotations = DRM_MODE_REFLECT_Y, - .hsu_filter_mode = VOP2_SCALE_UP_BIC, - .hsd_filter_mode = VOP2_SCALE_DOWN_BIL, - .vsu_filter_mode = VOP2_SCALE_UP_BIL, - .vsd_filter_mode = VOP2_SCALE_DOWN_BIL, - .regs = &rk3568_esmart_win_data, - .area = rk3568_area_data, - .area_size = ARRAY_SIZE(rk3568_area_data), - .type = DRM_PLANE_TYPE_PRIMARY, - .max_upscale_factor = 8, - .max_downscale_factor = 8, - .dly = { 20, 47, 41 }, - }, }; static const struct vop_grf_ctrl rk3568_grf_ctrl = {