drm/bridge/tc358775: Fixes bus formats read
Subsystems (3)
PATCH v3 1/1 drm/bridge/tc358775: Fixes bus formats read
- state->output_bus_cfg.format, memcpy and
unsigned int used
- atomic_check removed
- video data input and output formats added
- bus formats read from drm_bridge_state.output_bus_cfg.format and .atomic_get_input_bus_fmts() instead of connector
Reviewed-by Laurent Pinchart <[email protected]>
Signed-off-by Vinay Simha BN <[email protected]>
---
v1:
* Laurent Pinchart review comments incorporated
drm_bridge_state.output_bus_cfg.format
instead of connector
v2:
* Laurent Pinchart review comments incorporated
atomic_check removed
ivideo data input and output formats added
v3:
* Laurent Pinchart review comments incorporated output_bus_fmt removed and using state->output_bus_cfg.format unsigned int i used
memcpy used for input_fmts
--- drivers/gpu/drm/bridge/tc358775.c | 71 +++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 17 deletions(-)
drivers/gpu/drm/bridge/tc358775.c +54 -17
@@ -273,6 +273,19 @@ struct tc_data {u8 bpc; }; +static const u32 tc_lvds_in_bus_fmts[] = { +MEDIA_BUS_FMT_RGB565_1X16 , +MEDIA_BUS_FMT_RGB666_1X18 , +MEDIA_BUS_FMT_RGB666_1X24_CPADHI , +MEDIA_BUS_FMT_RBG888_1X24 , +}; + +static const u32 tc_lvds_out_bus_fmts[] = { +MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA , +MEDIA_BUS_FMT_RGB888_1X7X4_SPWG , +MEDIA_BUS_FMT_RGB666_1X7X3_SPWG , +}; +static inline struct tc_data *bridge_to_tc (struct drm_bridge *b) { return container_of(b, struct tc_data, bridge);
@@ -359,19 +372,6 @@ static void d2l_write(struct i2c_client *i2c, u16 addr, u32 val) ret, addr); } -/* helper function to access bus_formats */ -static struct drm_connector *get_connector (struct drm_encoder *encoder) -{ -struct drm_device *dev = encoder->dev; -struct drm_connector *connector; - -list_for_each_entry (connector, &dev->mode_config.connector_list, head) -if (connector->encoder == encoder) -return connector; - -return NULL ; -} -static void tc_bridge_enable (struct drm_bridge *bridge) {struct tc_data *tc =bridge_to_tc (bridge);
@@ -380,7 +380,8 @@ static void tc_bridge_enable(struct drm_bridge *bridge)u32 val =0 ;u16 dsiclk, clkdiv, byteclk, t1, t2, t3, vsdelay;struct drm_display_mode *mode; -struct drm_connector *connector =get_connector (bridge->encoder); +struct drm_bridge_state *state = +drm_priv_to_bridge_state (bridge->base.state); mode = &bridge->encoder->crtc->state->adjusted_mode;
@@ -451,14 +452,13 @@ static void tc_bridge_enable(struct drm_bridge *bridge)d2l_write (tc->i2c,LVPHY0 ,LV_PHY0_PRBS_ON (4 ) |LV_PHY0_ND (6 ));dev_dbg (tc->dev,"bus_formats %04x bpc %d\n" , - connector->display_info.bus_formats[0 ], + state->output_bus_cfg.format, tc->bpc);/* * Default hardware register settings of tc358775 configured * with MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA jeida-24 format */ -if (connector->display_info.bus_formats[0 ] == -MEDIA_BUS_FMT_RGB888_1X7X4_SPWG ) { +if (state->output_bus_cfg.format ==MEDIA_BUS_FMT_RGB888_1X7X4_SPWG ) {/* VESA-24 */ d2l_write (tc->i2c,LV_MX0003 ,LV_MX (LVI_R0 ,LVI_R1 ,LVI_R2 ,LVI_R3 ));d2l_write (tc->i2c,LV_MX0407 ,LV_MX (LVI_R4 ,LVI_R7 ,LVI_R5 ,LVI_G0 ));
@@ -590,6 +590,39 @@ static int tc358775_parse_dt(struct device_node *np, struct tc_data *tc)return 0 ; } +static u32 * +tc_bridge_get_input_bus_fmts (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state, +u32 output_fmt, +unsigned int *num_input_fmts) +{ +u32 *input_fmts =NULL ; +unsigned int i; + + *num_input_fmts =0 ; + +for (i =0 ; i <ARRAY_SIZE (tc_lvds_out_bus_fmts) ; ++i) { +if (output_fmt == tc_lvds_out_bus_fmts[i]) +break ; + } + +if (i ==ARRAY_SIZE (tc_lvds_out_bus_fmts)) +return NULL ; + + *num_input_fmts =ARRAY_SIZE (tc_lvds_in_bus_fmts); + + input_fmts =kcalloc (*num_input_fmts,ARRAY_SIZE (tc_lvds_in_bus_fmts), +GFP_KERNEL ); +if (!input_fmts) +return NULL ; + +memcpy (input_fmts, tc_lvds_in_bus_fmts,sizeof (*input_fmts)); + +return input_fmts; +} +static int tc_bridge_attach (struct drm_bridge *bridge,enum drm_bridge_attach_flags flags) {
@@ -639,6 +672,10 @@ static int tc_bridge_attach(struct drm_bridge *bridge, }static const struct drm_bridge_funcs tc_bridge_funcs = { + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, + .atomic_get_input_bus_fmts = tc_bridge_get_input_bus_fmts, .attach = tc_bridge_attach, .pre_enable = tc_bridge_pre_enable, .enable = tc_bridge_enable,
Signature · 1 line
2.17.1