drm/komeda: Set output color depth for output
Subsystems (4)
PATCH 1/1 drm/komeda: Set output color depth for output
Set color_depth according to connector->bpc.
--- .../arm/display/komeda/d71/d71_component.c | 1 + .../gpu/drm/arm/display/komeda/komeda_crtc.c | 20 +++++++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_kms.h | 2 ++ .../drm/arm/display/komeda/komeda_pipeline.h | 1 + .../display/komeda/komeda_pipeline_state.c | 19 ++++++++++++++++++ .../arm/display/komeda/komeda_wb_connector.c | 4 ++++ 6 files changed, 47 insertions(+)
drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +1 -0
@@ -951,6 +951,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)
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +20 -0
@@ -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 (conn_bpc,0 ); +} +static void komeda_crtc_update_clock_ratio (struct komeda_crtc_state *kcrtc_st) {u64 pxlclk, aclk;
drivers/gpu/drm/arm/display/komeda/komeda_kms.h +2 -0
@@ -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);
drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +1 -0
@@ -323,6 +323,7 @@ struct komeda_improc {struct komeda_improc_state {struct komeda_component_state base; +u8 color_depth;u16 hsize, vsize; };
drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +19 -0
@@ -743,6 +743,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;
@@ -756,6 +757,24 @@ 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 );
drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +4 -0
@@ -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 ;
Signature · 1 line
2.17.1
Hi Lowry,
Quoted 37 lines · On Tuesday, 8 October 2019 10:17:52 BST Lowry Li (Arm Technology China) wrote:
Set
color_depthaccording toconnector->bpc.Signed-off-by Lowry Li (Arm Technology China) <[email protected]>--- .../arm/display/komeda/d71/d71_component.c | 1 + .../gpu/drm/arm/display/komeda/komeda_crtc.c | 20 +++++++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_kms.h | 2 ++ .../drm/arm/display/komeda/komeda_pipeline.h | 1 + .../display/komeda/komeda_pipeline_state.c | 19 ++++++++++++++++++ .../arm/display/komeda/komeda_wb_connector.c | 4 ++++ 6 files changed, 47 insertions(+)drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +1
-0@@ -951,6 +951,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)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +5
-0@@ -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;
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c line 34
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +10
-0+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;
Something doesn't add up here. min_bpc is effectively set but not used.
Quoted 93 lines
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +5
-0+ } + + *color_depths =GENMASK (conn_bpc,0 ); +} +static void komeda_crtc_update_clock_ratio (struct komeda_crtc_state *kcrtc_st) {u64 pxlclk, aclk;drivers/gpu/drm/arm/display/komeda/komeda_kms.h +2
-0@@ -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);drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +1
-0@@ -323,6 +323,7 @@ struct komeda_improc {struct komeda_improc_state {struct komeda_component_state base; +u8 color_depth;u16 hsize, vsize; };drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +19
-0@@ -743,6 +743,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;@@ -756,6 +757,24 @@ 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 );drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +4
-0@@ -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 ;
Signature · 8 lines
Mihail _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Mihail,
Quoted 35 lines · Mihail Atanassov
Hi Lowry,
Quoted 32 lines · On Tuesday, 8 October 2019 10:17:52 BST Lowry Li (Arm Technology China) wrote:
Set
color_depthaccording toconnector->bpc.Signed-off-by Lowry Li (Arm Technology China) <[email protected]>--- .../arm/display/komeda/d71/d71_component.c | 1 + .../gpu/drm/arm/display/komeda/komeda_crtc.c | 20 +++++++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_kms.h | 2 ++ .../drm/arm/display/komeda/komeda_pipeline.h | 1 + .../display/komeda/komeda_pipeline_state.c | 19 ++++++++++++++++++ .../arm/display/komeda/komeda_wb_connector.c | 4 ++++ 6 files changed, 47 insertions(+)drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +1
-0@@ -951,6 +951,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)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +0
-0@@ -17,6 +17,26 @@#include "komeda_dev.h" #include "komeda_kms.h"
Quoted 16 lines
Quoted 5 lines
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +5
-0+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;drivers/gpu/drm/arm/display/komeda/komeda_crtc.c line 34
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +10
-0+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;Something doesn't add up here.
min_bpcis effectively set but not used.
Thanks a lot for the correction. We'd use min_bpc to get color_depths bitmask. Will correct this.
Quoted 86 lines
Quoted 86 lines
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +5
-0+ } + + *color_depths =GENMASK (conn_bpc,0 ); +} +static void komeda_crtc_update_clock_ratio (struct komeda_crtc_state *kcrtc_st) {u64 pxlclk, aclk;drivers/gpu/drm/arm/display/komeda/komeda_kms.h +2
-0@@ -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);drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +1
-0@@ -323,6 +323,7 @@ struct komeda_improc {struct komeda_improc_state {struct komeda_component_state base; +u8 color_depth;u16 hsize, vsize; };drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +19
-0@@ -743,6 +743,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;@@ -756,6 +757,24 @@ 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 );drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +1
-0@@ -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);
Quoted 13 lines
Quoted 7 lines
drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +3
-0+ info = &kwb_conn->base.base.display_info; + info->bpc =__fls (kcrtc->master->improc->supported_color_depths); + kcrtc->wb_conn = kwb_conn;return 0 ;Signature · 1 line
Mihail
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Lowry,
Quoted 34 lines · Lowry Li (Arm Technology China)
Set
color_depthaccording toconnector->bpc.Signed-off-by Lowry Li (Arm Technology China) <[email protected]>--- .../arm/display/komeda/d71/d71_component.c | 1 + .../gpu/drm/arm/display/komeda/komeda_crtc.c | 20 +++++++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_kms.h | 2 ++ .../drm/arm/display/komeda/komeda_pipeline.h | 1 + .../display/komeda/komeda_pipeline_state.c | 19 ++++++++++++++++++ .../arm/display/komeda/komeda_wb_connector.c | 4 ++++ 6 files changed, 47 insertions(+)drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +1
-0@@ -951,6 +951,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)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +2
-0@@ -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)
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c line 31
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +10
-0+{ +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 ;
We can have multiple connectors on a single CRTC (e.g. normal + writeback), so what's the expected behaviour here in that case?
Quoted 86 lines
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +8
-0+ +if (conn_bpc < min_bpc) + min_bpc = conn_bpc; + } + + *color_depths =GENMASK (conn_bpc,0 ); +} +static void komeda_crtc_update_clock_ratio (struct komeda_crtc_state *kcrtc_st) {u64 pxlclk, aclk;drivers/gpu/drm/arm/display/komeda/komeda_kms.h +2
-0@@ -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);drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +1
-0@@ -323,6 +323,7 @@ struct komeda_improc {struct komeda_improc_state {struct komeda_component_state base; +u8 color_depth;u16 hsize, vsize; };drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +19
-0@@ -743,6 +743,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;@@ -756,6 +757,24 @@ 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 );drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +1
-0@@ -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;
drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c static int komeda_wb_connector_add(struct komeda_kms_dev *kms, · line 177
Quoted 6 lines
drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +3
-0@@ -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); +
The IPS color depth doesn't really apply to writeback. Maybe we should just skip the writeback connector?
Thanks,
-Brian
Quoted 6 lines
drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +0
-0kcrtc->wb_conn = kwb_conn;return 0 ;Signature · 1 line
2.17.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Brian,
Quoted 147 lines · Brian Starkey
Hi Lowry,
Quoted 34 lines · Lowry Li (Arm Technology China)
Set
color_depthaccording toconnector->bpc.Signed-off-by Lowry Li (Arm Technology China) <[email protected]>--- .../arm/display/komeda/d71/d71_component.c | 1 + .../gpu/drm/arm/display/komeda/komeda_crtc.c | 20 +++++++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_kms.h | 2 ++ .../drm/arm/display/komeda/komeda_pipeline.h | 1 + .../display/komeda/komeda_pipeline_state.c | 19 ++++++++++++++++++ .../arm/display/komeda/komeda_wb_connector.c | 4 ++++ 6 files changed, 47 insertions(+)drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +1
-0@@ -951,6 +951,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)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +2
-0@@ -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)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c line 31
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +10
-0+{ +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 ;We can have multiple connectors on a single CRTC (e.g. normal + writeback), so what's the expected behaviour here in that case?
Quoted 86 lines
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +8
-0+ +if (conn_bpc < min_bpc) + min_bpc = conn_bpc; + } + + *color_depths =GENMASK (conn_bpc,0 ); +} +static void komeda_crtc_update_clock_ratio (struct komeda_crtc_state *kcrtc_st) {u64 pxlclk, aclk;drivers/gpu/drm/arm/display/komeda/komeda_kms.h +2
-0@@ -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);drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +1
-0@@ -323,6 +323,7 @@ struct komeda_improc {struct komeda_improc_state {struct komeda_component_state base; +u8 color_depth;u16 hsize, vsize; };drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +19
-0@@ -743,6 +743,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;@@ -756,6 +757,24 @@ 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 );drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +1
-0@@ -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;drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c static int komeda_wb_connector_add(struct komeda_kms_dev *kms, · line 177
Quoted 6 lines
drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +3
-0@@ -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); +The IPS color depth doesn't really apply to writeback. Maybe we should just skip the writeback connector?
Quoted 3 lines
Thanks,
-Brian
Yes, the color depth not apply to writeback. We adds it because:
In the komeda_crtc_get_color_config() will loop all connectors of CRTC
including the wb_conn, since crtc always has wb_conn. If not setting
here, wb_conn->bpc will be set it to 8bit forcely in komeda_crtc_get_color_config() which will lead crtc bpc to 8bits all the time. So we are setting the largest supported depth to kwb_conn->bpc here.
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +0
-0kcrtc->wb_conn = kwb_conn;return 0 ;Signature · 1 line
2.17.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 152 lines · On Tuesday, 8 October 2019 11:28:24 BST Lowry Li (Arm Technology China) wrote:
Hi Brian,
Quoted 147 lines · Brian Starkey
Hi Lowry,
Quoted 34 lines · Lowry Li (Arm Technology China)
Set
color_depthaccording toconnector->bpc.Signed-off-by Lowry Li (Arm Technology China) <[email protected]>--- .../arm/display/komeda/d71/d71_component.c | 1 + .../gpu/drm/arm/display/komeda/komeda_crtc.c | 20 +++++++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_kms.h | 2 ++ .../drm/arm/display/komeda/komeda_pipeline.h | 1 + .../display/komeda/komeda_pipeline_state.c | 19 ++++++++++++++++++ .../arm/display/komeda/komeda_wb_connector.c | 4 ++++ 6 files changed, 47 insertions(+)drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +1
-0@@ -951,6 +951,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)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +2
-0@@ -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)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c line 31
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +10
-0+{ +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 ;We can have multiple connectors on a single CRTC (e.g. normal + writeback), so what's the expected behaviour here in that case?
Quoted 86 lines
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +8
-0+ +if (conn_bpc < min_bpc) + min_bpc = conn_bpc; + } + + *color_depths =GENMASK (conn_bpc,0 ); +} +static void komeda_crtc_update_clock_ratio (struct komeda_crtc_state *kcrtc_st) {u64 pxlclk, aclk;drivers/gpu/drm/arm/display/komeda/komeda_kms.h +2
-0@@ -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);drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +1
-0@@ -323,6 +323,7 @@ struct komeda_improc {struct komeda_improc_state {struct komeda_component_state base; +u8 color_depth;u16 hsize, vsize; };drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +19
-0@@ -743,6 +743,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;@@ -756,6 +757,24 @@ 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 );drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +1
-0@@ -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;drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c static int komeda_wb_connector_add(struct komeda_kms_dev *kms, · line 177
Quoted 6 lines
drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +3
-0@@ -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); +The IPS color depth doesn't really apply to writeback. Maybe we should just skip the writeback connector?
Quoted 3 lines
Thanks,
-Brian
Quoted 7 lines
Yes, the color depth not apply to writeback. We adds it because:
In the
komeda_crtc_get_color_config()will loop all connectors of CRTC
including thewb_conn, since crtc always haswb_conn. If not setting
here,wb_conn->bpcwill be set it to 8bit forcely inkomeda_crtc_get_color_config()which will lead crtc bpc to 8bits all the time. So we are setting the largest supported depth tokwb_conn->bpchere.
I agree with Brian here, it sounds like you need to fix komeda_crtc_get_color_config() rather than putting in arcane bpc values and invoking spooky action. Connectors have a type [1], so it's easy to filter WB connectors out of the loop.
[1] e.g. DRM_MODE_CONNECTOR_WRITEBACK in this case.
Quoted 4 lines
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +0
-0kcrtc->wb_conn = kwb_conn;return 0 ;
Signature · 8 lines
Mihail _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Mihail,
Quoted 160 lines · Mihail Atanassov
Quoted 152 lines · On Tuesday, 8 October 2019 11:28:24 BST Lowry Li (Arm Technology China) wrote:
Hi Brian,
Quoted 147 lines · Brian Starkey
Hi Lowry,
Quoted 34 lines · Lowry Li (Arm Technology China)
Set
color_depthaccording toconnector->bpc.Signed-off-by Lowry Li (Arm Technology China) <[email protected]>--- .../arm/display/komeda/d71/d71_component.c | 1 + .../gpu/drm/arm/display/komeda/komeda_crtc.c | 20 +++++++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_kms.h | 2 ++ .../drm/arm/display/komeda/komeda_pipeline.h | 1 + .../display/komeda/komeda_pipeline_state.c | 19 ++++++++++++++++++ .../arm/display/komeda/komeda_wb_connector.c | 4 ++++ 6 files changed, 47 insertions(+)drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +1
-0@@ -951,6 +951,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)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +2
-0@@ -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)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c line 31
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +10
-0+{ +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 ;We can have multiple connectors on a single CRTC (e.g. normal + writeback), so what's the expected behaviour here in that case?
Quoted 86 lines
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +8
-0+ +if (conn_bpc < min_bpc) + min_bpc = conn_bpc; + } + + *color_depths =GENMASK (conn_bpc,0 ); +} +static void komeda_crtc_update_clock_ratio (struct komeda_crtc_state *kcrtc_st) {u64 pxlclk, aclk;drivers/gpu/drm/arm/display/komeda/komeda_kms.h +2
-0@@ -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);drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +1
-0@@ -323,6 +323,7 @@ struct komeda_improc {struct komeda_improc_state {struct komeda_component_state base; +u8 color_depth;u16 hsize, vsize; };drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +19
-0@@ -743,6 +743,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;@@ -756,6 +757,24 @@ 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 );drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +1
-0@@ -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;drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c static int komeda_wb_connector_add(struct komeda_kms_dev *kms, · line 177
Quoted 6 lines
drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +3
-0@@ -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); +The IPS color depth doesn't really apply to writeback. Maybe we should just skip the writeback connector?
Quoted 3 lines
Thanks,
-BrianQuoted 7 lines
Yes, the color depth not apply to writeback. We adds it because:
In the
komeda_crtc_get_color_config()will loop all connectors of CRTC
including thewb_conn, since crtc always haswb_conn. If not setting
here,wb_conn->bpcwill be set it to 8bit forcely inkomeda_crtc_get_color_config()which will lead crtc bpc to 8bits all the time. So we are setting the largest supported depth tokwb_conn->bpchere.
Quoted 7 lines
I agree with Brian here, it sounds like you need to fix
komeda_crtc_get_color_config()rather than putting in arcane bpc values and invoking spooky action. Connectors have a type [1], so it's easy to filter WB connectors out of the loop.[1] e.g.
DRM_MODE_CONNECTOR_WRITEBACKin this case.
Even for writeback only, at H/W requirement, we still need to set IPS depth and output color for IPS.
Regards,
Lowry
Quoted 10 lines
Quoted 4 lines
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +0
-0kcrtc->wb_conn = kwb_conn;return 0 ;Signature · 1 line
Mihail
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel