Skip to contentSkip to conversation

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

PATCH Applied Junhao Xie 4 participants 6 messages May 24, 2024 – Jun 5, 2024

Subsystems (3)
lore
Share & tools
lore

Junhao Xie

author
#0 lore raw

PATCH 1/1 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.

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 ------
 1 file changed, 6 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +0 -6
index 47fd8baf53e6..3138e73c04f1 100644
@@ -216,12 +216,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,
@@ -250,12 +247,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,
Signature · 1 line
2.44.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Junhao Xie

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.

---

Konrad

Reviewed-by on v1 1/1
#2 lore raw
In reply to Junhao Xie
Quoted 11 lines · Junhao Xie

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.

---
  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 ------
  1 file changed, 6 deletions(-)

I think we need two fixes tag here, one for the RGB array and the other one for the RGB+YUV array.

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")

(pls ignore the line breaks in the fixes line, I will fix it while applying)

Reviewed-by
#3 lore raw
Quoted 19 lines · Abhinav Kumar
Quoted 11 lines · Junhao Xie

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.

---
  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 ------
  1 file changed, 6 deletions(-)

I think we need two fixes tag here, one for the RGB array and the other one for the RGB+YUV array.

Fixes 8c16b988ba2d ("drm/msm/dpu: introduce separate wb2_format arrays for
Quoted 8 lines

rgb and yuv")

Fixes 53324b99bd7b ("drm/msm/dpu: add writeback blocks to the sm8250 DPU

catalog")

(pls ignore the line breaks in the fixes line, I will fix it while applying)

With the Fixes tags in place:

Signature · 2 lines
With best wishes
Dmitry
Reviewed-by Konrad Dybcio Reviewed-by Abhinav Kumar Reviewed-by on v1 1/1
#4 lore raw
In reply to Junhao Xie
Quoted 11 lines · Junhao Xie

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.

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 ------
 1 file changed, 6 deletions(-)

To make patchwork happy:

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")
Signature · 2 lines
With best wishes
Dmitry
#5 lore raw
In reply to Junhao Xie
Quoted 8 lines · Junhao Xie

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.

[...]

Applied, thanks!

[1/1] drm/msm/dpu: drop duplicate drm formats from wb2_formats arrays

      https://gitlab.freedesktop.org/abhinavk/msm-next/-/commit/3788ddf084b7

Best regards,

Signature · 1 line
Abhinav Kumar <[email protected]>