Commit 8c16b988 authored by Abhinav Kumar's avatar Abhinav Kumar Committed by Dmitry Baryshkov
Browse files

drm/msm/dpu: introduce separate wb2_format arrays for rgb and yuv 



Lets rename the existing wb2_formats array wb2_formats_rgb to indicate
that it has only RGB formats and can be used on any chipset having a WB
block.

Introduce a new wb2_formats_rgb_yuv array to the catalog to
indicate support for YUV formats to writeback in addition to RGB.

Chipsets which have support for CDM block will use the newly added
wb2_formats_rgb_yuv array.

changes in v3:
	- change type of wb2_formats_rgb/wb2_formats_rgb_yuv to u32
	  to fix checkpatch warnings

Signed-off-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/571837/
Link: https://lore.kernel.org/r/20231212205254.12422-15-quic_abhinavk@quicinc.com


[DB: fixed newer catalog entries]
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 8b45a26f

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h

+2 −2
Original line number Diff line number Diff line
@@ -341,8 +341,8 @@ static const struct dpu_wb_cfg sm8650_wb[] = { 
		.name = "wb_2", .id = WB_2,

		.base = 0x65000, .len = 0x2c8,

		.features = WB_SM8250_MASK,

		.format_list = wb2_formats,

		.num_formats = ARRAY_SIZE(wb2_formats),

		.format_list = wb2_formats_rgb,

		.num_formats = ARRAY_SIZE(wb2_formats_rgb),

		.xin_id = 6,

		.vbif_idx = VBIF_RT,

		.maxlinewidth = 4096,

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h

+2 −2
Original line number Diff line number Diff line
@@ -336,8 +336,8 @@ static const struct dpu_wb_cfg sm8250_wb[] = { 
		.name = "wb_2", .id = WB_2,

		.base = 0x65000, .len = 0x2c8,

		.features = WB_SM8250_MASK,

		.format_list = wb2_formats,

		.num_formats = ARRAY_SIZE(wb2_formats),

		.format_list = wb2_formats_rgb_yuv,

		.num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),

		.clk_ctrl = DPU_CLK_CTRL_WB2,

		.xin_id = 6,

		.vbif_idx = VBIF_RT,

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h

+2 −2
Original line number Diff line number Diff line
@@ -157,8 +157,8 @@ static const struct dpu_wb_cfg sc7180_wb[] = { 
		.name = "wb_2", .id = WB_2,

		.base = 0x65000, .len = 0x2c8,

		.features = WB_SM8250_MASK,

		.format_list = wb2_formats,

		.num_formats = ARRAY_SIZE(wb2_formats),

		.format_list = wb2_formats_rgb,

		.num_formats = ARRAY_SIZE(wb2_formats_rgb),

		.clk_ctrl = DPU_CLK_CTRL_WB2,

		.xin_id = 6,

		.vbif_idx = VBIF_RT,

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h

+2 −2
Original line number Diff line number Diff line
@@ -303,8 +303,8 @@ static const struct dpu_wb_cfg sm8350_wb[] = { 
		.name = "wb_2", .id = WB_2,

		.base = 0x65000, .len = 0x2c8,

		.features = WB_SM8250_MASK,

		.format_list = wb2_formats,

		.num_formats = ARRAY_SIZE(wb2_formats),

		.format_list = wb2_formats_rgb,

		.num_formats = ARRAY_SIZE(wb2_formats_rgb),

		.clk_ctrl = DPU_CLK_CTRL_WB2,

		.xin_id = 6,

		.vbif_idx = VBIF_RT,

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h

+2 −2
Original line number Diff line number Diff line
@@ -169,8 +169,8 @@ static const struct dpu_wb_cfg sc7280_wb[] = { 
		.name = "wb_2", .id = WB_2,

		.base = 0x65000, .len = 0x2c8,

		.features = WB_SM8250_MASK,

		.format_list = wb2_formats,

		.num_formats = ARRAY_SIZE(wb2_formats),

		.format_list = wb2_formats_rgb_yuv,

		.num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),

		.clk_ctrl = DPU_CLK_CTRL_WB2,

		.xin_id = 6,

		.vbif_idx = VBIF_RT,