drm/msm/dpu: drop duplicate drm formats from wb2_formats arrays

There are duplicate items in wb2_formats_rgb and wb2_formats_rgb_yuv,
which cause weston assertions failed.

weston: libweston/drm-formats.c:131: weston_drm_format_array_add_format:
Assertion `!weston_drm_format_array_find_format(formats, format)' failed.

Signed-off-by: Junhao Xie <bigfoot@classfun.cn>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Fixes: 8c16b988ba2d ("drm/msm/dpu: introduce separate wb2_format arrays for rgb and yuv")
Fixes: 53324b99bd7b ("drm/msm/dpu: add writeback blocks to the sm8250 DPU catalog")
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/596847/
Link: https://lore.kernel.org/r/20240524150128.1878297-2-bigfoot@classfun.cn
Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
index f2b6eac7601ddf13aa67b8c947c0d43e42bb8920..9b72977feafa4750aacf4b0be7513984a9ddcdd3 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
@@ -220,12 +220,9 @@ static const u32 wb2_formats_rgb[] = {
        DRM_FORMAT_RGBA4444,
        DRM_FORMAT_RGBX4444,
        DRM_FORMAT_XRGB4444,
-       DRM_FORMAT_BGR565,
        DRM_FORMAT_BGR888,
-       DRM_FORMAT_ABGR8888,
        DRM_FORMAT_BGRA8888,
        DRM_FORMAT_BGRX8888,
-       DRM_FORMAT_XBGR8888,
        DRM_FORMAT_ABGR1555,
        DRM_FORMAT_BGRA5551,
        DRM_FORMAT_XBGR1555,
@@ -254,12 +251,9 @@ static const u32 wb2_formats_rgb_yuv[] = {
        DRM_FORMAT_RGBA4444,
        DRM_FORMAT_RGBX4444,
        DRM_FORMAT_XRGB4444,
-       DRM_FORMAT_BGR565,
        DRM_FORMAT_BGR888,
-       DRM_FORMAT_ABGR8888,
        DRM_FORMAT_BGRA8888,
        DRM_FORMAT_BGRX8888,
-       DRM_FORMAT_XBGR8888,
        DRM_FORMAT_ABGR1555,
        DRM_FORMAT_BGRA5551,
        DRM_FORMAT_XBGR1555,