| Message ID | 20240524150128.1878297-2-bigfoot@classfun.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/msm/dpu: drop duplicate drm formats from wb2_formats arrays | expand |
On 24.05.2024 5:01 PM, Junhao Xie wrote: > 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> Konrad
On 5/24/2024 8:01 AM, Junhao Xie wrote: > 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> > --- > 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") Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> (pls ignore the line breaks in the fixes line, I will fix it while applying)
On Fri, May 24, 2024 at 11:19:41AM -0700, Abhinav Kumar wrote: > > > On 5/24/2024 8:01 AM, Junhao Xie wrote: > > 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> > > --- > > 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") > > Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> > > (pls ignore the line breaks in the fixes line, I will fix it while applying) With the Fixes tags in place: Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On Fri, May 24, 2024 at 11:01:12PM +0800, Junhao Xie wrote: > 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> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 ------ > 1 file changed, 6 deletions(-) > To make patchwork happy: 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>
On Fri, 24 May 2024 23:01:12 +0800, Junhao Xie wrote: > 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,
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 47fd8baf53e6..3138e73c04f1 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -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,
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> --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 ------ 1 file changed, 6 deletions(-)