drm/komeda: Set output color depth for output

Set color_depth according to connector->bpc.

Changes since v1:
 - Fixed min_bpc is effectively set but not used in
komeda_crtc_get_color_config().

Changes since v2:
 - Align the code.

Signed-off-by: Lowry Li (Arm Technology China) <lowry.li@arm.com>
Reviewed-by: Mihail Atanassov <mihail.atanassov@arm.com>
Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com>
Signed-off-by: james qian wang (Arm Technology China) <james.qian.wang@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191012065030.12691-1-lowry.li@arm.com

diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c
index f160ae7e17b4701bd1b8c902ae5b01a7bc6e92ec..b23d59a62ecd7f92cbeb2c8bf57b530bbf0b5da7 100644 (file)
--- a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c
+++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c
@@ -1041,6 +1041,7 @@ static void d71_improc_update(struct komeda_component *c,
                               to_d71_input_id(state, index));
 
        malidp_write32(reg, BLK_SIZE, HV_SIZE(st->hsize, st->vsize));
+       malidp_write32(reg, IPS_DEPTH, st->color_depth);
 }
 
 static void d71_improc_dump(struct komeda_component *c, struct seq_file *sf)

diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
index 9beeda04818bd5c1c40cd6cd76e246802c21c01d..5138a0c01024e0b54ebe16c0c0a17218554bcfca 100644 (file)
--- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
@@ -17,6 +17,26 @@
 #include "komeda_dev.h"
 #include "komeda_kms.h"
 
+void komeda_crtc_get_color_config(struct drm_crtc_state *crtc_st,
+                                 u32 *color_depths)
+{
+       struct drm_connector *conn;
+       struct drm_connector_state *conn_st;
+       int i, min_bpc = 31, conn_bpc = 0;
+
+       for_each_new_connector_in_state(crtc_st->state, conn, conn_st, i) {
+               if (conn_st->crtc != crtc_st->crtc)
+                       continue;
+
+               conn_bpc = conn->display_info.bpc ? conn->display_info.bpc : 8;
+
+               if (conn_bpc < min_bpc)
+                       min_bpc = conn_bpc;
+       }
+
+       *color_depths = GENMASK(min_bpc, 0);
+}
+
 static void komeda_crtc_update_clock_ratio(struct komeda_crtc_state *kcrtc_st)
 {
        u64 pxlclk, aclk;

diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
index 45c498e15e7aec7d89321ca84302fdfefe4e104c..a42503451b5dc06606c51fc80790de1e7414db2f 100644 (file)
--- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
@@ -166,6 +166,8 @@ static inline bool has_flip_h(u32 rot)
                return !!(rotation & DRM_MODE_REFLECT_X);
 }
 
+void komeda_crtc_get_color_config(struct drm_crtc_state *crtc_st,
+                                 u32 *color_depths);
 unsigned long komeda_crtc_get_aclk(struct komeda_crtc_state *kcrtc_st);
 
 int komeda_kms_setup_crtcs(struct komeda_kms_dev *kms, struct komeda_dev *mdev);

diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
index 80bcbe31c794bbad20ccb958dce64daa5caf2021..467e891500a98c4e64cd1df6f9c5707cc60f0ccd 100644 (file)
--- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
@@ -325,6 +325,7 @@ struct komeda_improc {
 
 struct komeda_improc_state {
        struct komeda_component_state base;
+       u8 color_depth;
        u16 hsize, vsize;
 };
 

diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
index cb794b0c6e1a5cb4a7322b1d0ab400f4d1efa00e..039085b9545d4858025cbf39877bddee89aa0932 100644 (file)
--- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
@@ -760,6 +760,7 @@ komeda_improc_validate(struct komeda_improc *improc,
                       struct komeda_data_flow_cfg *dflow)
 {
        struct drm_crtc *crtc = kcrtc_st->base.crtc;
+       struct drm_crtc_state *crtc_st = &kcrtc_st->base;
        struct komeda_component_state *c_st;
        struct komeda_improc_state *st;
 
@@ -773,6 +774,23 @@ komeda_improc_validate(struct komeda_improc *improc,
        st->hsize = dflow->in_w;
        st->vsize = dflow->in_h;
 
+       if (drm_atomic_crtc_needs_modeset(crtc_st)) {
+               u32 output_depths;
+               u32 avail_depths;
+
+               komeda_crtc_get_color_config(crtc_st, &output_depths);
+
+               avail_depths = output_depths & improc->supported_color_depths;
+               if (avail_depths == 0) {
+                       DRM_DEBUG_ATOMIC("No available color depths, conn depths: 0x%x & display: 0x%x\n",
+                                        output_depths,
+                                        improc->supported_color_depths);
+                       return -EINVAL;
+               }
+
+               st->color_depth = __fls(avail_depths);
+       }
+
        komeda_component_add_input(&st->base, &dflow->input, 0);
        komeda_component_set_output(&dflow->input, &improc->base, 0);
 

diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
index 2851cac94d8699883dbaa9a4e9b8f202e33da0eb..740a8125063053fcbe4dbf00e76655502cc212f0 100644 (file)
--- a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
@@ -142,6 +142,7 @@ static int komeda_wb_connector_add(struct komeda_kms_dev *kms,
        struct komeda_dev *mdev = kms->base.dev_private;
        struct komeda_wb_connector *kwb_conn;
        struct drm_writeback_connector *wb_conn;
+       struct drm_display_info *info;
        u32 *formats, n_formats = 0;
        int err;
 
@@ -171,6 +172,9 @@ static int komeda_wb_connector_add(struct komeda_kms_dev *kms,
 
        drm_connector_helper_add(&wb_conn->base, &komeda_wb_conn_helper_funcs);
 
+       info = &kwb_conn->base.base.display_info;
+       info->bpc = __fls(kcrtc->master->improc->supported_color_depths);
+
        kcrtc->wb_conn = kwb_conn;
 
        return 0;