drm/msm/dpu: Support YUV formats on writeback for DPU 5.x+

Now that CDM_0 has been enabled for DPU 5.x+, add support for YUV formats
on writeback

Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/641270/
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h
index 85fde7243dd4d011ed1e3a5719fd6c98cf7d6e77..6ac97c378056c08c937ed992b81d139cbb1fbbb0 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h
@@ -343,8 +343,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_rgb,
-               .num_formats = ARRAY_SIZE(wb2_formats_rgb),
+               .format_list = wb2_formats_rgb_yuv,
+               .num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),
                .xin_id = 6,
                .vbif_idx = VBIF_RT,
                .maxlinewidth = 4096,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
index 23188290001ffb45563a9953a9f710bacb4dac89..979527d98fbcb19c33ccb45b5ba4716031949985 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
@@ -298,8 +298,8 @@ static const struct dpu_wb_cfg sm8150_wb[] = {
                .name = "wb_2", .id = WB_2,
                .base = 0x65000, .len = 0x2c8,
                .features = WB_SM8250_MASK,
-               .format_list = wb2_formats_rgb,
-               .num_formats = ARRAY_SIZE(wb2_formats_rgb),
+               .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,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
index de8ccf589f1fe026ca0697d48f9533befda4659d..d76b8992a6c18c21a54eb2a373c789720b876c8b 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
@@ -305,8 +305,8 @@ static const struct dpu_wb_cfg sc8180x_wb[] = {
                .name = "wb_2", .id = WB_2,
                .base = 0x65000, .len = 0x2c8,
                .features = WB_SM8250_MASK,
-               .format_list = wb2_formats_rgb,
-               .num_formats = ARRAY_SIZE(wb2_formats_rgb),
+               .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,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h
index b2ebf76e386718b95292e119d53e67f5d9f0743a..83db11339b29dc6e11010bfc73f112f93cf6f7c6 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h
@@ -261,8 +261,8 @@ static const struct dpu_wb_cfg sm7150_wb[] = {
                .name = "wb_2", .id = WB_2,
                .base = 0x65000, .len = 0x2c8,
                .features = WB_SM8250_MASK,
-               .format_list = wb2_formats_rgb,
-               .num_formats = ARRAY_SIZE(wb2_formats_rgb),
+               .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,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h
index 2b4aea177bcac82107e8f68e9b6c2700bf6d7f8f..da11830d44072666e47b0505e2edc3ae7717eb23 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h
@@ -168,8 +168,8 @@ static const struct dpu_wb_cfg sm6150_wb[] = {
                .name = "wb_2", .id = WB_2,
                .base = 0x65000, .len = 0x2c8,
                .features = WB_SM8250_MASK,
-               .format_list = wb2_formats_rgb,
-               .num_formats = ARRAY_SIZE(wb2_formats_rgb),
+               .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,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
index cc2951112bdadca60fe51faeecb81e57280662c3..d3d3a34d0b45de08a33436f46a197cc836cf2629 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
@@ -145,8 +145,8 @@ static const struct dpu_wb_cfg sm6125_wb[] = {
                .name = "wb_2", .id = WB_2,
                .base = 0x65000, .len = 0x2c8,
                .features = WB_SM8250_MASK,
-               .format_list = wb2_formats_rgb,
-               .num_formats = ARRAY_SIZE(wb2_formats_rgb),
+               .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,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
index 42a00550eefbc10e97515340d6d8b33d4ef5e3fd..040c94c0bb66ef5aaab2808f6f5ee04dd53e2540 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
@@ -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_rgb,
-               .num_formats = ARRAY_SIZE(wb2_formats_rgb),
+               .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,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h
index 828a02429405238807562dd0aa29575f8367fdc7..397278ba999b24722b116e73b008b2d0aec5fcb5 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h
@@ -151,8 +151,8 @@ static const struct dpu_wb_cfg sm6350_wb[] = {
                .name = "wb_2", .id = WB_2,
                .base = 0x65000, .len = 0x2c8,
                .features = WB_SM8250_MASK,
-               .format_list = wb2_formats_rgb,
-               .num_formats = ARRAY_SIZE(wb2_formats_rgb),
+               .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,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
index 795e9ebf8c11dcc7d7cae7444fc3e386ced5792d..0c860e804cab8ece8966596f4ec2b17ff3aa226f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
@@ -305,8 +305,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_rgb,
-               .num_formats = ARRAY_SIZE(wb2_formats_rgb),
+               .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,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
index 048dfb9dbb601bdbbf6a1326a7af8680f2777b5d..19b2ee8bbd5fd3ab6096ea1c9dc2e0f804bec973 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
@@ -321,8 +321,8 @@ static const struct dpu_wb_cfg sm8450_wb[] = {
                .name = "wb_2", .id = WB_2,
                .base = 0x65000, .len = 0x2c8,
                .features = WB_SM8250_MASK,
-               .format_list = wb2_formats_rgb,
-               .num_formats = ARRAY_SIZE(wb2_formats_rgb),
+               .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,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
index a5b90e5e31202900c0bb5bc4a705a6b269005474..24f988465bf6ba8e3d3d2691534f0981f222fa27 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
@@ -317,8 +317,8 @@ static const struct dpu_wb_cfg sm8550_wb[] = {
                .name = "wb_2", .id = WB_2,
                .base = 0x65000, .len = 0x2c8,
                .features = WB_SM8250_MASK,
-               .format_list = wb2_formats_rgb,
-               .num_formats = ARRAY_SIZE(wb2_formats_rgb),
+               .format_list = wb2_formats_rgb_yuv,
+               .num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),
                .xin_id = 6,
                .vbif_idx = VBIF_RT,
                .maxlinewidth = 4096,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h
index 8977fa48926b40d486110424f70344c4d29abe80..6417baa84f826feb3bc6eaa6b063ad75e597a9d7 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h
@@ -317,8 +317,8 @@ static const struct dpu_wb_cfg x1e80100_wb[] = {
                .name = "wb_2", .id = WB_2,
                .base = 0x65000, .len = 0x2c8,
                .features = WB_SM8250_MASK,
-               .format_list = wb2_formats_rgb,
-               .num_formats = ARRAY_SIZE(wb2_formats_rgb),
+               .format_list = wb2_formats_rgb_yuv,
+               .num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),
                .xin_id = 6,
                .vbif_idx = VBIF_RT,
                .maxlinewidth = 4096,