From cec0bf1796568b7ee31f3e32251394ca8a081807 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Wed, 4 Sep 2024 16:13:01 +0800 Subject: [PATCH] drm/rockchip: vop2: Remove redundant afbc modifier for rk3576 AFBC_FORMAT_MOD_BLOCK_SIZE_32x8 | AFBC_FORMAT_MOD_YTR | AFBC_FORMAT_MOD_SPARSE | AFBC_FORMAT_MOD_SPLIT defined twice. This may cause weston startup failed at: weston: ../libweston/drm-formats.c:451: weston_drm_format_add_modifier: Assertion `!weston_drm_format_has_modifier(format, modifier)' failed. Change-Id: I5e1a1832e3a5d939487023d3a0a7eb3f984468ea Signed-off-by: Andy Yan --- drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c index e17c8c4a55f6..9577d9930db8 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -342,11 +342,6 @@ static const uint64_t format_modifiers_afbc_tiled_for_vop3[] = { AFBC_FORMAT_MOD_CBR | AFBC_FORMAT_MOD_SPLIT), - DRM_FORMAT_MOD_ARM_AFBC(AFBC_FORMAT_MOD_BLOCK_SIZE_32x8 | - AFBC_FORMAT_MOD_YTR | - AFBC_FORMAT_MOD_SPARSE | - AFBC_FORMAT_MOD_SPLIT), - DRM_FORMAT_MOD_ARM_AFBC(AFBC_FORMAT_MOD_BLOCK_SIZE_32x8 | AFBC_FORMAT_MOD_CBR | AFBC_FORMAT_MOD_SPARSE |