drm/bridge: ti-sn65dsi86: Improve support for AUO B116XAK01 + other DP
Subsystems (5)
Douglas Anderson
reviewerv3 cover drm/bridge: ti-sn65dsi86: Improve support for AUO B116XAK01 + other DP
This series contains a pile of patches that was created to support hooking up the AUO B116XAK01 panel to the eDP side of the bridge. In general it should be useful for hooking up a wider variety of DP panels to the bridge, especially those with lower resolution and lower bits per pixel.
The overall result of this series:
* Allows panels with fewer than 4 DP lanes hooked up to work.
* Optimizes the link rate for panels with 6 bpp.
* Supports trying more than one link rate when training if the main link rate didn't work.
* Avoids invalid link rates.
It's not expected that this series will break any existing users but testing is always good.
To support the AUO B116XAK01, we could actually stop at the ("Use 18-bit DP if we can") patch since that causes the panel to run at a link rate of 1.62 which works. The patches to try more than one link rate were all developed prior to realizing that I could just use 18-bit mode and were validated with that patch reverted.
These patches were tested on sdm845-cheza atop mainline as of 2019-12-13 and also on another board (the one with AUO B116XAK01) atop a downstream kernel tree.
This patch series doesn't do anything to optimize the MIPI link and only focuses on the DP link. For instance, it's left as an exercise to the reader to see if we can use the 666-packed mode on the MIPI link and save some power (because we could lower the clock rate).
I am nowhere near a display expert and my knowledge of DP and MIPI is pretty much zero. If something about this patch series smells wrong, it probably is. Please let know and I'll try to fix it.
Changes in v3:
- Init rate_valid table, don't rely on stack being 0 (oops).
- Rename rate_times_200khz to rate_per_200khz.
- Loop over the ti_sn_bridge_dp_rate_lut table, making code smaller.
- Use 'true' instead of 1 for bools.
- Added note to commit message noting DP 1.4+ isn't well tested.
Changes in v2:
- Squash in maybe-uninitialized fix from Rob Clark.
- Patch ("Avoid invalid rates") replaces ("Skip non-standard DP rates")
Douglas Anderson (9):
drm/bridge: ti-sn65dsi86: Split the setting of the dp and dsi rates drm/bridge: ti-sn65dsi86: zero is never greater than an unsigned int drm/bridge: ti-sn65dsi86: Don't use MIPI variables for DP link drm/bridge: ti-sn65dsi86: Config number of DP lanes Mo' Betta drm/bridge: ti-sn65dsi86: Read num lanes from the DP sink drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can drm/bridge: ti-sn65dsi86: Group DP link training bits in a function drm/bridge: ti-sn65dsi86: Train at faster rates if slower ones fail drm/bridge: ti-sn65dsi86: Avoid invalid rates
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 259 +++++++++++++++++++++----- 1 file changed, 216 insertions(+), 43 deletions(-)
Signature · 6 lines
2.24.1.735.g03f4e72817-goog _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Douglas Anderson
reviewerPATCH v3 1/9 drm/bridge: ti-sn65dsi86: Split the setting of the dp and dsi rates
These two things were in one function. Split into two. This looks like it's duplicating some code, but don't worry. This is is just in preparation for future changes.
This is intended to have zero functional change and will just make future patches easier to understand.
---
Changes in v3: None
Changes in v2: None
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 33 +++++++++++++++++++-------- 1 file changed, 23 insertions(+), 10 deletions(-)
drivers/gpu/drm/bridge/ti-sn65dsi86.c +23 -10
@@ -417,6 +417,24 @@ static void ti_sn_bridge_set_refclk_freq(struct ti_sn_bridge *pdata) REFCLK_FREQ(i)); } +static void ti_sn_bridge_set_dsi_rate (struct ti_sn_bridge *pdata) +{ +unsigned int bit_rate_mhz, clk_freq_mhz; +unsigned int val; +struct drm_display_mode *mode = + &pdata->bridge.encoder->crtc->state->adjusted_mode; + +/* set DSIA clk frequency */ + bit_rate_mhz = (mode->clock /1000 ) * +mipi_dsi_pixel_format_to_bpp (pdata->dsi->format); + clk_freq_mhz = bit_rate_mhz / (pdata->dsi->lanes *2 ); + +/* for each increment in val, frequency increases by 5MHz */ + val = (MIN_DSI_CLK_FREQ_MHZ /5 ) + + (((clk_freq_mhz -MIN_DSI_CLK_FREQ_MHZ ) /5 ) &0xFF ); +regmap_write (pdata->regmap,SN_DSIA_CLK_FREQ_REG , val); +} +/** * LUT index corresponds to register value and * LUT values corresponds to dp data rate supported
@@ -426,22 +444,16 @@ static const unsigned int ti_sn_bridge_dp_rate_lut[] = {0 ,1620 ,2160 ,2430 ,2700 ,3240 ,4320 ,5400 }; -static void ti_sn_bridge_set_dsi_dp_rate (struct ti_sn_bridge *pdata) +static void ti_sn_bridge_set_dp_rate (struct ti_sn_bridge *pdata) { -unsigned int bit_rate_mhz, clk_freq_mhz, dp_rate_mhz; -unsigned int val, i; +unsigned int bit_rate_mhz, dp_rate_mhz; +unsigned int i;struct drm_display_mode *mode = &pdata->bridge.encoder->crtc->state->adjusted_mode;/* set DSIA clk frequency */ bit_rate_mhz = (mode->clock /1000 ) *mipi_dsi_pixel_format_to_bpp (pdata->dsi->format); - clk_freq_mhz = bit_rate_mhz / (pdata->dsi->lanes *2 ); - -/* for each increment in val, frequency increases by 5MHz */ - val = (MIN_DSI_CLK_FREQ_MHZ /5 ) + - (((clk_freq_mhz -MIN_DSI_CLK_FREQ_MHZ ) /5 ) &0xFF ); -regmap_write (pdata->regmap,SN_DSIA_CLK_FREQ_REG , val);/* set DP data rate */ dp_rate_mhz = ((bit_rate_mhz / pdata->dsi->lanes) * DP_CLK_FUDGE_NUM) /
@@ -510,7 +522,8 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge) val);/* set dsi/dp clk frequency value */ -ti_sn_bridge_set_dsi_dp_rate (pdata); +ti_sn_bridge_set_dsi_rate (pdata); +ti_sn_bridge_set_dp_rate (pdata);/* enable DP PLL */ regmap_write (pdata->regmap,SN_PLL_ENABLE_REG ,1 );
Signature · 6 lines
2.24.1.735.g03f4e72817-goog _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 1/9] drm/bridge: ti-sn65dsi86: Split the setting of the dp and dsi rates
Quoted 10 lines · Douglas Anderson
These two things were in one function. Split into two. This looks like it's duplicating some code, but don't worry. This is is just in preparation for future changes.
This is intended to have zero functional change and will just make future patches easier to understand.
Signed-off-by Douglas Anderson <[email protected]>Tested-by Rob Clark <[email protected]>Reviewed-by Rob Clark <[email protected]>
Regards,
Bjorn
Quoted 76 lines
---
Changes in v3: None
Changes in v2: Nonedrivers/gpu/drm/bridge/ti-sn65dsi86.c | 33 +++++++++++++++++++-------- 1 file changed, 23 insertions(+), 10 deletions(-)drivers/gpu/drm/bridge/ti-sn65dsi86.c +23
-10@@ -417,6 +417,24 @@ static void ti_sn_bridge_set_refclk_freq(struct ti_sn_bridge *pdata) REFCLK_FREQ(i)); } +static void ti_sn_bridge_set_dsi_rate (struct ti_sn_bridge *pdata) +{ +unsigned int bit_rate_mhz, clk_freq_mhz; +unsigned int val; +struct drm_display_mode *mode = + &pdata->bridge.encoder->crtc->state->adjusted_mode; + +/* set DSIA clk frequency */ + bit_rate_mhz = (mode->clock /1000 ) * +mipi_dsi_pixel_format_to_bpp (pdata->dsi->format); + clk_freq_mhz = bit_rate_mhz / (pdata->dsi->lanes *2 ); + +/* for each increment in val, frequency increases by 5MHz */ + val = (MIN_DSI_CLK_FREQ_MHZ /5 ) + + (((clk_freq_mhz -MIN_DSI_CLK_FREQ_MHZ ) /5 ) &0xFF ); +regmap_write (pdata->regmap,SN_DSIA_CLK_FREQ_REG , val); +} +/** * LUT index corresponds to register value and * LUT values corresponds to dp data rate supported @@ -426,22 +444,16 @@ static const unsigned int ti_sn_bridge_dp_rate_lut[] = {0 ,1620 ,2160 ,2430 ,2700 ,3240 ,4320 ,5400 }; -static void ti_sn_bridge_set_dsi_dp_rate (struct ti_sn_bridge *pdata) +static void ti_sn_bridge_set_dp_rate (struct ti_sn_bridge *pdata) { -unsigned int bit_rate_mhz, clk_freq_mhz, dp_rate_mhz; -unsigned int val, i; +unsigned int bit_rate_mhz, dp_rate_mhz; +unsigned int i;struct drm_display_mode *mode = &pdata->bridge.encoder->crtc->state->adjusted_mode;/* set DSIA clk frequency */ bit_rate_mhz = (mode->clock /1000 ) *mipi_dsi_pixel_format_to_bpp (pdata->dsi->format); - clk_freq_mhz = bit_rate_mhz / (pdata->dsi->lanes *2 ); - -/* for each increment in val, frequency increases by 5MHz */ - val = (MIN_DSI_CLK_FREQ_MHZ /5 ) + - (((clk_freq_mhz -MIN_DSI_CLK_FREQ_MHZ ) /5 ) &0xFF ); -regmap_write (pdata->regmap,SN_DSIA_CLK_FREQ_REG , val);/* set DP data rate */ dp_rate_mhz = ((bit_rate_mhz / pdata->dsi->lanes) * DP_CLK_FUDGE_NUM) /@@ -510,7 +522,8 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge) val);/* set dsi/dp clk frequency value */ -ti_sn_bridge_set_dsi_dp_rate (pdata); +ti_sn_bridge_set_dsi_rate (pdata); +ti_sn_bridge_set_dp_rate (pdata);/* enable DP PLL */ regmap_write (pdata->regmap,SN_PLL_ENABLE_REG ,1 );Signature · 1 line
2.24.1.735.g03f4e72817-goog
Douglas Anderson
reviewerPATCH v3 2/9 drm/bridge: ti-sn65dsi86: zero is never greater than an unsigned int
In reply to Douglas AndersonWhen we iterate over ti_sn_bridge_dp_rate_lut, there's no reason to start at index 0 which always contains the value 0. 0 is not a valid link rate.
This change should have no real effect but is a small cleanup.
---
Changes in v3: None
Changes in v2: None
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/ti-sn65dsi86.c +1 -1
@@ -458,7 +458,7 @@ static void ti_sn_bridge_set_dp_rate(struct ti_sn_bridge *pdata)/* set DP data rate */ dp_rate_mhz = ((bit_rate_mhz / pdata->dsi->lanes) *DP_CLK_FUDGE_NUM ) /DP_CLK_FUDGE_DEN ; -for (i =0 ; i <ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; i++) +for (i =1 ; i <ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; i++)if (ti_sn_bridge_dp_rate_lut[i] > dp_rate_mhz)break ;
Signature · 6 lines
2.24.1.735.g03f4e72817-goog _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 2/9] drm/bridge: ti-sn65dsi86: zero is never greater than an unsigned int
Quoted 9 lines · Douglas Anderson
When we iterate over
ti_sn_bridge_dp_rate_lut, there's no reason to start at index 0 which always contains the value 0. 0 is not a valid link rate.This change should have no real effect but is a small cleanup.
Signed-off-by Douglas Anderson <[email protected]>Tested-by Rob Clark <[email protected]>Reviewed-by Rob Clark <[email protected]>
Quoted 24 lines
---
Changes in v3: None
Changes in v2: Nonedrivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/bridge/ti-sn65dsi86.c +1
-1@@ -458,7 +458,7 @@ static void ti_sn_bridge_set_dp_rate(struct ti_sn_bridge *pdata)/* set DP data rate */ dp_rate_mhz = ((bit_rate_mhz / pdata->dsi->lanes) *DP_CLK_FUDGE_NUM ) /DP_CLK_FUDGE_DEN ; -for (i =0 ; i <ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; i++) +for (i =1 ; i <ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; i++)if (ti_sn_bridge_dp_rate_lut[i] > dp_rate_mhz)break ;Signature · 1 line
2.24.1.735.g03f4e72817-goog
Douglas Anderson
reviewerPATCH v3 3/9 drm/bridge: ti-sn65dsi86: Don't use MIPI variables for DP link
In reply to Douglas AndersonThe ti-sn65dsi86 is a bridge from MIPI to DP and thus has two links:
the MIPI link and the DP link. The two links do not need to have the same format or number of lanes. Stop using MIPI variables when talking about the DP link.
This has zero functional change because:
* currently we are hardcoding the MIPI link as unpacked RGB888 which requires 24 bits and currently we are not changing the DP link rate from the bridge's default of 8 bits per pixel.
* currently we are hardcoding both the MIPI and DP as being 4 lanes.
This is all in prep for fixing some of the above.
---
Changes in v3: None
Changes in v2: None
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/gpu/drm/bridge/ti-sn65dsi86.c +12 -6
@@ -100,6 +100,7 @@ struct ti_sn_bridge {struct drm_panel *panel;struct gpio_desc *enable_gpio;struct regulator_bulk_data supplies[SN_REGULATOR_SUPPLY_NUM ]; +int dp_lanes; };static const struct regmap_range ti_sn_bridge_volatile_ranges[] = {
@@ -313,6 +314,7 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge) }/* TODO: setting to 4 lanes always for now */ + pdata->dp_lanes =4 ; dsi->lanes =4 ; dsi->format =MIPI_DSI_FMT_RGB888 ; dsi->mode_flags =MIPI_DSI_MODE_VIDEO ;
@@ -451,13 +453,17 @@ static void ti_sn_bridge_set_dp_rate(struct ti_sn_bridge *pdata)struct drm_display_mode *mode = &pdata->bridge.encoder->crtc->state->adjusted_mode; -/* set DSIA clk frequency */ - bit_rate_mhz = (mode->clock /1000 ) * -mipi_dsi_pixel_format_to_bpp (pdata->dsi->format); +/* +* Calculate minimum bit rate based on our pixel clock. At +* the moment this driver never sets the DP_18BPP_EN bit in +* register 0x5b so we hardcode 24bpp. +*/ + bit_rate_mhz = (mode->clock /1000 ) *24 ; -/* set DP data rate */ - dp_rate_mhz = ((bit_rate_mhz / pdata->dsi->lanes) *DP_CLK_FUDGE_NUM ) / +/* Calculate minimum DP data rate, taking 80% as per DP spec */ + dp_rate_mhz = ((bit_rate_mhz / pdata->dp_lanes) *DP_CLK_FUDGE_NUM ) /DP_CLK_FUDGE_DEN ; +for (i =1 ; i <ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; i++)if (ti_sn_bridge_dp_rate_lut[i] > dp_rate_mhz)break ;
@@ -517,7 +523,7 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge) CHA_DSI_LANES_MASK, val);/* DP lane config */ - val =DP_NUM_LANES (pdata->dsi->lanes -1 ); + val =DP_NUM_LANES (pdata->dp_lanes -1 );regmap_update_bits (pdata->regmap,SN_SSC_CONFIG_REG ,DP_NUM_LANES_MASK , val);
Signature · 6 lines
2.24.1.735.g03f4e72817-goog _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 3/9] drm/bridge: ti-sn65dsi86: Don't use MIPI variables for DP link
Quoted 11 lines · Douglas Anderson
The ti-sn65dsi86 is a bridge from MIPI to DP and thus has two links:
the MIPI link and the DP link. The two links do not need to have the same format or number of lanes. Stop using MIPI variables when talking about the DP link.This has zero functional change because:
* currently we are hardcoding the MIPI link as unpacked RGB888 which requires 24 bits and currently we are not changing the DP link rate from the bridge's default of 8 bits per pixel.
* currently we are hardcoding both the MIPI and DP as being 4 lanes.
Quoted 5 lines
This is all in prep for fixing some of the above.
Signed-off-by Douglas Anderson <[email protected]>Tested-by Rob Clark <[email protected]>Reviewed-by Rob Clark <[email protected]>
Quoted 63 lines
---
Changes in v3: None
Changes in v2: Nonedrivers/gpu/drm/bridge/ti-sn65dsi86.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)drivers/gpu/drm/bridge/ti-sn65dsi86.c +12
-6@@ -100,6 +100,7 @@ struct ti_sn_bridge {struct drm_panel *panel;struct gpio_desc *enable_gpio;struct regulator_bulk_data supplies[SN_REGULATOR_SUPPLY_NUM ]; +int dp_lanes; };static const struct regmap_range ti_sn_bridge_volatile_ranges[] = {@@ -313,6 +314,7 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge) }/* TODO: setting to 4 lanes always for now */ + pdata->dp_lanes =4 ; dsi->lanes =4 ; dsi->format =MIPI_DSI_FMT_RGB888 ; dsi->mode_flags =MIPI_DSI_MODE_VIDEO ;@@ -451,13 +453,17 @@ static void ti_sn_bridge_set_dp_rate(struct ti_sn_bridge *pdata)struct drm_display_mode *mode = &pdata->bridge.encoder->crtc->state->adjusted_mode; -/* set DSIA clk frequency */ - bit_rate_mhz = (mode->clock /1000 ) * -mipi_dsi_pixel_format_to_bpp (pdata->dsi->format); +/* +* Calculate minimum bit rate based on our pixel clock. At +* the moment this driver never sets the DP_18BPP_EN bit in +* register 0x5b so we hardcode 24bpp. +*/ + bit_rate_mhz = (mode->clock /1000 ) *24 ; -/* set DP data rate */ - dp_rate_mhz = ((bit_rate_mhz / pdata->dsi->lanes) *DP_CLK_FUDGE_NUM ) / +/* Calculate minimum DP data rate, taking 80% as per DP spec */ + dp_rate_mhz = ((bit_rate_mhz / pdata->dp_lanes) *DP_CLK_FUDGE_NUM ) /DP_CLK_FUDGE_DEN ; +for (i =1 ; i <ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; i++)if (ti_sn_bridge_dp_rate_lut[i] > dp_rate_mhz)break ;@@ -517,7 +523,7 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge) CHA_DSI_LANES_MASK, val);/* DP lane config */ - val =DP_NUM_LANES (pdata->dsi->lanes -1 ); + val =DP_NUM_LANES (pdata->dp_lanes -1 );regmap_update_bits (pdata->regmap,SN_SSC_CONFIG_REG ,DP_NUM_LANES_MASK , val);Signature · 1 line
2.24.1.735.g03f4e72817-goog
Douglas Anderson
reviewerPATCH v3 4/9 drm/bridge: ti-sn65dsi86: Config number of DP lanes Mo' Betta
In reply to Douglas AndersonThe driver used to say that the value to program into bridge register 0x93 was dp_lanes - 1. Looking at the datasheet for the bridge, this is wrong. The data sheet says:
* 1 = 1 lane
* 2 = 2 lanes
* 3 = 4 lanes
A more proper way to express this encoding is min(dp_lanes, 3).
At the moment this change has zero effect because we've hardcoded the number of DP lanes to 4. ...and (4 - 1) == min(4, 3). How fortunate! ...but soon we'll stop hardcoding the number of lanes.
---
Changes in v3: None
Changes in v2: None
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/ti-sn65dsi86.c +1 -1
@@ -523,7 +523,7 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge) CHA_DSI_LANES_MASK, val);/* DP lane config */ - val =DP_NUM_LANES (pdata->dp_lanes -1 ); + val =DP_NUM_LANES (min (pdata->dp_lanes,3 ));regmap_update_bits (pdata->regmap,SN_SSC_CONFIG_REG ,DP_NUM_LANES_MASK , val);
Signature · 6 lines
2.24.1.735.g03f4e72817-goog _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 4/9] drm/bridge: ti-sn65dsi86: Config number of DP lanes Mo' Betta
Quoted 9 lines · Douglas Anderson
The driver used to say that the value to program into bridge register
0x93wasdp_lanes- 1. Looking at the datasheet for the bridge, this is wrong. The data sheet says:
* 1 = 1 lane
* 2 = 2 lanes
* 3 = 4 lanesA more proper way to express this encoding is
min(dp_lanes, 3).
Quoted 7 lines
At the moment this change has zero effect because we've hardcoded the number of DP lanes to 4. ...and (4 - 1) ==
min(4, 3). How fortunate! ...but soon we'll stop hardcoding the number of lanes.Signed-off-by Douglas Anderson <[email protected]>Tested-by Rob Clark <[email protected]>Reviewed-by Rob Clark <[email protected]>
Quoted 24 lines
---
Changes in v3: None
Changes in v2: Nonedrivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/bridge/ti-sn65dsi86.c +1
-1@@ -523,7 +523,7 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge) CHA_DSI_LANES_MASK, val);/* DP lane config */ - val =DP_NUM_LANES (pdata->dp_lanes -1 ); + val =DP_NUM_LANES (min (pdata->dp_lanes,3 ));regmap_update_bits (pdata->regmap,SN_SSC_CONFIG_REG ,DP_NUM_LANES_MASK , val);Signature · 1 line
2.24.1.735.g03f4e72817-goog
Douglas Anderson
reviewerPATCH v3 5/9 drm/bridge: ti-sn65dsi86: Read num lanes from the DP sink
In reply to Douglas AndersonAt least one panel hooked up to the bridge (AUO B116XAK01) only supports 1 lane of DP. Let's read this information and stop hardcoding 4 DP lanes.
---
Changes in v3: None
Changes in v2: None
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 32 +++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/ti-sn65dsi86.c +30 -2
@@ -313,8 +313,7 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge) goto err_dsi_host; } -/* TODO: setting to 4 lanes always for now */ - pdata->dp_lanes =4 ; +/* TODO: setting to 4 MIPI lanes always for now */ dsi->lanes =4 ; dsi->format =MIPI_DSI_FMT_RGB888 ; dsi->mode_flags =MIPI_DSI_MODE_VIDEO ;
@@ -511,12 +510,41 @@ static void ti_sn_bridge_set_video_timings(struct ti_sn_bridge *pdata)usleep_range (10000 ,10500 );/* 10ms delay recommended by spec */ } +static unsigned int ti_sn_get_max_lanes (struct ti_sn_bridge *pdata) +{ +u8 data; +int ret; + + ret =drm_dp_dpcd_readb (&pdata->aux,DP_MAX_LANE_COUNT , &data); +if (ret !=1 ) { +DRM_DEV_ERROR (pdata->dev, +"Can't read lane count (%d); assuming 4\n" , ret); +return 4 ; + } + +return data &DP_LANE_COUNT_MASK ; +} +static void ti_sn_bridge_enable (struct drm_bridge *bridge) {struct ti_sn_bridge *pdata =bridge_to_ti_sn_bridge (bridge);unsigned int val;int ret; +/* +* Run with the maximum number of lanes that the DP sink supports. +* +* Depending use cases, we might want to revisit this later because: +* - It's plausible that someone may have run fewer lines to the +* sink than the sink actually supports, assuming that the lines +* will just be driven at a higher rate. +* - The DP spec seems to indicate that it's more important to minimize +* the number of lanes than the link rate. +* +* If we do revisit, it would be important to measure the power impact. +*/ + pdata->dp_lanes =ti_sn_get_max_lanes (pdata); +/* DSI_A lane config */ val =CHA_DSI_LANES (4 - pdata->dsi->lanes); regmap_update_bits(pdata->regmap, SN_DSI_LANES_REG,
Signature · 6 lines
2.24.1.735.g03f4e72817-goog _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 5/9] drm/bridge: ti-sn65dsi86: Read num lanes from the DP sink
Quoted 7 lines · Douglas Anderson
At least one panel hooked up to the bridge (AUO B116XAK01) only supports 1 lane of DP. Let's read this information and stop hardcoding 4 DP lanes.
Signed-off-by Douglas Anderson <[email protected]>Tested-by Rob Clark <[email protected]>Reviewed-by Rob Clark <[email protected]>
Quoted 67 lines
---
Changes in v3: None
Changes in v2: Nonedrivers/gpu/drm/bridge/ti-sn65dsi86.c | 32 +++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)drivers/gpu/drm/bridge/ti-sn65dsi86.c +30
-2@@ -313,8 +313,7 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge) goto err_dsi_host; } -/* TODO: setting to 4 lanes always for now */ - pdata->dp_lanes =4 ; +/* TODO: setting to 4 MIPI lanes always for now */ dsi->lanes =4 ; dsi->format =MIPI_DSI_FMT_RGB888 ; dsi->mode_flags =MIPI_DSI_MODE_VIDEO ;@@ -511,12 +510,41 @@ static void ti_sn_bridge_set_video_timings(struct ti_sn_bridge *pdata)usleep_range (10000 ,10500 );/* 10ms delay recommended by spec */ } +static unsigned int ti_sn_get_max_lanes (struct ti_sn_bridge *pdata) +{ +u8 data; +int ret; + + ret =drm_dp_dpcd_readb (&pdata->aux,DP_MAX_LANE_COUNT , &data); +if (ret !=1 ) { +DRM_DEV_ERROR (pdata->dev, +"Can't read lane count (%d); assuming 4\n" , ret); +return 4 ; + } + +return data &DP_LANE_COUNT_MASK ; +} +static void ti_sn_bridge_enable (struct drm_bridge *bridge) {struct ti_sn_bridge *pdata =bridge_to_ti_sn_bridge (bridge);unsigned int val;int ret; +/* +* Run with the maximum number of lanes that the DP sink supports. +* +* Depending use cases, we might want to revisit this later because: +* - It's plausible that someone may have run fewer lines to the +* sink than the sink actually supports, assuming that the lines +* will just be driven at a higher rate. +* - The DP spec seems to indicate that it's more important to minimize +* the number of lanes than the link rate. +* +* If we do revisit, it would be important to measure the power impact. +*/ + pdata->dp_lanes =ti_sn_get_max_lanes (pdata); +/* DSI_A lane config */ val =CHA_DSI_LANES (4 - pdata->dsi->lanes); regmap_update_bits(pdata->regmap, SN_DSI_LANES_REG,Signature · 1 line
2.24.1.735.g03f4e72817-goog
Douglas Anderson
reviewerPATCH v3 6/9 drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
In reply to Douglas AndersonThe current bridge driver always forced us to use 24 bits per pixel over the DP link. This is a waste if you are hooked up to a panel that only supports 6 bits per color or fewer, since in that case you ran run at 18 bits per pixel and thus end up at a lower DP clock rate.
Let's support this.
While at it, let's clean up the math in the function to avoid rounding errors (and round in the correct direction when we have to round). Numbers are sufficiently small (because mode->clock is in kHz) that we don't need to worry about integer overflow.
---
Changes in v3: None
Changes in v2: None
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)
drivers/gpu/drm/bridge/ti-sn65dsi86.c +18 -9
@@ -51,6 +51,7 @@#define SN_ENH_FRAME_REG 0x5A#define VSTREAM_ENABLE BIT(3)#define SN_DATA_FORMAT_REG 0x5B +#define BPP_18_RGB BIT(0)#define SN_HPD_DISABLE_REG 0x5C#define HPD_DISABLE BIT(0)#define SN_AUX_WDATA_REG (x) (0x64 + (x))
@@ -436,6 +437,14 @@ static void ti_sn_bridge_set_dsi_rate(struct ti_sn_bridge *pdata)regmap_write (pdata->regmap,SN_DSIA_CLK_FREQ_REG , val); } +static unsigned int ti_sn_bridge_get_bpp (struct ti_sn_bridge *pdata) +{ +if (pdata->connector.display_info.bpc <=6 ) +return 18 ; +else +return 24 ; +} +/** * LUT index corresponds to register value and * LUT values corresponds to dp data rate supported
@@ -447,21 +456,17 @@ static const unsigned int ti_sn_bridge_dp_rate_lut[] = {static void ti_sn_bridge_set_dp_rate (struct ti_sn_bridge *pdata) { -unsigned int bit_rate_mhz, dp_rate_mhz; +unsigned int bit_rate_khz, dp_rate_mhz;unsigned int i;struct drm_display_mode *mode = &pdata->bridge.encoder->crtc->state->adjusted_mode; -/* -* Calculate minimum bit rate based on our pixel clock. At -* the moment this driver never sets the DP_18BPP_EN bit in -* register 0x5b so we hardcode 24bpp. -*/ - bit_rate_mhz = (mode->clock /1000 ) *24 ; +/* Calculate minimum bit rate based on our pixel clock. */ + bit_rate_khz = mode->clock *ti_sn_bridge_get_bpp (pdata);/* Calculate minimum DP data rate, taking 80% as per DP spec */ - dp_rate_mhz = ((bit_rate_mhz / pdata->dp_lanes) *DP_CLK_FUDGE_NUM ) / -DP_CLK_FUDGE_DEN ; + dp_rate_mhz =DIV_ROUND_UP (bit_rate_khz *DP_CLK_FUDGE_NUM , +1000 * pdata->dp_lanes *DP_CLK_FUDGE_DEN );for (i =1 ; i <ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; i++)if (ti_sn_bridge_dp_rate_lut[i] > dp_rate_mhz)
@@ -550,6 +555,10 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge)regmap_update_bits (pdata->regmap,SN_DSI_LANES_REG ,CHA_DSI_LANES_MASK , val); +/* Set the DP output format (18 bpp or 24 bpp) */ + val = (ti_sn_bridge_get_bpp (pdata) ==18 ) ?BPP_18_RGB :0 ; +regmap_update_bits (pdata->regmap,SN_DATA_FORMAT_REG ,BPP_18_RGB , val); +/* DP lane config */ val =DP_NUM_LANES (min (pdata->dp_lanes,3 )); regmap_update_bits(pdata->regmap, SN_SSC_CONFIG_REG, DP_NUM_LANES_MASK,
Signature · 6 lines
2.24.1.735.g03f4e72817-goog _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Quoted 4 lines · Douglas Anderson
The current bridge driver always forced us to use 24 bits per pixel over the DP link. This is a waste if you are hooked up to a panel that only supports 6 bits per color or fewer, since in that case you ran run at 18 bits per pixel and thus end up at a lower DP clock rate.
s/ran/can/
Quoted 11 lines
Let's support this.
While at it, let's clean up the math in the function to avoid rounding errors (and round in the correct direction when we have to round). Numbers are sufficiently small (because
mode->clockis in kHz) that we don't need to worry about integer overflow.Signed-off-by Douglas Anderson <[email protected]>Tested-by Rob Clark <[email protected]>Reviewed-by Rob Clark <[email protected]>
Quoted 76 lines
---
Changes in v3: None
Changes in v2: Nonedrivers/gpu/drm/bridge/ti-sn65dsi86.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)drivers/gpu/drm/bridge/ti-sn65dsi86.c +18
-9@@ -51,6 +51,7 @@#define SN_ENH_FRAME_REG 0x5A#define VSTREAM_ENABLE BIT(3)#define SN_DATA_FORMAT_REG 0x5B +#define BPP_18_RGB BIT(0)#define SN_HPD_DISABLE_REG 0x5C#define HPD_DISABLE BIT(0)#define SN_AUX_WDATA_REG (x) (0x64 + (x))@@ -436,6 +437,14 @@ static void ti_sn_bridge_set_dsi_rate(struct ti_sn_bridge *pdata)regmap_write (pdata->regmap,SN_DSIA_CLK_FREQ_REG , val); } +static unsigned int ti_sn_bridge_get_bpp (struct ti_sn_bridge *pdata) +{ +if (pdata->connector.display_info.bpc <=6 ) +return 18 ; +else +return 24 ; +} +/** * LUT index corresponds to register value and * LUT values corresponds to dp data rate supported @@ -447,21 +456,17 @@ static const unsigned int ti_sn_bridge_dp_rate_lut[] = {static void ti_sn_bridge_set_dp_rate (struct ti_sn_bridge *pdata) { -unsigned int bit_rate_mhz, dp_rate_mhz; +unsigned int bit_rate_khz, dp_rate_mhz;unsigned int i;struct drm_display_mode *mode = &pdata->bridge.encoder->crtc->state->adjusted_mode; -/* -* Calculate minimum bit rate based on our pixel clock. At -* the moment this driver never sets the DP_18BPP_EN bit in -* register 0x5b so we hardcode 24bpp. -*/ - bit_rate_mhz = (mode->clock /1000 ) *24 ; +/* Calculate minimum bit rate based on our pixel clock. */ + bit_rate_khz = mode->clock *ti_sn_bridge_get_bpp (pdata);/* Calculate minimum DP data rate, taking 80% as per DP spec */ - dp_rate_mhz = ((bit_rate_mhz / pdata->dp_lanes) *DP_CLK_FUDGE_NUM ) / -DP_CLK_FUDGE_DEN ; + dp_rate_mhz =DIV_ROUND_UP (bit_rate_khz *DP_CLK_FUDGE_NUM , +1000 * pdata->dp_lanes *DP_CLK_FUDGE_DEN );for (i =1 ; i <ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; i++)if (ti_sn_bridge_dp_rate_lut[i] > dp_rate_mhz)@@ -550,6 +555,10 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge)regmap_update_bits (pdata->regmap,SN_DSI_LANES_REG ,CHA_DSI_LANES_MASK , val); +/* Set the DP output format (18 bpp or 24 bpp) */ + val = (ti_sn_bridge_get_bpp (pdata) ==18 ) ?BPP_18_RGB :0 ; +regmap_update_bits (pdata->regmap,SN_DATA_FORMAT_REG ,BPP_18_RGB , val); +/* DP lane config */ val =DP_NUM_LANES (min (pdata->dp_lanes,3 )); regmap_update_bits(pdata->regmap, SN_SSC_CONFIG_REG, DP_NUM_LANES_MASK,Signature · 1 line
2.24.1.735.g03f4e72817-goog
Doug Anderson
reviewerRe: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Andrzej / Neil,
Quoted 9 lines · Bjorn Andersson
Quoted 4 lines · Douglas Anderson
The current bridge driver always forced us to use 24 bits per pixel over the DP link. This is a waste if you are hooked up to a panel that only supports 6 bits per color or fewer, since in that case you ran run at 18 bits per pixel and thus end up at a lower DP clock rate.
s/ran/can/
I'm going to make the assumption that you can fix this typo when applying the patch and I'm not planning to send a v4. If that's not a good assumption then please yell.
Thanks!
-Doug
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Doug Anderson
reviewerRe: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Andrzej / Neil,
Quoted 13 lines · Doug Anderson
Andrzej / Neil,
Quoted 8 lines · Bjorn Andersson
Quoted 4 lines · Douglas Anderson
The current bridge driver always forced us to use 24 bits per pixel over the DP link. This is a waste if you are hooked up to a panel that only supports 6 bits per color or fewer, since in that case you ran run at 18 bits per pixel and thus end up at a lower DP clock rate.
Quoted 5 lines
Quoted 1 line
s/ran/can/
I'm going to make the assumption that you can fix this typo when applying the patch and I'm not planning to send a v4. If that's not a good assumption then please yell.
With -rc1 released, it seems like it might be a nice time to land this series. Do you happen to know if there is anything outstanding? Is one of you two the right person to land this series, or should I be asking someone else? I can see if I can find someone to take them through drm-misc if there's nobody else?
It's not massively crazy urgent or anything, but the patches have been floating for quite some time now and it'd be nice to know what the plan was. I also have another patch I'd like to post up but was hoping to get this series resolved first.
Thanks much!
-Doug
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Hi,
Quoted 28 lines · Doug Anderson
Andrzej / Neil,
Quoted 13 lines · Doug Anderson
Andrzej / Neil,
Quoted 8 lines · Bjorn Andersson
Quoted 4 lines · Douglas Anderson
The current bridge driver always forced us to use 24 bits per pixel over the DP link. This is a waste if you are hooked up to a panel that only supports 6 bits per color or fewer, since in that case you ran run at 18 bits per pixel and thus end up at a lower DP clock rate.
Quoted 5 lines
Quoted 1 line
s/ran/can/
I'm going to make the assumption that you can fix this typo when applying the patch and I'm not planning to send a v4. If that's not a good assumption then please yell.
With -rc1 released, it seems like it might be a nice time to land this series. Do you happen to know if there is anything outstanding? Is one of you two the right person to land this series, or should I be asking someone else? I can see if I can find someone to take them through drm-misc if there's nobody else?
Quoted 9 lines
It's not massively crazy urgent or anything, but the patches have been floating for quite some time now and it'd be nice to know what the plan was. I also have another patch I'd like to post up but was hoping to get this series resolved first.
Thanks much!
-Doug
I will push it shortly, seems everything is fine and reviewed.
Neil
A message that is not in the archive (sent off-list or not yet received): [email protected]
Doug Anderson
reviewerRe: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Hi,
Quoted 10 lines · Steev Klimaszewski
Hi Doug,
I've been testing 5.8 and linux-next on the Lenovo Yoga C630, and with this patch applied, there is really bad banding on the display.
I'm really bad at explaining it, but you can see the differences in the following:
24bit (pre-5.8) - https://dev.gentoo.org/~steev/files/image0.jpg
18bit (5.8/linux-next) - https://dev.gentoo.org/~steev/files/image1.jpg
Presumably this means that your panel is defined improperly? If the panel reports that it's a 6 bits per pixel panel but it's actually an 8 bits per pixel panel then you'll run into this problem.
I would have to assume you have a bunch of out of tree patches to support your hardware since I don't see any device trees in linuxnext (other than cheza) that use this bridge chip. Otherwise I could try to check and confirm that was the problem.
-Doug
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Doug Anderson
reviewerRe: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Hi,
Quoted 15 lines · Doug Anderson
Hi,
Quoted 10 lines · Steev Klimaszewski
Hi Doug,
I've been testing 5.8 and linux-next on the Lenovo Yoga C630, and with this patch applied, there is really bad banding on the display.
I'm really bad at explaining it, but you can see the differences in the following:
24bit (pre-5.8) - https://dev.gentoo.org/~steev/files/image0.jpg
18bit (5.8/linux-next) - https://dev.gentoo.org/~steev/files/image1.jpg
Quoted 8 lines
Presumably this means that your panel is defined improperly? If the panel reports that it's a 6 bits per pixel panel but it's actually an 8 bits per pixel panel then you'll run into this problem.
I would have to assume you have a bunch of out of tree patches to support your hardware since I don't see any device trees in linuxnext (other than cheza) that use this bridge chip. Otherwise I could try to check and confirm that was the problem.
Ah, interesting. Maybe you have the panel:
boe,nv133fhm-n61
As far as I can tell from the datasheet (I have the similar boe,nv133fhm-n62) this is a 6bpp panel. ...but if you feed it 8bpp the banding goes away! Maybe the panel itself knows how to dither??? ...or maybe the datasheet / edid are wrong and this is actually an 8bpp panel. Seems unlikely...
In any case, one fix is to pick
<https://lore.kernel.org/dri-devel/[email protected]/>,
though right now that patch is only enabled for sc7180. Maybe you could figure out how to apply it to your hardware?
...another fix would be to pretend that your panel is 8bpp even though it's actually 6bpp. Ironically if anyone ever tried to configure BPP from the EDID they'd go back to 6bpp. You can read the EDID of your panel with this:
bus=$(i2cdetect -l | grep sn65 | sed 's/i2c-\([0-9]*\).*$/\1/') i2cdump ${bus} 0x50 i
When I do that and then decode it on the "boe,nv133fhm-n62" panel, I find:
6 bits per primary color channel
-Doug
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Quoted 43 lines · Doug Anderson
Hi,
Quoted 12 lines · Doug Anderson
Hi,
Quoted 9 lines · Steev Klimaszewski
Hi Doug,
I've been testing 5.8 and linux-next on the Lenovo Yoga C630, and with this patch applied, there is really bad banding on the display.
I'm really bad at explaining it, but you can see the differences in the following:
24bit (pre-5.8) - https://dev.gentoo.org/~steev/files/image0.jpg
18bit (5.8/linux-next) - https://dev.gentoo.org/~steev/files/image1.jpg
Quoted 8 lines
Presumably this means that your panel is defined improperly? If the panel reports that it's a 6 bits per pixel panel but it's actually an 8 bits per pixel panel then you'll run into this problem.
I would have to assume you have a bunch of out of tree patches to support your hardware since I don't see any device trees in linuxnext (other than cheza) that use this bridge chip. Otherwise I could try to check and confirm that was the problem.
Ah, interesting. Maybe you have the panel:
boe,nv133fhm-n61
As far as I can tell from the datasheet (I have the similar boe,nv133fhm-n62) this is a 6bpp panel. ...but if you feed it 8bpp the banding goes away! Maybe the panel itself knows how to dither??? ...or maybe the datasheet / edid are wrong and this is actually an 8bpp panel. Seems unlikely...
In any case, one fix is to pick
<https://lore.kernel.org/dri-devel/[email protected]/>,
though right now that patch is only enabled for sc7180. Maybe you could figure out how to apply it to your hardware?...another fix would be to pretend that your panel is 8bpp even though it's actually 6bpp. Ironically if anyone ever tried to configure BPP from the EDID they'd go back to 6bpp. You can read the EDID of your panel with this:
Quoted 8 lines
bus=$(i2cdetect -l | grep sn65 | sed 's/i2c-\([0-9]*\).*$/\1/') i2cdump ${bus}
0x50iWhen I do that and then decode it on the "boe,nv133fhm-n62" panel, I find:
6 bits per primary color channel
-Doug
Hi Doug,
Decoding it does show be to boe,nv133fhm-n61 - and yeah it does say it's 6-bit according to panelook's specs for it.
I'll take a look at the patch and see what I can come up with... at the moment, I'm forcing it to be 8bit and that does "work fine" but I'd like it to be fixed properly instead of my hack.
Thanks for your time and work!
-- Steev
Re: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Quoted 58 lines · Steev Klimaszewski
Quoted 44 lines · Doug Anderson
Hi,
Quoted 12 lines · Doug Anderson
Hi,
Quoted 9 lines · Steev Klimaszewski
Hi Doug,
I've been testing 5.8 and linux-next on the Lenovo Yoga C630, and with this patch applied, there is really bad banding on the display.
I'm really bad at explaining it, but you can see the differences in the following:
24bit (pre-5.8) - https://dev.gentoo.org/~steev/files/image0.jpg
18bit (5.8/linux-next) - https://dev.gentoo.org/~steev/files/image1.jpg
Quoted 8 lines
Presumably this means that your panel is defined improperly? If the panel reports that it's a 6 bits per pixel panel but it's actually an 8 bits per pixel panel then you'll run into this problem.
I would have to assume you have a bunch of out of tree patches to support your hardware since I don't see any device trees in linuxnext (other than cheza) that use this bridge chip. Otherwise I could try to check and confirm that was the problem.
Ah, interesting. Maybe you have the panel:
boe,nv133fhm-n61
As far as I can tell from the datasheet (I have the similar boe,nv133fhm-n62) this is a 6bpp panel. ...but if you feed it 8bpp the banding goes away! Maybe the panel itself knows how to dither??? ...or maybe the datasheet / edid are wrong and this is actually an 8bpp panel. Seems unlikely...
In any case, one fix is to pick
<https://lore.kernel.org/dri-devel/[email protected]/>,though right now that patch is only enabled for sc7180. Maybe you could figure out how to apply it to your hardware?
...another fix would be to pretend that your panel is 8bpp even though it's actually 6bpp. Ironically if anyone ever tried to configure BPP from the EDID they'd go back to 6bpp. You can read the EDID of your panel with this:
Quoted 8 lines
bus=$(i2cdetect -l | grep sn65 | sed 's/i2c-\([0-9]*\).*$/\1/') i2cdump ${bus}
0x50iWhen I do that and then decode it on the "boe,nv133fhm-n62" panel, I find:
6 bits per primary color channel
-Doug
Hi Doug,
Quoted 9 lines
Decoding it does show be to boe,nv133fhm-n61 - and yeah it does say it's 6-bit according to panelook's specs for it.
I'll take a look at the patch and see what I can come up with... at the moment, I'm forcing it to be 8bit and that does "work fine" but I'd like it to be fixed properly instead of my hack.
Thanks for your time and work!
-- Steev
For what it's worth - the 5.8 that I'm testing is at https://github.com/steev/linux/commits/c630-5.8-rc4-inline-encryption
Re: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Quoted 53 lines · Steev Klimaszewski
Quoted 51 lines · Steev Klimaszewski
Quoted 49 lines · Doug Anderson
Hi,
Quoted 12 lines · Doug Anderson
Hi,
Quoted 9 lines · Steev Klimaszewski
Hi Doug,
I've been testing 5.8 and linux-next on the Lenovo Yoga C630, and with this patch applied, there is really bad banding on the display.
I'm really bad at explaining it, but you can see the differences in the following:
24bit (pre-5.8) - https://dev.gentoo.org/~steev/files/image0.jpg
18bit (5.8/linux-next) - https://dev.gentoo.org/~steev/files/image1.jpg
Quoted 8 lines
Presumably this means that your panel is defined improperly? If the panel reports that it's a 6 bits per pixel panel but it's actually an 8 bits per pixel panel then you'll run into this problem.
I would have to assume you have a bunch of out of tree patches to support your hardware since I don't see any device trees in linuxnext (other than cheza) that use this bridge chip. Otherwise I could try to check and confirm that was the problem.
Ah, interesting. Maybe you have the panel:
boe,nv133fhm-n61
As far as I can tell from the datasheet (I have the similar boe,nv133fhm-n62) this is a 6bpp panel. ...but if you feed it 8bpp the banding goes away! Maybe the panel itself knows how to dither??? ...or maybe the datasheet / edid are wrong and this is actually an 8bpp panel. Seems unlikely...
In any case, one fix is to pick
<https://lore.kernel.org/dri-devel/[email protected]/>,though right now that patch is only enabled for sc7180. Maybe you could figure out how to apply it to your hardware?
...another fix would be to pretend that your panel is 8bpp even though it's actually 6bpp. Ironically if anyone ever tried to configure BPP from the EDID they'd go back to 6bpp. You can read the EDID of your panel with this:
bus=$(i2cdetect -l | grep sn65 | sed 's/i2c-\([0-9]*\).*$/\1/') i2cdump ${bus}
0x50iWhen I do that and then decode it on the "boe,nv133fhm-n62" panel, I find:
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
6 bits per primary color channel
-Doug
Hi Doug,
Decoding it does show be to boe,nv133fhm-n61 - and yeah it does say it's 6-bit according to panelook's specs for it.
I derped again...
root@c630:~# bus=$(i2cdetect -l | grep sn65 | sed 's/i2c-\([0-9]*\).*$/\1/')
root@c630:~# i2cdump ${bus} 0x50 i > edid
WARNING! This program can confuse your I2C bus, cause data loss and worse!
I will probe file /dev/i2c-16, address 0x50, mode i2c block
Continue? [Y/n]
root@c630:~# edid-decode edid
edid-decode (hex):00 ff ff ff ff ff ff 00 09 e5 d1 07 00 00 00 00
01 1c 01 04 a5 1d 11 78 0a 1d b0 a6 58 54 9e 26
0f 50 54 00 00 00 01 01 01 01 01 01 01 01 01 01
01 01 01 01 01 01 c0 39 80 18 71 38 28 40 30 20
36 00 26 a5 10 00 00 1a 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 1a 00 00 00 fe 00 42
4f 45 20 43 51 0a 20 20 20 20 20 20 00 00 00 fe
00 4e 56 31 33 33 46 48 4d 2d 4e 36 31 0a 00 9a
03 26 0a 77 ab 1c 05 71 6f 1d 8c f1 43 ce 6a bb
fb d3 11 20 39 07 22 6e 65 68 77 70 d3 05 34 73
44 21 8b fd f5 6d 11 62 94 2a 7c fa 93 ba 6a 61
92 da 15 53 4c 39 eb f7 86 23 97 48 e9 39 09 d2
66 02 70 bb e2 77 0f 4a a3 a0 4c 72 6e 5d 47 70
43 c2 13 f3 b2 d9 b9 78 02 be 41 82 15 6a 28 dc
45 0f 9d eb 0f 2a cc e8 35 8d 34 7f 3e 84 5e a3
30 5e 1e 29 0a 48 0c d1 0a c4 08 31 03 a9 3b 29
----------------
EDID version: 1.4
Manufacturer: BOE Model 2001 Serial Number 0
Made in week 1 of 2018
Digital display
8 bits per primary color channel
DisplayPort interface
Maximum image size: 29 cm x 17 cm
Gamma: 2.20
Supported color formats: RGB 4:4:4, YCrCb 4:4:4
First detailed timing includes the native pixel format and preferred refresh rate
Color Characteristics
Red: 0.6484, 0.3447
Green: 0.3310, 0.6181
Blue: 0.1503, 0.0615
White: 0.3125, 0.3281
Established Timings I & II: none
Standard Timings: none
Detailed mode: Clock 147.840 MHz, 294 mm x 165 mm
1920 1968 2000 2200 ( 48 32 200)
1080 1083 1089 1120 ( 3 6 31)
+hsync -vsync
VertFreq: 60.000 Hz, HorFreq: 67.200 kHz
Manufacturer-Specified Display Descriptor (0x00): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1a ................ Alphanumeric Data String: BOE CQ
Alphanumeric Data String: NV133FHM-N61
Checksum: 0x9a
----------------
Unknown EDID Extension Block 0x03
03 26 0a 77 ab 1c 05 71 6f 1d 8c f1 43 ce 6a bb .&.w...qo...C.j. fb d3 11 20 39 07 22 6e 65 68 77 70 d3 05 34 73 ... 9."nehwp..4s 44 21 8b fd f5 6d 11 62 94 2a 7c fa 93 ba 6a 61 D!...m.b.*|...ja 92 da 15 53 4c 39 eb f7 86 23 97 48 e9 39 09 d2 ...SL9...#.H.9.. 66 02 70 bb e2 77 0f 4a a3 a0 4c 72 6e 5d 47 70 f.p..w.J..Lrn]Gp 43 c2 13 f3 b2 d9 b9 78 02 be 41 82 15 6a 28 dc C......x..A..j(. 45 0f 9d eb 0f 2a cc e8 35 8d 34 7f 3e 84 5e a3 E....*..5.4.>.^. 30 5e 1e 29 0a 48 0c d1 0a c4 08 31 03 a9 3b 29 0^.).H.....1..;)
Checksum: 0x29 (should be 0x82)
- My edid does in fact say it's 8bit
Doug Anderson
reviewerRe: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Hi,
Quoted 146 lines · Steev Klimaszewski
Quoted 61 lines · Steev Klimaszewski
Quoted 59 lines · Steev Klimaszewski
Quoted 57 lines · Doug Anderson
Hi,
Quoted 16 lines · Doug Anderson
Hi,
Quoted 5 lines · Steev Klimaszewski
Hi Doug,
I've been testing 5.8 and linux-next on the Lenovo Yoga C630, and with this patch applied, there is really bad banding on the display.
Quoted 7 lines
I'm really bad at explaining it, but you can see the differences in the following:
24bit (pre-5.8) - https://dev.gentoo.org/~steev/files/image0.jpg
18bit (5.8/linux-next) -
https://dev.gentoo.org/~steev/files/image1.jpgQuoted 8 lines
Presumably this means that your panel is defined improperly? If the panel reports that it's a 6 bits per pixel panel but it's actually an 8 bits per pixel panel then you'll run into this problem.
I would have to assume you have a bunch of out of tree patches to support your hardware since I don't see any device trees in linuxnext (other than cheza) that use this bridge chip. Otherwise I could try to check and confirm that was the problem.
Ah, interesting. Maybe you have the panel:
boe,nv133fhm-n61
As far as I can tell from the datasheet (I have the similar boe,nv133fhm-n62) this is a 6bpp panel. ...but if you feed it 8bpp the banding goes away! Maybe the panel itself knows how to dither??? ...or maybe the datasheet / edid are wrong and this is actually an 8bpp panel. Seems unlikely...
In any case, one fix is to pick
<https://lore.kernel.org/dri-devel/[email protected]/>,though right now that patch is only enabled for sc7180. Maybe you could figure out how to apply it to your hardware?
...another fix would be to pretend that your panel is 8bpp even though it's actually 6bpp. Ironically if anyone ever tried to configure BPP from the EDID they'd go back to 6bpp. You can read the EDID of your panel with this:
bus=$(i2cdetect -l | grep sn65 | sed 's/i2c-\([0-9]*\).*$/\1/') i2cdump ${bus}
0x50iWhen I do that and then decode it on the "boe,nv133fhm-n62" panel, I find:
6 bits per primary color channel
Quoted 7 lines
Quoted 7 lines
Quoted 1 line
-Doug
Hi Doug,
Decoding it does show be to boe,nv133fhm-n61 - and yeah it does say it's 6-bit according to panelook's specs for it.
I derped again...
root@c630:~# bus=$(i2cdetect -l | grep sn65 | sed 's/i2c-\([0-9]*\).*$/\1/') root@c630:~# i2cdump ${bus} 0x50 i > edid WARNING! This program can confuse your I2C bus, cause data loss and worse! I will probe file /dev/i2c-16, address 0x50, mode i2c block Continue? [Y/n] root@c630:~# edid-decode edid edid-decode (hex):00 ff ff ff ff ff ff 00 09 e5 d1 07 00 00 00 00
01 1c 01 04 a5 1d 11 78 0a 1d b0 a6 58 54 9e 26
0f 50 54 00 00 00 01 01 01 01 01 01 01 01 01 01
01 01 01 01 01 01 c0 39 80 18 71 38 28 40 30 20
36 00 26 a5 10 00 00 1a 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 1a 00 00 00 fe 00 42
4f 45 20 43 51 0a 20 20 20 20 20 20 00 00 00 fe
00 4e 56 31 33 33 46 48 4d 2d 4e 36 31 0a 00 9a03 26 0a 77 ab 1c 05 71 6f 1d 8c f1 43 ce 6a bb
fb d3 11 20 39 07 22 6e 65 68 77 70 d3 05 34 73
44 21 8b fd f5 6d 11 62 94 2a 7c fa 93 ba 6a 61
92 da 15 53 4c 39 eb f7 86 23 97 48 e9 39 09 d2
66 02 70 bb e2 77 0f 4a a3 a0 4c 72 6e 5d 47 70
43 c2 13 f3 b2 d9 b9 78 02 be 41 82 15 6a 28 dc
45 0f 9d eb 0f 2a cc e8 35 8d 34 7f 3e 84 5e a3
30 5e 1e 29 0a 48 0c d1 0a c4 08 31 03 a9 3b 29----------------
EDID version: 1.4
Manufacturer: BOE Model 2001 Serial Number 0
Made in week 1 of 2018
Digital display
8 bits per primary color channel
DisplayPort interface
Maximum image size: 29 cm x 17 cm
Gamma: 2.20
Supported color formats: RGB 4:4:4, YCrCb 4:4:4
First detailed timing includes the native pixel format and preferred refresh rate
Color Characteristics
Red: 0.6484, 0.3447
Green: 0.3310, 0.6181
Blue: 0.1503, 0.0615
White: 0.3125, 0.3281
Established Timings I & II: none
Standard Timings: none
Detailed mode: Clock 147.840 MHz, 294 mm x 165 mm1920 1968 2000 2200 ( 48 32 200) 1080 1083 1089 1120 ( 3 6 31) +hsync -vsync VertFreq: 60.000 Hz, HorFreq: 67.200 kHzManufacturer-Specified Display Descriptor (
0x00): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1a ................
Alphanumeric Data String: BOE CQ
Alphanumeric Data String: NV133FHM-N61
Checksum:0x9a----------------
Unknown EDID Extension Block
0x03
03 26 0a 77 ab 1c 05 71 6f 1d 8c f1 43 ce 6a bb .&.w...qo...C.j. fb d3 11 20 39 07 22 6e 65 68 77 70 d3 05 34 73 ... 9."nehwp..4s 44 21 8b fd f5 6d 11 62 94 2a 7c fa 93 ba 6a 61 D!...m.b.*|...ja 92 da 15 53 4c 39 eb f7 86 23 97 48 e9 39 09 d2 ...SL9...#.H.9.. 66 02 70 bb e2 77 0f 4a a3 a0 4c 72 6e 5d 47 70 f.p..w.J..Lrn]Gp 43 c2 13 f3 b2 d9 b9 78 02 be 41 82 15 6a 28 dc C......x..A..j(. 45 0f 9d eb 0f 2a cc e8 35 8d 34 7f 3e 84 5e a3 E....*..5.4.>.^. 30 5e 1e 29 0a 48 0c d1 0a c4 08 31 03 a9 3b 29 0^.).H.....1..;)
Checksum:0x29(should be0x82)
Quoted 1 line
- My edid does in fact say it's 8bit
Crazy! Mine:
Extracted contents:
header: 00 ff ff ff ff ff ff 00 serial number: 09 e5 2d 08 00 00 00 00 23 1c version: 01 04 basic params: 95 1d 11 78 02 chroma info: d5 00 a6 58 54 9f 27 0f 4f 57 established: 00 00 00 standard: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 descriptor 1: c0 39 80 18 71 38 28 40 30 20 36 00 26 a5 10 00 00 1a descriptor 2: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 descriptor 3: 00 00 00 fe 00 42 4f 45 20 43 51 0a 20 20 20 20 20 20 descriptor 4: 00 00 00 fe 00 4e 56 31 33 33 46 48 4d 2d 4e 36 32 0a extensions: 00 checksum: 40
Manufacturer: BOE Model 82d Serial Number 0
Made week 35 of 2018
EDID version: 1.4
Digital display
6 bits per primary color channel
DisplayPort interface
Maximum image size: 29 cm x 17 cm
Gamma: 2.20
Supported color formats: RGB 4:4:4
First detailed timing is preferred timing
Established timings supported:
Standard timings supported:
Detailed mode: Clock 147.840 MHz, 294 mm x 165 mm
1920 1968 2000 2200 hborder 0
1080 1083 1089 1120 vborder 0
+hsync -vsyncManufacturer-specified data, tag 0
ASCII string: BOE
ASCII string: NV133FHM-N62
Checksum: 0x40 (valid)
Unknown extension block
EDID block does NOT conform to EDID 1.3!
Missing name descriptor
Missing monitor ranges
Detailed block string not properly terminated
EDID block does not conform at all!
Has 128 nonconformant extension block(s)
_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Hi,
Quoted 110 lines · Doug Anderson
Quoted 68 lines
root@c630:~# bus=$(i2cdetect -l | grep sn65 | sed 's/i2c-\([0-9]*\).*$/\1/') root@c630:~# i2cdump ${bus} 0x50 i > edid WARNING! This program can confuse your I2C bus, cause data loss and worse! I will probe file /dev/i2c-16, address 0x50, mode i2c block Continue? [Y/n] root@c630:~# edid-decode edid edid-decode (hex):00 ff ff ff ff ff ff 00 09 e5 d1 07 00 00 00 00
01 1c 01 04 a5 1d 11 78 0a 1d b0 a6 58 54 9e 26
0f 50 54 00 00 00 01 01 01 01 01 01 01 01 01 01
01 01 01 01 01 01 c0 39 80 18 71 38 28 40 30 20
36 00 26 a5 10 00 00 1a 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 1a 00 00 00 fe 00 42
4f 45 20 43 51 0a 20 20 20 20 20 20 00 00 00 fe
00 4e 56 31 33 33 46 48 4d 2d 4e 36 31 0a 00 9a03 26 0a 77 ab 1c 05 71 6f 1d 8c f1 43 ce 6a bb
fb d3 11 20 39 07 22 6e 65 68 77 70 d3 05 34 73
44 21 8b fd f5 6d 11 62 94 2a 7c fa 93 ba 6a 61
92 da 15 53 4c 39 eb f7 86 23 97 48 e9 39 09 d2
66 02 70 bb e2 77 0f 4a a3 a0 4c 72 6e 5d 47 70
43 c2 13 f3 b2 d9 b9 78 02 be 41 82 15 6a 28 dc
45 0f 9d eb 0f 2a cc e8 35 8d 34 7f 3e 84 5e a3
30 5e 1e 29 0a 48 0c d1 0a c4 08 31 03 a9 3b 29----------------
EDID version: 1.4
Manufacturer: BOE Model 2001 Serial Number 0
Made in week 1 of 2018
Digital display
8 bits per primary color channel
DisplayPort interface
Maximum image size: 29 cm x 17 cm
Gamma: 2.20
Supported color formats: RGB 4:4:4, YCrCb 4:4:4
First detailed timing includes the native pixel format and preferred refresh rate
Color CharacteristicsRed: 0.6484, 0.3447 Green: 0.3310, 0.6181 Blue: 0.1503, 0.0615 White: 0.3125, 0.3281 Established Timings I & II: none Standard Timings: none Detailed mode: Clock 147.840 MHz, 294 mm x 165 mm 1920 1968 2000 2200 ( 48 32 200) 1080 1083 1089 1120 ( 3 6 31) +hsync -vsync VertFreq: 60.000 Hz, HorFreq: 67.200 kHzManufacturer-Specified Display Descriptor (
0x00): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1a ................
Alphanumeric Data String: BOE CQ
Alphanumeric Data String: NV133FHM-N61
Checksum:0x9a----------------
Unknown EDID Extension Block
0x0303 26 0a 77 ab 1c 05 71 6f 1d 8c f1 43 ce 6a bb .&.w...qo...C.j. fb d3 11 20 39 07 22 6e 65 68 77 70 d3 05 34 73 ... 9."nehwp..4s 44 21 8b fd f5 6d 11 62 94 2a 7c fa 93 ba 6a 61 D!...m.b.*|...ja 92 da 15 53 4c 39 eb f7 86 23 97 48 e9 39 09 d2 ...SL9...#.H.9.. 66 02 70 bb e2 77 0f 4a a3 a0 4c 72 6e 5d 47 70 f.p..w.J..Lrn]Gp 43 c2 13 f3 b2 d9 b9 78 02 be 41 82 15 6a 28 dc C......x..A..j(. 45 0f 9d eb 0f 2a cc e8 35 8d 34 7f 3e 84 5e a3 E....*..5.4.>.^. 30 5e 1e 29 0a 48 0c d1 0a c4 08 31 03 a9 3b 29 0^.).H.....1..;)Quoted 4 lines
Checksum:
0x29(should be0x82)- My edid does in fact say it's 8bit
Crazy! Mine:
Extracted contents:
header: 00 ff ff ff ff ff ff 00 serial number: 09 e5 2d 08 00 00 00 00 23 1c version: 01 04 basic params: 95 1d 11 78 02 chroma info: d5 00 a6 58 54 9f 27 0f 4f 57 established: 00 00 00 standard: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 descriptor 1: c0 39 80 18 71 38 28 40 30 20 36 00 26 a5 10 00 00 1a descriptor 2: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 descriptor 3: 00 00 00 fe 00 42 4f 45 20 43 51 0a 20 20 20 20 20 20 descriptor 4: 00 00 00 fe 00 4e 56 31 33 33 46 48 4d 2d 4e 36 32 0a extensions: 00 checksum: 40Manufacturer: BOE Model 82d Serial Number 0
Made week 35 of 2018
EDID version: 1.4
Digital display
6 bits per primary color channel
DisplayPort interface
Maximum image size: 29 cm x 17 cm
Gamma: 2.20
Supported color formats: RGB 4:4:4
First detailed timing is preferred timing
Established timings supported:
Standard timings supported:
Detailed mode: Clock 147.840 MHz, 294 mm x 165 mm1920 1968 2000 2200 hborder 0 1080 1083 1089 1120 vborder 0 +hsync -vsyncManufacturer-specified data, tag 0
ASCII string: BOE
ASCII string: NV133FHM-N62
Checksum:0x40(valid)
Quoted 8 lines
Unknown extension block
EDID block does NOT conform to EDID 1.3!
Missing name descriptor
Missing monitor ranges
Detailed block string not properly terminated
EDID block does not conform at all!
Has 128 nonconformant extension block(s)
I did attempt to modify the patch, and I don't think I did it correctly
Around line 232, I changed
IS_SC7180_TARGET(c->hw.hwversion))
to
IS_SC7180_TARGET(c->hw.hwversion) ||
IS_SDM845_TARGET(c->hw.hwversion))
But it would seem that only gets us 1/2 way there...
https://dev.gentoo.org/~steev/files/image2.jpg
But should I continue on this path, or should we be finding others who have an N61 and see what their EDID reports?
I have another c630, but unfortunately, it appears to have the IVO screen in it, instead of another N61. I asked another user and he also had the IVO.
-- steev
Re: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Quoted 131 lines · Steev Klimaszewski
Hi,
Quoted 110 lines · Doug Anderson
Quoted 68 lines
root@c630:~# bus=$(i2cdetect -l | grep sn65 | sed 's/i2c-\([0-9]*\).*$/\1/') root@c630:~# i2cdump ${bus} 0x50 i > edid WARNING! This program can confuse your I2C bus, cause data loss and worse! I will probe file /dev/i2c-16, address 0x50, mode i2c block Continue? [Y/n] root@c630:~# edid-decode edid edid-decode (hex):00 ff ff ff ff ff ff 00 09 e5 d1 07 00 00 00 00
01 1c 01 04 a5 1d 11 78 0a 1d b0 a6 58 54 9e 26
0f 50 54 00 00 00 01 01 01 01 01 01 01 01 01 01
01 01 01 01 01 01 c0 39 80 18 71 38 28 40 30 20
36 00 26 a5 10 00 00 1a 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 1a 00 00 00 fe 00 42
4f 45 20 43 51 0a 20 20 20 20 20 20 00 00 00 fe
00 4e 56 31 33 33 46 48 4d 2d 4e 36 31 0a 00 9a03 26 0a 77 ab 1c 05 71 6f 1d 8c f1 43 ce 6a bb
fb d3 11 20 39 07 22 6e 65 68 77 70 d3 05 34 73
44 21 8b fd f5 6d 11 62 94 2a 7c fa 93 ba 6a 61
92 da 15 53 4c 39 eb f7 86 23 97 48 e9 39 09 d2
66 02 70 bb e2 77 0f 4a a3 a0 4c 72 6e 5d 47 70
43 c2 13 f3 b2 d9 b9 78 02 be 41 82 15 6a 28 dc
45 0f 9d eb 0f 2a cc e8 35 8d 34 7f 3e 84 5e a3
30 5e 1e 29 0a 48 0c d1 0a c4 08 31 03 a9 3b 29----------------
EDID version: 1.4
Manufacturer: BOE Model 2001 Serial Number 0
Made in week 1 of 2018
Digital display
8 bits per primary color channel
DisplayPort interface
Maximum image size: 29 cm x 17 cm
Gamma: 2.20
Supported color formats: RGB 4:4:4, YCrCb 4:4:4
First detailed timing includes the native pixel format and preferred refresh rate
Color CharacteristicsRed: 0.6484, 0.3447 Green: 0.3310, 0.6181 Blue: 0.1503, 0.0615 White: 0.3125, 0.3281 Established Timings I & II: none Standard Timings: none Detailed mode: Clock 147.840 MHz, 294 mm x 165 mm 1920 1968 2000 2200 ( 48 32 200) 1080 1083 1089 1120 ( 3 6 31) +hsync -vsync VertFreq: 60.000 Hz, HorFreq: 67.200 kHzManufacturer-Specified Display Descriptor (
0x00): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1a ................
Alphanumeric Data String: BOE CQ
Alphanumeric Data String: NV133FHM-N61
Checksum:0x9a----------------
Unknown EDID Extension Block
0x0303 26 0a 77 ab 1c 05 71 6f 1d 8c f1 43 ce 6a bb .&.w...qo...C.j. fb d3 11 20 39 07 22 6e 65 68 77 70 d3 05 34 73 ... 9."nehwp..4s 44 21 8b fd f5 6d 11 62 94 2a 7c fa 93 ba 6a 61 D!...m.b.*|...ja 92 da 15 53 4c 39 eb f7 86 23 97 48 e9 39 09 d2 ...SL9...#.H.9.. 66 02 70 bb e2 77 0f 4a a3 a0 4c 72 6e 5d 47 70 f.p..w.J..Lrn]Gp 43 c2 13 f3 b2 d9 b9 78 02 be 41 82 15 6a 28 dc C......x..A..j(. 45 0f 9d eb 0f 2a cc e8 35 8d 34 7f 3e 84 5e a3 E....*..5.4.>.^. 30 5e 1e 29 0a 48 0c d1 0a c4 08 31 03 a9 3b 29 0^.).H.....1..;)Quoted 4 lines
Checksum:
0x29(should be0x82)- My edid does in fact say it's 8bit
Crazy! Mine:
Extracted contents:
header: 00 ff ff ff ff ff ff 00 serial number: 09 e5 2d 08 00 00 00 00 23 1c version: 01 04 basic params: 95 1d 11 78 02 chroma info: d5 00 a6 58 54 9f 27 0f 4f 57 established: 00 00 00 standard: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 descriptor 1: c0 39 80 18 71 38 28 40 30 20 36 00 26 a5 10 00 00 1a descriptor 2: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 descriptor 3: 00 00 00 fe 00 42 4f 45 20 43 51 0a 20 20 20 20 20 20 descriptor 4: 00 00 00 fe 00 4e 56 31 33 33 46 48 4d 2d 4e 36 32 0a extensions: 00 checksum: 40Manufacturer: BOE Model 82d Serial Number 0
Made week 35 of 2018
EDID version: 1.4
Digital display
6 bits per primary color channel
DisplayPort interface
Maximum image size: 29 cm x 17 cm
Gamma: 2.20
Supported color formats: RGB 4:4:4
First detailed timing is preferred timing
Established timings supported:
Standard timings supported:
Detailed mode: Clock 147.840 MHz, 294 mm x 165 mm1920 1968 2000 2200 hborder 0 1080 1083 1089 1120 vborder 0 +hsync -vsyncManufacturer-specified data, tag 0
ASCII string: BOE
ASCII string: NV133FHM-N62
Checksum:0x40(valid)Quoted 8 lines
Unknown extension block
EDID block does NOT conform to EDID 1.3!
Missing name descriptor
Missing monitor ranges
Detailed block string not properly terminated
EDID block does not conform at all!
Has 128 nonconformant extension block(s)I did attempt to modify the patch, and I don't think I did it correctly
Around line 232, I changed
IS_SC7180_TARGET(c->hw.hwversion))to
Quoted 9 lines
IS_SC7180_TARGET(c->hw.hwversion)||
IS_SDM845_TARGET(c->hw.hwversion))But it would seem that only gets us 1/2 way there...
neat.. I guess this is because 845/850 supports split-lm (layer mixer), and uses it for horiz resolution above 1080 (MAX_HDISPLAY_SPLIT)
I *think* you could probably increase MAX_HDISPLAY_SPLIT to 1920 and it will "work". (Or at least I think our reasons for using a lower value are power, on older gens we only used split mode above 2k width.)
BR,
-R
Quoted 10 lines
But should I continue on this path, or should we be finding others who have an N61 and see what their EDID reports?
I have another c630, but unfortunately, it appears to have the IVO screen in it, instead of another N61. I asked another user and he also had the IVO.
-- steev
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Doug Anderson
reviewerRe: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
In reply to Steev KlimaszewskiHi,
Quoted 136 lines · Steev Klimaszewski
Hi,
Quoted 110 lines · Doug Anderson
Quoted 68 lines
root@c630:~# bus=$(i2cdetect -l | grep sn65 | sed 's/i2c-\([0-9]*\).*$/\1/') root@c630:~# i2cdump ${bus} 0x50 i > edid WARNING! This program can confuse your I2C bus, cause data loss and worse! I will probe file /dev/i2c-16, address 0x50, mode i2c block Continue? [Y/n] root@c630:~# edid-decode edid edid-decode (hex):00 ff ff ff ff ff ff 00 09 e5 d1 07 00 00 00 00
01 1c 01 04 a5 1d 11 78 0a 1d b0 a6 58 54 9e 26
0f 50 54 00 00 00 01 01 01 01 01 01 01 01 01 01
01 01 01 01 01 01 c0 39 80 18 71 38 28 40 30 20
36 00 26 a5 10 00 00 1a 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 1a 00 00 00 fe 00 42
4f 45 20 43 51 0a 20 20 20 20 20 20 00 00 00 fe
00 4e 56 31 33 33 46 48 4d 2d 4e 36 31 0a 00 9a03 26 0a 77 ab 1c 05 71 6f 1d 8c f1 43 ce 6a bb
fb d3 11 20 39 07 22 6e 65 68 77 70 d3 05 34 73
44 21 8b fd f5 6d 11 62 94 2a 7c fa 93 ba 6a 61
92 da 15 53 4c 39 eb f7 86 23 97 48 e9 39 09 d2
66 02 70 bb e2 77 0f 4a a3 a0 4c 72 6e 5d 47 70
43 c2 13 f3 b2 d9 b9 78 02 be 41 82 15 6a 28 dc
45 0f 9d eb 0f 2a cc e8 35 8d 34 7f 3e 84 5e a3
30 5e 1e 29 0a 48 0c d1 0a c4 08 31 03 a9 3b 29----------------
EDID version: 1.4
Manufacturer: BOE Model 2001 Serial Number 0
Made in week 1 of 2018
Digital display
8 bits per primary color channel
DisplayPort interface
Maximum image size: 29 cm x 17 cm
Gamma: 2.20
Supported color formats: RGB 4:4:4, YCrCb 4:4:4
First detailed timing includes the native pixel format and preferred refresh rate
Color CharacteristicsRed: 0.6484, 0.3447 Green: 0.3310, 0.6181 Blue: 0.1503, 0.0615 White: 0.3125, 0.3281 Established Timings I & II: none Standard Timings: none Detailed mode: Clock 147.840 MHz, 294 mm x 165 mm 1920 1968 2000 2200 ( 48 32 200) 1080 1083 1089 1120 ( 3 6 31) +hsync -vsync VertFreq: 60.000 Hz, HorFreq: 67.200 kHzManufacturer-Specified Display Descriptor (
0x00): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1a ................
Alphanumeric Data String: BOE CQ
Alphanumeric Data String: NV133FHM-N61
Checksum:0x9a----------------
Unknown EDID Extension Block
0x0303 26 0a 77 ab 1c 05 71 6f 1d 8c f1 43 ce 6a bb .&.w...qo...C.j. fb d3 11 20 39 07 22 6e 65 68 77 70 d3 05 34 73 ... 9."nehwp..4s 44 21 8b fd f5 6d 11 62 94 2a 7c fa 93 ba 6a 61 D!...m.b.*|...ja 92 da 15 53 4c 39 eb f7 86 23 97 48 e9 39 09 d2 ...SL9...#.H.9.. 66 02 70 bb e2 77 0f 4a a3 a0 4c 72 6e 5d 47 70 f.p..w.J..Lrn]Gp 43 c2 13 f3 b2 d9 b9 78 02 be 41 82 15 6a 28 dc C......x..A..j(. 45 0f 9d eb 0f 2a cc e8 35 8d 34 7f 3e 84 5e a3 E....*..5.4.>.^. 30 5e 1e 29 0a 48 0c d1 0a c4 08 31 03 a9 3b 29 0^.).H.....1..;)Quoted 4 lines
Checksum:
0x29(should be0x82)- My edid does in fact say it's 8bit
Crazy! Mine:
Extracted contents:
header: 00 ff ff ff ff ff ff 00 serial number: 09 e5 2d 08 00 00 00 00 23 1c version: 01 04 basic params: 95 1d 11 78 02 chroma info: d5 00 a6 58 54 9f 27 0f 4f 57 established: 00 00 00 standard: 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 descriptor 1: c0 39 80 18 71 38 28 40 30 20 36 00 26 a5 10 00 00 1a descriptor 2: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 descriptor 3: 00 00 00 fe 00 42 4f 45 20 43 51 0a 20 20 20 20 20 20 descriptor 4: 00 00 00 fe 00 4e 56 31 33 33 46 48 4d 2d 4e 36 32 0a extensions: 00 checksum: 40Manufacturer: BOE Model 82d Serial Number 0
Made week 35 of 2018
EDID version: 1.4
Digital display
6 bits per primary color channel
DisplayPort interface
Maximum image size: 29 cm x 17 cm
Gamma: 2.20
Supported color formats: RGB 4:4:4
First detailed timing is preferred timing
Established timings supported:
Standard timings supported:
Detailed mode: Clock 147.840 MHz, 294 mm x 165 mm1920 1968 2000 2200 hborder 0 1080 1083 1089 1120 vborder 0 +hsync -vsyncManufacturer-specified data, tag 0
ASCII string: BOE
ASCII string: NV133FHM-N62
Checksum:0x40(valid)Quoted 8 lines
Unknown extension block
EDID block does NOT conform to EDID 1.3!
Missing name descriptor
Missing monitor ranges
Detailed block string not properly terminated
EDID block does not conform at all!
Has 128 nonconformant extension block(s)I did attempt to modify the patch, and I don't think I did it correctly
Around line 232, I changed
IS_SC7180_TARGET(c->hw.hwversion))to
IS_SC7180_TARGET(c->hw.hwversion)||
IS_SDM845_TARGET(c->hw.hwversion))
Quoted 6 lines
But it would seem that only gets us 1/2 way there...
https://dev.gentoo.org/~steev/files/image2.jpg
But should I continue on this path,
It's probably worth getting dithering working on your sdm845 anyway in case anyone actually does put a 6bpp panel on this SoC.
Quoted 2 lines
or should we be finding others who
have an N61 and see what their EDID reports?
I have an email out to BOE, but it might take a little while to get a response. I'll see what they say. If they say that the panel actually supports 8bpp then it's a no-brainer and we should just switch to 8bpp and be done.
...but if they say it's a 6bpp panel that has its own dither logic then it gets more complicated. Initially one would think there should be very little downside in defining the panel as an 8bpp panel and calling it done. ...except that it conflicts with some other work that I have in progress. :-P Specifically if you treat the panel as 6bpp and then reduce the blanking a tiny bit you can actually save 75 mW of total system power on my board (probably similar on your board since you have the same bridge chip). You can see a patch to do that here:
...so I'm hoping to get some clarity from BOE both on the true bits per pixel and whether my proposed timings are valid before moving forward. Is that OK?
-Doug
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Quoted 25 lines · Doug Anderson
Hi,
But should I continue on this path,
It's probably worth getting dithering working on your sdm845 anyway in case anyone actually does put a 6bpp panel on this SoC.Quoted 2 lines
or should we be finding others who
have an N61 and see what their EDID reports?I have an email out to BOE, but it might take a little while to get a response. I'll see what they say. If they say that the panel actually supports 8bpp then it's a no-brainer and we should just switch to 8bpp and be done.
...but if they say it's a 6bpp panel that has its own dither logic then it gets more complicated. Initially one would think there should be very little downside in defining the panel as an 8bpp panel and calling it done. ...except that it conflicts with some other work that I have in progress. :-P Specifically if you treat the panel as 6bpp and then reduce the blanking a tiny bit you can actually save 75 mW of total system power on my board (probably similar on your board since you have the same bridge chip). You can see a patch to do that here:
Quoted 8 lines
...so I'm hoping to get some clarity from BOE both on the true bits per pixel and whether my proposed timings are valid before moving forward. Is that OK?
-Doug
It's fine by me - testing Rob's suggestion of changing MAX_HDISPLAY_SPLIT 1080->1920 along with the change to adding IS_SDM845 does give me a full screen that looks nicer, I'm fine with using the hack locally until a proper solution is found. And I'm always a fan of using less power on a laptop.
I'll give the patch a spin here if you want as well.
Hopefully BOE gets back to you soon, and there's no rush, I'm just an end user who is extremely appreciative of all the work everyone on the list and the kernel in general put in to make my machines usable.
Doug Anderson
reviewerRe: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Hi,
Quoted 45 lines · Steev Klimaszewski
Quoted 25 lines · Doug Anderson
Hi,
But should I continue on this path,
It's probably worth getting dithering working on your sdm845 anyway in case anyone actually does put a 6bpp panel on this SoC.Quoted 2 lines
or should we be finding others who
have an N61 and see what their EDID reports?I have an email out to BOE, but it might take a little while to get a response. I'll see what they say. If they say that the panel actually supports 8bpp then it's a no-brainer and we should just switch to 8bpp and be done.
...but if they say it's a 6bpp panel that has its own dither logic then it gets more complicated. Initially one would think there should be very little downside in defining the panel as an 8bpp panel and calling it done. ...except that it conflicts with some other work that I have in progress. :-P Specifically if you treat the panel as 6bpp and then reduce the blanking a tiny bit you can actually save 75 mW of total system power on my board (probably similar on your board since you have the same bridge chip). You can see a patch to do that here:
Quoted 8 lines
...so I'm hoping to get some clarity from BOE both on the true bits per pixel and whether my proposed timings are valid before moving forward. Is that OK?
-Doug
It's fine by me - testing Rob's suggestion of changing
MAX_HDISPLAY_SPLIT1080->1920 along with the change to addingIS_SDM845does give me a full screen that looks nicer, I'm fine with using the hack locally until a proper solution is found. And I'm always a fan of using less power on a laptop.
Quoted 6 lines
I'll give the patch a spin here if you want as well.
Hopefully BOE gets back to you soon, and there's no rush, I'm just an end user who is extremely appreciative of all the work everyone on the list and the kernel in general put in to make my machines usable.
Just FYI that I got confirmation that the panel is truly 6 bpp but it will do FRC dithering if given an 8 bpp input. That means that you should be getting just as good picture quality (and possibly more tunable) by using the dithering in the display pipeline and leaving the panel as 6bpp. Thus I'm going to assume that's the route we'll go down. If ever we find someone that wants to use this panel on a display controller that can't do its own dithering then I guess we'll have to figure out what to do then...
In terms of the more optimal pixel clock for saving power, my proposal is still being analyzed and I'll report back when I hear more. I'm seeing if BOE can confirm that my proposal will work both for my panel (the -n62 variant) and the one you have (the -n61 variant).
-Doug
Doug Anderson
reviewerRe: [PATCH v3 6/9] drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can
Hi,
Quoted 14 lines · Doug Anderson
Quoted 4 lines
Hopefully BOE gets back to you soon, and there's no rush, I'm just an end user who is extremely appreciative of all the work everyone on the list and the kernel in general put in to make my machines usable.
Just FYI that I got confirmation that the panel is truly 6 bpp but it will do FRC dithering if given an 8 bpp input. That means that you should be getting just as good picture quality (and possibly more tunable) by using the dithering in the display pipeline and leaving the panel as 6bpp. Thus I'm going to assume that's the route we'll go down. If ever we find someone that wants to use this panel on a display controller that can't do its own dithering then I guess we'll have to figure out what to do then...
Quoted 4 lines
In terms of the more optimal pixel clock for saving power, my proposal is still being analyzed and I'll report back when I hear more. I'm seeing if BOE can confirm that my proposal will work both for my panel (the -n62 variant) and the one you have (the -n61 variant).
To close the loop here: we finally got back an official word that we shouldn't use my proposed timings that would have allowed us to move down to a 1.62 GHz pixel clock. Though they work most of the time, there are apparently some corner cases where they cause problems / flickering. :( While you could certainly use the timings on your own system if they happen to work for you, I don't think it'd be a good idea to switch the default over to them or anything. I'm told that hardware makers will take this type of thing into consideration for future hardware.
-Doug
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Douglas Anderson
reviewerPATCH v3 7/9 drm/bridge: ti-sn65dsi86: Group DP link training bits in a function
In reply to Douglas AndersonWe'll re-organize the ti_sn_bridge_enable() function a bit to group together all the parts relating to link training and split them into a sub-function. This is not intended to have any functional change and is in preparation for trying link training several times at different rates. One small side effect here is that if link training fails we'll now leave the DP PLL disabled, but that seems like a sane thing to do.
---
Changes in v3: None
Changes in v2: None
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 86 ++++++++++++++++----------- 1 file changed, 52 insertions(+), 34 deletions(-)
drivers/gpu/drm/bridge/ti-sn65dsi86.c +52 -34
@@ -530,6 +530,46 @@ static unsigned int ti_sn_get_max_lanes(struct ti_sn_bridge *pdata)return data &DP_LANE_COUNT_MASK ; } +static int ti_sn_link_training (struct ti_sn_bridge *pdata) +{ +unsigned int val; +int ret; + +/* set dp clk frequency value */ +ti_sn_bridge_set_dp_rate (pdata); + +/* enable DP PLL */ +regmap_write (pdata->regmap,SN_PLL_ENABLE_REG ,1 ); + + ret =regmap_read_poll_timeout (pdata->regmap,SN_DPPLL_SRC_REG , val, + val &DPPLL_SRC_DP_PLL_LOCK ,1000 , +50 *1000 ); +if (ret) { +DRM_ERROR ("DP_PLL_LOCK polling failed (%d)\n" , ret); + goto exit; + } + +/* Semi auto link training mode */ +regmap_write (pdata->regmap,SN_ML_TX_MODE_REG ,0x0A ); + ret =regmap_read_poll_timeout (pdata->regmap,SN_ML_TX_MODE_REG , val, + val ==ML_TX_MAIN_LINK_OFF || + val ==ML_TX_NORMAL_MODE ,1000 , +500 *1000 ); +if (ret) { +DRM_ERROR ("Training complete polling failed (%d)\n" , ret); + }else if (val ==ML_TX_MAIN_LINK_OFF ) { +DRM_ERROR ("Link training failed, link is off\n" ); + ret = -EIO ; + } + +exit: +/* Disable the PLL if we failed */ +if (ret) +regmap_write (pdata->regmap,SN_PLL_ENABLE_REG ,0 ); + +return ret; +} +static void ti_sn_bridge_enable (struct drm_bridge *bridge) {struct ti_sn_bridge *pdata =bridge_to_ti_sn_bridge (bridge);
@@ -555,29 +595,8 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge)regmap_update_bits (pdata->regmap,SN_DSI_LANES_REG ,CHA_DSI_LANES_MASK , val); -/* Set the DP output format (18 bpp or 24 bpp) */ - val = (ti_sn_bridge_get_bpp (pdata) ==18 ) ?BPP_18_RGB :0 ; -regmap_update_bits (pdata->regmap,SN_DATA_FORMAT_REG ,BPP_18_RGB , val); - -/* DP lane config */ - val =DP_NUM_LANES (min (pdata->dp_lanes,3 )); -regmap_update_bits (pdata->regmap,SN_SSC_CONFIG_REG ,DP_NUM_LANES_MASK , - val); - -/* set dsi/dp clk frequency value */ +/* set dsi clk frequency value */ ti_sn_bridge_set_dsi_rate (pdata); -ti_sn_bridge_set_dp_rate (pdata); - -/* enable DP PLL */ -regmap_write (pdata->regmap,SN_PLL_ENABLE_REG ,1 ); - - ret =regmap_read_poll_timeout (pdata->regmap,SN_DPPLL_SRC_REG , val, - val &DPPLL_SRC_DP_PLL_LOCK ,1000 , -50 *1000 ); -if (ret) { -DRM_ERROR ("DP_PLL_LOCK polling failed (%d)\n" , ret); -return ; - }/** * The SN65DSI86 only supports ASSR Display Authentication method and
@@ -588,19 +607,18 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge)drm_dp_dpcd_writeb (&pdata->aux,DP_EDP_CONFIGURATION_SET ,DP_ALTERNATE_SCRAMBLER_RESET_ENABLE ); -/* Semi auto link training mode */ -regmap_write (pdata->regmap,SN_ML_TX_MODE_REG ,0x0A ); - ret =regmap_read_poll_timeout (pdata->regmap,SN_ML_TX_MODE_REG , val, - val ==ML_TX_MAIN_LINK_OFF || - val ==ML_TX_NORMAL_MODE ,1000 , -500 *1000 ); -if (ret) { -DRM_ERROR ("Training complete polling failed (%d)\n" , ret); -return ; - }else if (val ==ML_TX_MAIN_LINK_OFF ) { -DRM_ERROR ("Link training failed, link is off\n" ); +/* Set the DP output format (18 bpp or 24 bpp) */ + val = (ti_sn_bridge_get_bpp (pdata) ==18 ) ?BPP_18_RGB :0 ; +regmap_update_bits (pdata->regmap,SN_DATA_FORMAT_REG ,BPP_18_RGB , val); + +/* DP lane config */ + val =DP_NUM_LANES (min (pdata->dp_lanes,3 )); +regmap_update_bits (pdata->regmap,SN_SSC_CONFIG_REG ,DP_NUM_LANES_MASK , + val); + + ret =ti_sn_link_training (pdata); +if (ret)return ; - }/* config video parameters */ ti_sn_bridge_set_video_timings (pdata);
Signature · 6 lines
2.24.1.735.g03f4e72817-goog _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 7/9] drm/bridge: ti-sn65dsi86: Group DP link training bits in a function
Quoted 11 lines · Douglas Anderson
We'll re-organize the
ti_sn_bridge_enable()function a bit to group together all the parts relating to link training and split them into a sub-function. This is not intended to have any functional change and is in preparation for trying link training several times at different rates. One small side effect here is that if link training fails we'll now leave the DP PLL disabled, but that seems like a sane thing to do.Signed-off-by Douglas Anderson <[email protected]>Tested-by Rob Clark <[email protected]>Reviewed-by Rob Clark <[email protected]>
Quoted 124 lines
---
Changes in v3: None
Changes in v2: Nonedrivers/gpu/drm/bridge/ti-sn65dsi86.c | 86 ++++++++++++++++----------- 1 file changed, 52 insertions(+), 34 deletions(-)drivers/gpu/drm/bridge/ti-sn65dsi86.c +52
-34@@ -530,6 +530,46 @@ static unsigned int ti_sn_get_max_lanes(struct ti_sn_bridge *pdata)return data &DP_LANE_COUNT_MASK ; } +static int ti_sn_link_training (struct ti_sn_bridge *pdata) +{ +unsigned int val; +int ret; + +/* set dp clk frequency value */ +ti_sn_bridge_set_dp_rate (pdata); + +/* enable DP PLL */ +regmap_write (pdata->regmap,SN_PLL_ENABLE_REG ,1 ); + + ret =regmap_read_poll_timeout (pdata->regmap,SN_DPPLL_SRC_REG , val, + val &DPPLL_SRC_DP_PLL_LOCK ,1000 , +50 *1000 ); +if (ret) { +DRM_ERROR ("DP_PLL_LOCK polling failed (%d)\n" , ret); + goto exit; + } + +/* Semi auto link training mode */ +regmap_write (pdata->regmap,SN_ML_TX_MODE_REG ,0x0A ); + ret =regmap_read_poll_timeout (pdata->regmap,SN_ML_TX_MODE_REG , val, + val ==ML_TX_MAIN_LINK_OFF || + val ==ML_TX_NORMAL_MODE ,1000 , +500 *1000 ); +if (ret) { +DRM_ERROR ("Training complete polling failed (%d)\n" , ret); + }else if (val ==ML_TX_MAIN_LINK_OFF ) { +DRM_ERROR ("Link training failed, link is off\n" ); + ret = -EIO ; + } + +exit: +/* Disable the PLL if we failed */ +if (ret) +regmap_write (pdata->regmap,SN_PLL_ENABLE_REG ,0 ); + +return ret; +} +static void ti_sn_bridge_enable (struct drm_bridge *bridge) {struct ti_sn_bridge *pdata =bridge_to_ti_sn_bridge (bridge);@@ -555,29 +595,8 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge)regmap_update_bits (pdata->regmap,SN_DSI_LANES_REG ,CHA_DSI_LANES_MASK , val); -/* Set the DP output format (18 bpp or 24 bpp) */ - val = (ti_sn_bridge_get_bpp (pdata) ==18 ) ?BPP_18_RGB :0 ; -regmap_update_bits (pdata->regmap,SN_DATA_FORMAT_REG ,BPP_18_RGB , val); - -/* DP lane config */ - val =DP_NUM_LANES (min (pdata->dp_lanes,3 )); -regmap_update_bits (pdata->regmap,SN_SSC_CONFIG_REG ,DP_NUM_LANES_MASK , - val); - -/* set dsi/dp clk frequency value */ +/* set dsi clk frequency value */ ti_sn_bridge_set_dsi_rate (pdata); -ti_sn_bridge_set_dp_rate (pdata); - -/* enable DP PLL */ -regmap_write (pdata->regmap,SN_PLL_ENABLE_REG ,1 ); - - ret =regmap_read_poll_timeout (pdata->regmap,SN_DPPLL_SRC_REG , val, - val &DPPLL_SRC_DP_PLL_LOCK ,1000 , -50 *1000 ); -if (ret) { -DRM_ERROR ("DP_PLL_LOCK polling failed (%d)\n" , ret); -return ; - }/** * The SN65DSI86 only supports ASSR Display Authentication method and @@ -588,19 +607,18 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge)drm_dp_dpcd_writeb (&pdata->aux,DP_EDP_CONFIGURATION_SET ,DP_ALTERNATE_SCRAMBLER_RESET_ENABLE ); -/* Semi auto link training mode */ -regmap_write (pdata->regmap,SN_ML_TX_MODE_REG ,0x0A ); - ret =regmap_read_poll_timeout (pdata->regmap,SN_ML_TX_MODE_REG , val, - val ==ML_TX_MAIN_LINK_OFF || - val ==ML_TX_NORMAL_MODE ,1000 , -500 *1000 ); -if (ret) { -DRM_ERROR ("Training complete polling failed (%d)\n" , ret); -return ; - }else if (val ==ML_TX_MAIN_LINK_OFF ) { -DRM_ERROR ("Link training failed, link is off\n" ); +/* Set the DP output format (18 bpp or 24 bpp) */ + val = (ti_sn_bridge_get_bpp (pdata) ==18 ) ?BPP_18_RGB :0 ; +regmap_update_bits (pdata->regmap,SN_DATA_FORMAT_REG ,BPP_18_RGB , val); + +/* DP lane config */ + val =DP_NUM_LANES (min (pdata->dp_lanes,3 )); +regmap_update_bits (pdata->regmap,SN_SSC_CONFIG_REG ,DP_NUM_LANES_MASK , + val); + + ret =ti_sn_link_training (pdata); +if (ret)return ; - }/* config video parameters */ ti_sn_bridge_set_video_timings (pdata);Signature · 1 line
2.24.1.735.g03f4e72817-goog
Douglas Anderson
reviewerPATCH v3 8/9 drm/bridge: ti-sn65dsi86: Train at faster rates if slower ones fail
In reply to Douglas AndersonIf we fail training at a lower DP link rate let's now keep trying until we run out of rates to try. Basically the algorithm here is to start at the link rate that is the theoretical minimum and then slowly bump up until we run out of rates or hit the max rate of the sink. We query the sink using a DPCD read.
This is, in fact, important in practice. Specifically at least one panel hooked up to the bridge (AUO B116XAK01) had a theoretical min rate more than 1.62 GHz (if run at 24 bpp) and fails to train at the next rate (2.16 GHz). It would train at 2.7 GHz, though.
---
Changes in v3: None
Changes in v2:
- Squash in maybe-uninitialized fix from Rob Clark.
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 71 ++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 11 deletions(-)
drivers/gpu/drm/bridge/ti-sn65dsi86.c +60 -11
@@ -454,7 +454,7 @@ static const unsigned int ti_sn_bridge_dp_rate_lut[] = { 0, 1620, 2160, 2430, 2700, 3240, 4320, 5400 }; -static void ti_sn_bridge_set_dp_rate (struct ti_sn_bridge *pdata) +static int ti_sn_bridge_calc_min_dp_rate_idx (struct ti_sn_bridge *pdata) {unsigned int bit_rate_khz, dp_rate_mhz;unsigned int i;
@@ -472,8 +472,42 @@ static void ti_sn_bridge_set_dp_rate(struct ti_sn_bridge *pdata)if (ti_sn_bridge_dp_rate_lut[i] > dp_rate_mhz)break ; -regmap_update_bits (pdata->regmap,SN_DATARATE_CONFIG_REG , -DP_DATARATE_MASK ,DP_DATARATE (i)); +return i; +} + +static int ti_sn_bridge_get_max_dp_rate_idx (struct ti_sn_bridge *pdata) +{ +u8 data; +int ret; + + ret =drm_dp_dpcd_readb (&pdata->aux,DP_MAX_LINK_RATE , &data); +if (ret !=1 ) { +DRM_DEV_ERROR (pdata->dev, +"Can't read max rate (%d); assuming 5.4 GHz\n" , + ret); +return ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; + } + +/* +* Return an index into ti_sn_bridge_dp_rate_lut. Just hardcode +* these indicies since it's not like the register spec is ever going +* to change and a loop would just be more complicated. Apparently +* the DP sink can only return these few rates as supported even +* though the bridge allows some rates in between. +*/ +switch (data) { +case DP_LINK_BW_1_62 : +return 1 ; +case DP_LINK_BW_2_7 : +return 4 ; +case DP_LINK_BW_5_4 : +return 7 ; + } + +DRM_DEV_ERROR (pdata->dev, +"Unexpected max data rate (%#x); assuming 5.4 GHz\n" , + (int )data); +return ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; }static void ti_sn_bridge_set_video_timings (struct ti_sn_bridge *pdata)
@@ -530,13 +564,15 @@ static unsigned int ti_sn_get_max_lanes(struct ti_sn_bridge *pdata)return data &DP_LANE_COUNT_MASK ; } -static int ti_sn_link_training (struct ti_sn_bridge *pdata) +static int ti_sn_link_training (struct ti_sn_bridge *pdata,int dp_rate_idx, +const char **last_err_str) {unsigned int val;int ret;/* set dp clk frequency value */ -ti_sn_bridge_set_dp_rate (pdata); +regmap_update_bits (pdata->regmap,SN_DATARATE_CONFIG_REG , +DP_DATARATE_MASK ,DP_DATARATE (dp_rate_idx));/* enable DP PLL */ regmap_write (pdata->regmap,SN_PLL_ENABLE_REG ,1 );
@@ -545,7 +581,7 @@ static int ti_sn_link_training(struct ti_sn_bridge *pdata) val &DPPLL_SRC_DP_PLL_LOCK ,1000 , 50 * 1000);if (ret) { -DRM_ERROR ("DP_PLL_LOCK polling failed (%d)\n" , ret); + *last_err_str ="DP_PLL_LOCK polling failed" ; goto exit; }
@@ -556,9 +592,9 @@ static int ti_sn_link_training(struct ti_sn_bridge *pdata) val ==ML_TX_NORMAL_MODE ,1000 , 500 * 1000);if (ret) { -DRM_ERROR ("Training complete polling failed (%d)\n" , ret); + *last_err_str ="Training complete polling failed" ; }else if (val ==ML_TX_MAIN_LINK_OFF ) { -DRM_ERROR ("Link training failed, link is off\n" ); + *last_err_str ="Link training failed, link is off" ; ret = -EIO ; }
@@ -573,8 +609,11 @@ static int ti_sn_link_training(struct ti_sn_bridge *pdata)static void ti_sn_bridge_enable (struct drm_bridge *bridge) {struct ti_sn_bridge *pdata =bridge_to_ti_sn_bridge (bridge); +const char *last_err_str ="No supported DP rate" ; +int dp_rate_idx; +int max_dp_rate_idx;unsigned int val; -int ret; +int ret = -EINVAL ;/* * Run with the maximum number of lanes that the DP sink supports.
@@ -616,9 +655,19 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge)regmap_update_bits (pdata->regmap,SN_SSC_CONFIG_REG ,DP_NUM_LANES_MASK , val); - ret =ti_sn_link_training (pdata); -if (ret) +/* Train until we run out of rates */ + max_dp_rate_idx =ti_sn_bridge_get_max_dp_rate_idx (pdata); +for (dp_rate_idx =ti_sn_bridge_calc_min_dp_rate_idx (pdata); + dp_rate_idx <= max_dp_rate_idx; + dp_rate_idx++) { + ret =ti_sn_link_training (pdata, dp_rate_idx, &last_err_str); +if (!ret) +break ; + } +if (ret) { +DRM_DEV_ERROR (pdata->dev,"%s (%d)\n" , last_err_str, ret);return ; + }/* config video parameters */ ti_sn_bridge_set_video_timings (pdata);
Signature · 1 line
2.24.1.735.g03f4e72817-goog
Re: [PATCH v3 8/9] drm/bridge: ti-sn65dsi86: Train at faster rates if slower ones fail
Quoted 6 lines · Douglas Anderson
If we fail training at a lower DP link rate let's now keep trying until we run out of rates to try. Basically the algorithm here is to start at the link rate that is the theoretical minimum and then slowly bump up until we run out of rates or hit the max rate of the sink. We query the sink using a DPCD read.
Quoted 8 lines
This is, in fact, important in practice. Specifically at least one panel hooked up to the bridge (AUO B116XAK01) had a theoretical min rate more than 1.62 GHz (if run at 24 bpp) and fails to train at the next rate (2.16 GHz). It would train at 2.7 GHz, though.
Signed-off-by Douglas Anderson <[email protected]>Tested-by Rob Clark <[email protected]>Reviewed-by Rob Clark <[email protected]>
Quoted 144 lines
---
Changes in v3: None
Changes in v2:
- Squash in maybe-uninitialized fix from Rob Clark.drivers/gpu/drm/bridge/ti-sn65dsi86.c | 71 ++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 11 deletions(-)drivers/gpu/drm/bridge/ti-sn65dsi86.c +60
-11@@ -454,7 +454,7 @@ static const unsigned int ti_sn_bridge_dp_rate_lut[] = { 0, 1620, 2160, 2430, 2700, 3240, 4320, 5400 }; -static void ti_sn_bridge_set_dp_rate (struct ti_sn_bridge *pdata) +static int ti_sn_bridge_calc_min_dp_rate_idx (struct ti_sn_bridge *pdata) {unsigned int bit_rate_khz, dp_rate_mhz;unsigned int i;@@ -472,8 +472,42 @@ static void ti_sn_bridge_set_dp_rate(struct ti_sn_bridge *pdata)if (ti_sn_bridge_dp_rate_lut[i] > dp_rate_mhz)break ; -regmap_update_bits (pdata->regmap,SN_DATARATE_CONFIG_REG , -DP_DATARATE_MASK ,DP_DATARATE (i)); +return i; +} + +static int ti_sn_bridge_get_max_dp_rate_idx (struct ti_sn_bridge *pdata) +{ +u8 data; +int ret; + + ret =drm_dp_dpcd_readb (&pdata->aux,DP_MAX_LINK_RATE , &data); +if (ret !=1 ) { +DRM_DEV_ERROR (pdata->dev, +"Can't read max rate (%d); assuming 5.4 GHz\n" , + ret); +return ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; + } + +/* +* Return an index into ti_sn_bridge_dp_rate_lut. Just hardcode +* these indicies since it's not like the register spec is ever going +* to change and a loop would just be more complicated. Apparently +* the DP sink can only return these few rates as supported even +* though the bridge allows some rates in between. +*/ +switch (data) { +case DP_LINK_BW_1_62 : +return 1 ; +case DP_LINK_BW_2_7 : +return 4 ; +case DP_LINK_BW_5_4 : +return 7 ; + } + +DRM_DEV_ERROR (pdata->dev, +"Unexpected max data rate (%#x); assuming 5.4 GHz\n" , + (int )data); +return ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; }static void ti_sn_bridge_set_video_timings (struct ti_sn_bridge *pdata)@@ -530,13 +564,15 @@ static unsigned int ti_sn_get_max_lanes(struct ti_sn_bridge *pdata)return data &DP_LANE_COUNT_MASK ; } -static int ti_sn_link_training (struct ti_sn_bridge *pdata) +static int ti_sn_link_training (struct ti_sn_bridge *pdata,int dp_rate_idx, +const char **last_err_str) {unsigned int val;int ret;/* set dp clk frequency value */ -ti_sn_bridge_set_dp_rate (pdata); +regmap_update_bits (pdata->regmap,SN_DATARATE_CONFIG_REG , +DP_DATARATE_MASK ,DP_DATARATE (dp_rate_idx));/* enable DP PLL */ regmap_write (pdata->regmap,SN_PLL_ENABLE_REG ,1 );@@ -545,7 +581,7 @@ static int ti_sn_link_training(struct ti_sn_bridge *pdata) val &DPPLL_SRC_DP_PLL_LOCK ,1000 , 50 * 1000);if (ret) { -DRM_ERROR ("DP_PLL_LOCK polling failed (%d)\n" , ret); + *last_err_str ="DP_PLL_LOCK polling failed" ; goto exit; }@@ -556,9 +592,9 @@ static int ti_sn_link_training(struct ti_sn_bridge *pdata) val ==ML_TX_NORMAL_MODE ,1000 , 500 * 1000);if (ret) { -DRM_ERROR ("Training complete polling failed (%d)\n" , ret); + *last_err_str ="Training complete polling failed" ; }else if (val ==ML_TX_MAIN_LINK_OFF ) { -DRM_ERROR ("Link training failed, link is off\n" ); + *last_err_str ="Link training failed, link is off" ; ret = -EIO ; }@@ -573,8 +609,11 @@ static int ti_sn_link_training(struct ti_sn_bridge *pdata)static void ti_sn_bridge_enable (struct drm_bridge *bridge) {struct ti_sn_bridge *pdata =bridge_to_ti_sn_bridge (bridge); +const char *last_err_str ="No supported DP rate" ; +int dp_rate_idx; +int max_dp_rate_idx;unsigned int val; -int ret; +int ret = -EINVAL ;/* * Run with the maximum number of lanes that the DP sink supports. @@ -616,9 +655,19 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge)regmap_update_bits (pdata->regmap,SN_SSC_CONFIG_REG ,DP_NUM_LANES_MASK , val); - ret =ti_sn_link_training (pdata); -if (ret) +/* Train until we run out of rates */ + max_dp_rate_idx =ti_sn_bridge_get_max_dp_rate_idx (pdata); +for (dp_rate_idx =ti_sn_bridge_calc_min_dp_rate_idx (pdata); + dp_rate_idx <= max_dp_rate_idx; + dp_rate_idx++) { + ret =ti_sn_link_training (pdata, dp_rate_idx, &last_err_str); +if (!ret) +break ; + } +if (ret) { +DRM_DEV_ERROR (pdata->dev,"%s (%d)\n" , last_err_str, ret);return ; + }/* config video parameters */ ti_sn_bridge_set_video_timings (pdata);Signature · 1 line
2.24.1.735.g03f4e72817-goog
Douglas Anderson
reviewerPATCH v3 9/9 drm/bridge: ti-sn65dsi86: Avoid invalid rates
In reply to Douglas AndersonBased on work by Bjorn Andersson <[email protected]>, Jeffrey Hugo <[email protected]>, and
Rob Clark <[email protected]>.
Let's read the SUPPORTED_LINK_RATES and/or MAX_LINK_RATE (depending on the eDP version of the sink) to figure out what eDP rates are supported and pick the ideal one.
NOTE: I have only personally tested this code on eDP panels that are 1.3 or older. Code reading SUPPORTED_LINK_RATES for DP 1.4+ was tested by hacking the code to pretend that a table was there.
---
Changes in v3:
- Init rate_valid table, don't rely on stack being 0 (oops).
- Rename rate_times_200khz to rate_per_200khz.
- Loop over the ti_sn_bridge_dp_rate_lut table, making code smaller.
- Use 'true' instead of 1 for bools.
- Added note to commit message noting DP 1.4+ isn't well tested.
Changes in v2:
- Patch ("Avoid invalid rates") replaces ("Skip non-standard DP rates")
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 100 +++++++++++++++++++------- 1 file changed, 75 insertions(+), 25 deletions(-)
drivers/gpu/drm/bridge/ti-sn65dsi86.c +75 -25
@@ -475,39 +475,85 @@ static int ti_sn_bridge_calc_min_dp_rate_idx(struct ti_sn_bridge *pdata)return i; } -static int ti_sn_bridge_get_max_dp_rate_idx (struct ti_sn_bridge *pdata) +static void ti_sn_bridge_read_valid_rates (struct ti_sn_bridge *pdata, +bool rate_valid[]) { -u8 data; +unsigned int rate_per_200khz; +unsigned int rate_mhz; +u8 dpcd_val;int ret; +int i, j; + + ret =drm_dp_dpcd_readb (&pdata->aux,DP_EDP_DPCD_REV , &dpcd_val); +if (ret !=1 ) { +DRM_DEV_ERROR (pdata->dev, +"Can't read eDP rev (%d), assuming 1.1\n" , ret); + dpcd_val =DP_EDP_11 ; + } + +if (dpcd_val >=DP_EDP_14 ) { +/* eDP 1.4 devices must provide a custom table */ +__le16 sink_rates[DP_MAX_SUPPORTED_RATES ]; + + ret =drm_dp_dpcd_read (&pdata->aux,DP_SUPPORTED_LINK_RATES , + sink_rates,sizeof (sink_rates)); + +if (ret !=sizeof (sink_rates)) { +DRM_DEV_ERROR (pdata->dev, +"Can't read supported rate table (%d)\n" , ret); + +/* By zeroing we'll fall back to DP_MAX_LINK_RATE. */ +memset (sink_rates,0 ,sizeof (sink_rates)); + } + +for (i =0 ; i <ARRAY_SIZE (sink_rates); i++) { + rate_per_200khz =le16_to_cpu (sink_rates[i]); + +if (!rate_per_200khz) +break ; + + rate_mhz = rate_per_200khz *200 /1000 ; +for (j =0 ; + j <ARRAY_SIZE (ti_sn_bridge_dp_rate_lut); + j++) { +if (ti_sn_bridge_dp_rate_lut[j] == rate_mhz) + rate_valid[j] = true; + } + } + +for (i =0 ; i <ARRAY_SIZE (ti_sn_bridge_dp_rate_lut); i++) { +if (rate_valid[i]) +return ; + } +DRM_DEV_ERROR (pdata->dev, +"No matching eDP rates in table; falling back\n" ); + } - ret =drm_dp_dpcd_readb (&pdata->aux,DP_MAX_LINK_RATE , &data); +/* On older versions best we can do is use DP_MAX_LINK_RATE */ + ret =drm_dp_dpcd_readb (&pdata->aux,DP_MAX_LINK_RATE , &dpcd_val);if (ret !=1 ) {DRM_DEV_ERROR (pdata->dev,"Can't read max rate (%d); assuming 5.4 GHz\n" , ret); -return ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; + dpcd_val =DP_LINK_BW_5_4 ; } -/* -* Return an index into ti_sn_bridge_dp_rate_lut. Just hardcode -* these indicies since it's not like the register spec is ever going -* to change and a loop would just be more complicated. Apparently -* the DP sink can only return these few rates as supported even -* though the bridge allows some rates in between. -*/ -switch (data) { -case DP_LINK_BW_1_62 : -return 1 ; -case DP_LINK_BW_2_7 : -return 4 ; +switch (dpcd_val) { +default : +DRM_DEV_ERROR (pdata->dev, +"Unexpected max rate (%#x); assuming 5.4 GHz\n" , + (int )dpcd_val); +/* fall through */ case DP_LINK_BW_5_4 : -return 7 ; + rate_valid[7 ] =1 ; +/* fall through */ +case DP_LINK_BW_2_7 : + rate_valid[4 ] =1 ; +/* fall through */ +case DP_LINK_BW_1_62 : + rate_valid[1 ] =1 ; +break ; } - -DRM_DEV_ERROR (pdata->dev, -"Unexpected max data rate (%#x); assuming 5.4 GHz\n" , - (int )data); -return ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; }static void ti_sn_bridge_set_video_timings (struct ti_sn_bridge *pdata)
@@ -609,9 +655,9 @@ static int ti_sn_link_training(struct ti_sn_bridge *pdata, int dp_rate_idx,static void ti_sn_bridge_enable (struct drm_bridge *bridge) {struct ti_sn_bridge *pdata =bridge_to_ti_sn_bridge (bridge); +bool rate_valid[ARRAY_SIZE (ti_sn_bridge_dp_rate_lut)] = { };const char *last_err_str ="No supported DP rate" ;int dp_rate_idx; -int max_dp_rate_idx;unsigned int val;int ret = -EINVAL ;
@@ -655,11 +701,15 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge)regmap_update_bits (pdata->regmap,SN_SSC_CONFIG_REG ,DP_NUM_LANES_MASK , val); +ti_sn_bridge_read_valid_rates (pdata, rate_valid); +/* Train until we run out of rates */ - max_dp_rate_idx =ti_sn_bridge_get_max_dp_rate_idx (pdata);for (dp_rate_idx =ti_sn_bridge_calc_min_dp_rate_idx (pdata); - dp_rate_idx <= max_dp_rate_idx; + dp_rate_idx <ARRAY_SIZE (ti_sn_bridge_dp_rate_lut); dp_rate_idx++) { +if (!rate_valid[dp_rate_idx]) +continue ; + ret =ti_sn_link_training (pdata, dp_rate_idx, &last_err_str);if (!ret)break ;
Signature · 1 line
2.24.1.735.g03f4e72817-goog
Re: [PATCH v3 9/9] drm/bridge: ti-sn65dsi86: Avoid invalid rates
Quoted 8 lines · Douglas Anderson
Based on work by Bjorn Andersson <[email protected]>, Jeffrey Hugo <[email protected]>, and
Rob Clark <[email protected]>.Let's read the
SUPPORTED_LINK_RATESand/orMAX_LINK_RATE(depending on the eDP version of the sink) to figure out what eDP rates are supported and pick the ideal one.
Quoted 5 lines
NOTE: I have only personally tested this code on eDP panels that are 1.3 or older. Code reading
SUPPORTED_LINK_RATESfor DP 1.4+ was tested by hacking the code to pretend that a table was there.Signed-off-by Douglas Anderson <[email protected]>
Quoted 159 lines
---
Changes in v3:
- Initrate_validtable, don't rely on stack being 0 (oops).
- Renamerate_times_200khztorate_per_200khz.
- Loop over theti_sn_bridge_dp_rate_luttable, making code smaller.
- Use 'true' instead of 1 for bools.
- Added note to commit message noting DP 1.4+ isn't well tested.Changes in v2:
- Patch ("Avoid invalid rates") replaces ("Skip non-standard DP rates")drivers/gpu/drm/bridge/ti-sn65dsi86.c | 100 +++++++++++++++++++------- 1 file changed, 75 insertions(+), 25 deletions(-)drivers/gpu/drm/bridge/ti-sn65dsi86.c +75
-25@@ -475,39 +475,85 @@ static int ti_sn_bridge_calc_min_dp_rate_idx(struct ti_sn_bridge *pdata)return i; } -static int ti_sn_bridge_get_max_dp_rate_idx (struct ti_sn_bridge *pdata) +static void ti_sn_bridge_read_valid_rates (struct ti_sn_bridge *pdata, +bool rate_valid[]) { -u8 data; +unsigned int rate_per_200khz; +unsigned int rate_mhz; +u8 dpcd_val;int ret; +int i, j; + + ret =drm_dp_dpcd_readb (&pdata->aux,DP_EDP_DPCD_REV , &dpcd_val); +if (ret !=1 ) { +DRM_DEV_ERROR (pdata->dev, +"Can't read eDP rev (%d), assuming 1.1\n" , ret); + dpcd_val =DP_EDP_11 ; + } + +if (dpcd_val >=DP_EDP_14 ) { +/* eDP 1.4 devices must provide a custom table */ +__le16 sink_rates[DP_MAX_SUPPORTED_RATES ]; + + ret =drm_dp_dpcd_read (&pdata->aux,DP_SUPPORTED_LINK_RATES , + sink_rates,sizeof (sink_rates)); + +if (ret !=sizeof (sink_rates)) { +DRM_DEV_ERROR (pdata->dev, +"Can't read supported rate table (%d)\n" , ret); + +/* By zeroing we'll fall back to DP_MAX_LINK_RATE. */ +memset (sink_rates,0 ,sizeof (sink_rates)); + } + +for (i =0 ; i <ARRAY_SIZE (sink_rates); i++) { + rate_per_200khz =le16_to_cpu (sink_rates[i]); + +if (!rate_per_200khz) +break ; + + rate_mhz = rate_per_200khz *200 /1000 ; +for (j =0 ; + j <ARRAY_SIZE (ti_sn_bridge_dp_rate_lut); + j++) { +if (ti_sn_bridge_dp_rate_lut[j] == rate_mhz) + rate_valid[j] = true; + } + } + +for (i =0 ; i <ARRAY_SIZE (ti_sn_bridge_dp_rate_lut); i++) { +if (rate_valid[i]) +return ; + } +DRM_DEV_ERROR (pdata->dev, +"No matching eDP rates in table; falling back\n" ); + } - ret =drm_dp_dpcd_readb (&pdata->aux,DP_MAX_LINK_RATE , &data); +/* On older versions best we can do is use DP_MAX_LINK_RATE */ + ret =drm_dp_dpcd_readb (&pdata->aux,DP_MAX_LINK_RATE , &dpcd_val);if (ret !=1 ) {DRM_DEV_ERROR (pdata->dev,"Can't read max rate (%d); assuming 5.4 GHz\n" , ret); -return ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; + dpcd_val =DP_LINK_BW_5_4 ; } -/* -* Return an index into ti_sn_bridge_dp_rate_lut. Just hardcode -* these indicies since it's not like the register spec is ever going -* to change and a loop would just be more complicated. Apparently -* the DP sink can only return these few rates as supported even -* though the bridge allows some rates in between. -*/ -switch (data) { -case DP_LINK_BW_1_62 : -return 1 ; -case DP_LINK_BW_2_7 : -return 4 ; +switch (dpcd_val) { +default : +DRM_DEV_ERROR (pdata->dev, +"Unexpected max rate (%#x); assuming 5.4 GHz\n" , + (int )dpcd_val); +/* fall through */ case DP_LINK_BW_5_4 : -return 7 ; + rate_valid[7 ] =1 ; +/* fall through */ +case DP_LINK_BW_2_7 : + rate_valid[4 ] =1 ; +/* fall through */ +case DP_LINK_BW_1_62 : + rate_valid[1 ] =1 ; +break ; } - -DRM_DEV_ERROR (pdata->dev, -"Unexpected max data rate (%#x); assuming 5.4 GHz\n" , - (int )data); -return ARRAY_SIZE (ti_sn_bridge_dp_rate_lut) -1 ; }static void ti_sn_bridge_set_video_timings (struct ti_sn_bridge *pdata)@@ -609,9 +655,9 @@ static int ti_sn_link_training(struct ti_sn_bridge *pdata, int dp_rate_idx,static void ti_sn_bridge_enable (struct drm_bridge *bridge) {struct ti_sn_bridge *pdata =bridge_to_ti_sn_bridge (bridge); +bool rate_valid[ARRAY_SIZE (ti_sn_bridge_dp_rate_lut)] = { };const char *last_err_str ="No supported DP rate" ;int dp_rate_idx; -int max_dp_rate_idx;unsigned int val;int ret = -EINVAL ;@@ -655,11 +701,15 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge)regmap_update_bits (pdata->regmap,SN_SSC_CONFIG_REG ,DP_NUM_LANES_MASK , val); +ti_sn_bridge_read_valid_rates (pdata, rate_valid); +/* Train until we run out of rates */ - max_dp_rate_idx =ti_sn_bridge_get_max_dp_rate_idx (pdata);for (dp_rate_idx =ti_sn_bridge_calc_min_dp_rate_idx (pdata); - dp_rate_idx <= max_dp_rate_idx; + dp_rate_idx <ARRAY_SIZE (ti_sn_bridge_dp_rate_lut); dp_rate_idx++) { +if (!rate_valid[dp_rate_idx]) +continue ; + ret =ti_sn_link_training (pdata, dp_rate_idx, &last_err_str);if (!ret)break ;Signature · 1 line
2.24.1.735.g03f4e72817-goog
Doug Anderson
reviewerHi,
Quoted 58 lines · Douglas Anderson
This series contains a pile of patches that was created to support hooking up the AUO B116XAK01 panel to the eDP side of the bridge. In general it should be useful for hooking up a wider variety of DP panels to the bridge, especially those with lower resolution and lower bits per pixel.
The overall result of this series:
* Allows panels with fewer than 4 DP lanes hooked up to work.
* Optimizes the link rate for panels with 6 bpp.
* Supports trying more than one link rate when training if the main link rate didn't work.
* Avoids invalid link rates.It's not expected that this series will break any existing users but testing is always good.
To support the AUO B116XAK01, we could actually stop at the ("Use 18-bit DP if we can") patch since that causes the panel to run at a link rate of 1.62 which works. The patches to try more than one link rate were all developed prior to realizing that I could just use 18-bit mode and were validated with that patch reverted.
These patches were tested on sdm845-cheza atop mainline as of 2019-12-13 and also on another board (the one with AUO B116XAK01) atop a downstream kernel tree.
This patch series doesn't do anything to optimize the MIPI link and only focuses on the DP link. For instance, it's left as an exercise to the reader to see if we can use the 666-packed mode on the MIPI link and save some power (because we could lower the clock rate).
I am nowhere near a display expert and my knowledge of DP and MIPI is pretty much zero. If something about this patch series smells wrong, it probably is. Please let know and I'll try to fix it.
Changes in v3:
- Initrate_validtable, don't rely on stack being 0 (oops).
- Renamerate_times_200khztorate_per_200khz.
- Loop over theti_sn_bridge_dp_rate_luttable, making code smaller.
- Use 'true' instead of 1 for bools.
- Added note to commit message noting DP 1.4+ isn't well tested.Changes in v2:
- Squash in maybe-uninitialized fix from Rob Clark.
- Patch ("Avoid invalid rates") replaces ("Skip non-standard DP rates")Douglas Anderson (9):
drm/bridge: ti-sn65dsi86: Split the setting of the dp and dsi rates drm/bridge: ti-sn65dsi86: zero is never greater than an unsigned int drm/bridge: ti-sn65dsi86: Don't use MIPI variables for DP link drm/bridge: ti-sn65dsi86: Config number of DP lanes Mo' Betta drm/bridge: ti-sn65dsi86: Read num lanes from the DP sink drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can drm/bridge: ti-sn65dsi86: Group DP link training bits in a function drm/bridge: ti-sn65dsi86: Train at faster rates if slower ones fail drm/bridge: ti-sn65dsi86: Avoid invalid rates
Quoted 2 lines
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 259 +++++++++++++++++++++----- 1 file changed, 216 insertions(+), 43 deletions(-)
Happy New Year everyone!
I know people probably were busy during the last few weeks (I know I was offline) and are now probably swamped with full Inboxes. ...but I'd be super interested if folks had any comments on this series. Notably it'd be peachy-keen if Bjorn / Jeffrey had a chance to see if this is happy for any users of sn65dsi86 that they were aware of.
Thanks much! :-)
-Doug
Quoted 26 lines · Douglas Anderson
This series contains a pile of patches that was created to support hooking up the AUO B116XAK01 panel to the eDP side of the bridge. In general it should be useful for hooking up a wider variety of DP panels to the bridge, especially those with lower resolution and lower bits per pixel.
The overall result of this series:
* Allows panels with fewer than 4 DP lanes hooked up to work.
* Optimizes the link rate for panels with 6 bpp.
* Supports trying more than one link rate when training if the main link rate didn't work.
* Avoids invalid link rates.It's not expected that this series will break any existing users but testing is always good.
To support the AUO B116XAK01, we could actually stop at the ("Use 18-bit DP if we can") patch since that causes the panel to run at a link rate of 1.62 which works. The patches to try more than one link rate were all developed prior to realizing that I could just use 18-bit mode and were validated with that patch reverted.
These patches were tested on sdm845-cheza atop mainline as of 2019-12-13 and also on another board (the one with AUO B116XAK01) atop a downstream kernel tree.
Quoted 9 lines
This patch series doesn't do anything to optimize the MIPI link and only focuses on the DP link. For instance, it's left as an exercise to the reader to see if we can use the 666-packed mode on the MIPI link and save some power (because we could lower the clock rate).
I am nowhere near a display expert and my knowledge of DP and MIPI is pretty much zero. If something about this patch series smells wrong, it probably is. Please let know and I'll try to fix it.
Thanks for the patches Doug, this fixes the rate and DP lane-count issues I'm seeing on my Lenovo Yoga C630 with the current implementation.
Regards,
Bjorn
Quoted 28 lines
Changes in v3:
- Initrate_validtable, don't rely on stack being 0 (oops).
- Renamerate_times_200khztorate_per_200khz.
- Loop over theti_sn_bridge_dp_rate_luttable, making code smaller.
- Use 'true' instead of 1 for bools.
- Added note to commit message noting DP 1.4+ isn't well tested.Changes in v2:
- Squash in maybe-uninitialized fix from Rob Clark.
- Patch ("Avoid invalid rates") replaces ("Skip non-standard DP rates")Douglas Anderson (9):
drm/bridge: ti-sn65dsi86: Split the setting of the dp and dsi rates drm/bridge: ti-sn65dsi86: zero is never greater than an unsigned int drm/bridge: ti-sn65dsi86: Don't use MIPI variables for DP link drm/bridge: ti-sn65dsi86: Config number of DP lanes Mo' Betta drm/bridge: ti-sn65dsi86: Read num lanes from the DP sink drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can drm/bridge: ti-sn65dsi86: Group DP link training bits in a function drm/bridge: ti-sn65dsi86: Train at faster rates if slower ones fail drm/bridge: ti-sn65dsi86: Avoid invalid ratesdrivers/gpu/drm/bridge/ti-sn65dsi86.c | 259 +++++++++++++++++++++----- 1 file changed, 216 insertions(+), 43 deletions(-)Signature · 1 line
2.24.1.735.g03f4e72817-goog
Neil Armstrong
AppliedQuoted 57 lines · Douglas Anderson
This series contains a pile of patches that was created to support hooking up the AUO B116XAK01 panel to the eDP side of the bridge. In general it should be useful for hooking up a wider variety of DP panels to the bridge, especially those with lower resolution and lower bits per pixel.
The overall result of this series:
* Allows panels with fewer than 4 DP lanes hooked up to work.
* Optimizes the link rate for panels with 6 bpp.
* Supports trying more than one link rate when training if the main link rate didn't work.
* Avoids invalid link rates.It's not expected that this series will break any existing users but testing is always good.
To support the AUO B116XAK01, we could actually stop at the ("Use 18-bit DP if we can") patch since that causes the panel to run at a link rate of 1.62 which works. The patches to try more than one link rate were all developed prior to realizing that I could just use 18-bit mode and were validated with that patch reverted.
These patches were tested on sdm845-cheza atop mainline as of 2019-12-13 and also on another board (the one with AUO B116XAK01) atop a downstream kernel tree.
This patch series doesn't do anything to optimize the MIPI link and only focuses on the DP link. For instance, it's left as an exercise to the reader to see if we can use the 666-packed mode on the MIPI link and save some power (because we could lower the clock rate).
I am nowhere near a display expert and my knowledge of DP and MIPI is pretty much zero. If something about this patch series smells wrong, it probably is. Please let know and I'll try to fix it.
Changes in v3:
- Initrate_validtable, don't rely on stack being 0 (oops).
- Renamerate_times_200khztorate_per_200khz.
- Loop over theti_sn_bridge_dp_rate_luttable, making code smaller.
- Use 'true' instead of 1 for bools.
- Added note to commit message noting DP 1.4+ isn't well tested.Changes in v2:
- Squash in maybe-uninitialized fix from Rob Clark.
- Patch ("Avoid invalid rates") replaces ("Skip non-standard DP rates")Douglas Anderson (9):
drm/bridge: ti-sn65dsi86: Split the setting of the dp and dsi rates drm/bridge: ti-sn65dsi86: zero is never greater than an unsigned int drm/bridge: ti-sn65dsi86: Don't use MIPI variables for DP link drm/bridge: ti-sn65dsi86: Config number of DP lanes Mo' Betta drm/bridge: ti-sn65dsi86: Read num lanes from the DP sink drm/bridge: ti-sn65dsi86: Use 18-bit DP if we can drm/bridge: ti-sn65dsi86: Group DP link training bits in a function drm/bridge: ti-sn65dsi86: Train at faster rates if slower ones fail drm/bridge: ti-sn65dsi86: Avoid invalid rates
Quoted 3 lines
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 259 +++++++++++++++++++++----- 1 file changed, 216 insertions(+), 43 deletions(-)
Applied to drm-misc-next