dt-bindings: display: bridge: tc358867: Document default DP preemphasis
Subsystems (4)
PATCH v3 1/2 dt-bindings: display: bridge: tc358867: Document default DP preemphasis
Document default DP port preemphasis configurable via new DT property "toshiba,pre-emphasis". This is useful in case the DP link properties are known and starting link training from preemphasis setting of 0 dB is not useful. The preemphasis can be set separately for both DP lanes in range 0=0dB, 1=3.5dB, 2=6dB .
This is an endpoint property, not a port property, because the TC9595 datasheet does mention that the DP might operate in some sort of split mode, where each DP lane is used to feed one display, so in that case there might be two endpoints.
---
Cc: Andrzej Hajda <[email protected]>
Cc: Conor Dooley <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Jernej Skrabec <[email protected]>
Cc: Jonas Karlman <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Maarten Lankhorst <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Robert Foss <[email protected]>
Cc: Thomas Zimmermann <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
V2: - Fix the type to u8 array
- Fix the enum items to match what they represent
V3: - Update commit message, expand on this being an endpoint property
--- .../display/bridge/toshiba,tc358767.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.yaml +18 -0
@@ -98,6 +98,24 @@ properties: reference to a valid eDP panel input endpoint node. This port is optional, treated as DP panel if not defined + properties: + endpoint: + $ref: /schemas/media/video-interfaces.yaml# + unevaluatedProperties: false + + properties: + toshiba,pre-emphasis: + description: + Display port output Pre-Emphasis settings for both DP lanes. + $ref: /schemas/types.yaml#/definitions/uint8-array + minItems: 2 + maxItems: 2 + items: + enum: + - 0 # No pre-emphasis + - 1 # 3.5dB pre-emphasis + - 2 # 6dB pre-emphasis + oneOf: - required: - port@0
Signature · 1 line
2.43.0
PATCH v3 2/2 drm/bridge: tc358767: Add configurable default preemphasis
Make the default DP port preemphasis configurable via new DT property "toshiba,pre-emphasis". This is useful in case the DP link properties are known and starting link training from preemphasis setting of 0 dB is not useful. The preemphasis can be set separately for both DP lanes in range 0=0dB, 1=3.5dB, 2=6dB .
---
Cc: Andrzej Hajda <[email protected]>
Cc: Conor Dooley <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Jernej Skrabec <[email protected]>
Cc: Jonas Karlman <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Maarten Lankhorst <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Robert Foss <[email protected]>
Cc: Thomas Zimmermann <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
V2: - Parse toshiba,pre-emphasis property out of an endpoint of port 2 (the DP port)
V3: - No change
--- drivers/gpu/drm/bridge/tc358767.c | 45 ++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 7 deletions(-)
drivers/gpu/drm/bridge/tc358767.c +38 -7
@@ -241,6 +241,10 @@/* Link Training */ #define DP0_SRCCTRL 0x06a0 +#define DP0_SRCCTRL_PRE1 GENMASK(29, 28) +#define DP0_SRCCTRL_SWG1 GENMASK(25, 24) +#define DP0_SRCCTRL_PRE0 GENMASK(21, 20) +#define DP0_SRCCTRL_SWG0 GENMASK(17, 16)#define DP0_SRCCTRL_SCRMBLDIS BIT(13)#define DP0_SRCCTRL_EN810B BIT(12)#define DP0_SRCCTRL_NOTP (0 << 8)
@@ -278,6 +282,8 @@#define AUDIFDATA6 0x0720/* DP0 Audio Info Frame Bytes 27 to 24 */ #define DP1_SRCCTRL 0x07a0/* DP1 Control Register */ +#define DP1_SRCCTRL_PRE GENMASK(21, 20) +#define DP1_SRCCTRL_SWG GENMASK(17, 16)/* PHY */ #define DP_PHY_CTRL 0x0800
@@ -369,6 +375,7 @@ struct tc_data {u32 rev;u8 assr; +u8 pre_emphasis[2 ];struct gpio_desc *sd_gpio;struct gpio_desc *reset_gpio;
@@ -1090,13 +1097,17 @@ static int tc_main_link_enable(struct tc_data *tc)return ret; } - ret =regmap_write (tc->regmap,DP0_SRCCTRL ,tc_srcctrl (tc)); + ret =regmap_write (tc->regmap,DP0_SRCCTRL , +tc_srcctrl (tc) | +FIELD_PREP (DP0_SRCCTRL_PRE0 , tc->pre_emphasis[0 ]) | +FIELD_PREP (DP0_SRCCTRL_PRE1 , tc->pre_emphasis[1 ]));if (ret)return ret;/* SSCG and BW27 on DP1 must be set to the same as on DP0 */ ret =regmap_write (tc->regmap,DP1_SRCCTRL , (tc->link.spread ?DP0_SRCCTRL_SSCG :0 ) | - ((tc->link.rate !=162000 ) ?DP0_SRCCTRL_BW27 :0 )); + ((tc->link.rate !=162000 ) ?DP0_SRCCTRL_BW27 :0 ) | +FIELD_PREP (DP1_SRCCTRL_PRE , tc->pre_emphasis[1 ]));if (ret)return ret;
@@ -1188,8 +1199,10 @@ static int tc_main_link_enable(struct tc_data *tc) goto err_dpcd_write;/* Reset voltage-swing & pre-emphasis */ - tmp[0 ] = tmp[1 ] =DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | -DP_TRAIN_PRE_EMPH_LEVEL_0 ; + tmp[0 ] =DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | +FIELD_PREP (DP_TRAIN_PRE_EMPHASIS_MASK , tc->pre_emphasis[0 ]); + tmp[1 ] =DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | +FIELD_PREP (DP_TRAIN_PRE_EMPHASIS_MASK , tc->pre_emphasis[1 ]); ret =drm_dp_dpcd_write (aux,DP_TRAINING_LANE0_SET , tmp,2 );if (ret <0 ) goto err_dpcd_write;
@@ -1213,7 +1226,9 @@ static int tc_main_link_enable(struct tc_data *tc) ret =regmap_write (tc->regmap,DP0_SRCCTRL ,tc_srcctrl (tc) |DP0_SRCCTRL_SCRMBLDIS |DP0_SRCCTRL_AUTOCORRECT | -DP0_SRCCTRL_TP1 ); +DP0_SRCCTRL_TP1 | +FIELD_PREP (DP0_SRCCTRL_PRE0 , tc->pre_emphasis[0 ]) | +FIELD_PREP (DP0_SRCCTRL_PRE1 , tc->pre_emphasis[1 ]));if (ret)return ret;
@@ -1248,7 +1263,9 @@ static int tc_main_link_enable(struct tc_data *tc) ret =regmap_write (tc->regmap,DP0_SRCCTRL ,tc_srcctrl (tc) |DP0_SRCCTRL_SCRMBLDIS |DP0_SRCCTRL_AUTOCORRECT | -DP0_SRCCTRL_TP2 ); +DP0_SRCCTRL_TP2 | +FIELD_PREP (DP0_SRCCTRL_PRE0 , tc->pre_emphasis[0 ]) | +FIELD_PREP (DP0_SRCCTRL_PRE1 , tc->pre_emphasis[1 ]));if (ret)return ret;
@@ -1274,7 +1291,9 @@ static int tc_main_link_enable(struct tc_data *tc)/* Clear Training Pattern, set AutoCorrect Mode = 1 */ ret =regmap_write (tc->regmap,DP0_SRCCTRL ,tc_srcctrl (tc) | -DP0_SRCCTRL_AUTOCORRECT ); +DP0_SRCCTRL_AUTOCORRECT | +FIELD_PREP (DP0_SRCCTRL_PRE0 , tc->pre_emphasis[0 ]) | +FIELD_PREP (DP0_SRCCTRL_PRE1 , tc->pre_emphasis[1 ]));if (ret)return ret;
@@ -2435,6 +2454,18 @@ static int tc_probe_bridge_endpoint(struct tc_data *tc)return -EINVAL ; } mode |=BIT (endpoint.port); +if (endpoint.port !=2 ) +continue ; + +of_property_read_u8_array (node,"toshiba,pre-emphasis" , + tc->pre_emphasis, +ARRAY_SIZE (tc->pre_emphasis)); + +if (tc->pre_emphasis[0 ] <0 || tc->pre_emphasis[0 ] >2 || + tc->pre_emphasis[1 ] <0 || tc->pre_emphasis[1 ] >2 ) { +dev_err (dev,"Incorrect Pre-Emphasis setting, use either 0=0dB 1=3.5dB 2=6dB\n" ); +return -EINVAL ; + } }if (mode == mode_dpi_to_edp || mode == mode_dpi_to_dp) {
Signature · 1 line
2.43.0
Re: [PATCH v3 2/2] drm/bridge: tc358767: Add configurable default preemphasis
Hi Marek,
thanks for patch.
Am Dienstag, 25. Juni 2024, 14:05:15 CEST schrieb Marek Vasut:
Quoted 132 lines
Make the default DP port preemphasis configurable via new DT property "toshiba,pre-emphasis". This is useful in case the DP link properties are known and starting link training from preemphasis setting of 0 dB is not useful. The preemphasis can be set separately for both DP lanes in range 0=0dB, 1=3.5dB, 2=6dB .
Signed-off-by Marek Vasut <[email protected]>---
Cc: Andrzej Hajda <[email protected]>
Cc: Conor Dooley <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Jernej Skrabec <[email protected]>
Cc: Jonas Karlman <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Maarten Lankhorst <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Robert Foss <[email protected]>
Cc: Thomas Zimmermann <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
V2: - Parse toshiba,pre-emphasis property out of an endpoint of port 2 (the DP port)
V3: - No change--- drivers/gpu/drm/bridge/tc358767.c | 45 ++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 7 deletions(-)drivers/gpu/drm/bridge/tc358767.c +26
-7@@ -241,6 +241,10 @@/* Link Training */ #define DP0_SRCCTRL 0x06a0 +#define DP0_SRCCTRL_PRE1 GENMASK(29, 28) +#define DP0_SRCCTRL_SWG1 GENMASK(25, 24) +#define DP0_SRCCTRL_PRE0 GENMASK(21, 20) +#define DP0_SRCCTRL_SWG0 GENMASK(17, 16)#define DP0_SRCCTRL_SCRMBLDIS BIT(13)#define DP0_SRCCTRL_EN810B BIT(12)#define DP0_SRCCTRL_NOTP (0 << 8)@@ -278,6 +282,8 @@#define AUDIFDATA6 0x0720/* DP0 Audio Info Frame Bytes 27 to 24 */ #define DP1_SRCCTRL 0x07a0/* DP1 Control Register */ +#define DP1_SRCCTRL_PRE GENMASK(21, 20) +#define DP1_SRCCTRL_SWG GENMASK(17, 16)/* PHY */ #define DP_PHY_CTRL 0x0800@@ -369,6 +375,7 @@ struct tc_data {u32 rev;u8 assr; +u8 pre_emphasis[2 ];struct gpio_desc *sd_gpio;struct gpio_desc *reset_gpio;@@ -1090,13 +1097,17 @@ static int tc_main_link_enable(struct tc_data *tc)return ret; } - ret =regmap_write (tc->regmap,DP0_SRCCTRL ,tc_srcctrl (tc)); + ret =regmap_write (tc->regmap,DP0_SRCCTRL , +tc_srcctrl (tc) | +FIELD_PREP (DP0_SRCCTRL_PRE0 , tc->pre_emphasis[0 ]) | +FIELD_PREP (DP0_SRCCTRL_PRE1 , tc->pre_emphasis[1 ]));if (ret)return ret;/* SSCG and BW27 on DP1 must be set to the same as on DP0 */ ret =regmap_write (tc->regmap,DP1_SRCCTRL , (tc->link.spread ?DP0_SRCCTRL_SSCG :0 ) | - ((tc->link.rate !=162000 ) ?DP0_SRCCTRL_BW27 :0 )); + ((tc->link.rate !=162000 ) ?DP0_SRCCTRL_BW27 :0 ) | +FIELD_PREP (DP1_SRCCTRL_PRE , tc->pre_emphasis[1 ]));if (ret)return ret;@@ -1188,8 +1199,10 @@ static int tc_main_link_enable(struct tc_data *tc) goto err_dpcd_write;/* Reset voltage-swing & pre-emphasis */ - tmp[0 ] = tmp[1 ] =DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | -DP_TRAIN_PRE_EMPH_LEVEL_0 ; + tmp[0 ] =DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | +FIELD_PREP (DP_TRAIN_PRE_EMPHASIS_MASK , tc->pre_emphasis[0 ]); + tmp[1 ] =DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | +FIELD_PREP (DP_TRAIN_PRE_EMPHASIS_MASK , tc->pre_emphasis[1 ]); ret =drm_dp_dpcd_write (aux,DP_TRAINING_LANE0_SET , tmp,2 );if (ret <0 ) goto err_dpcd_write;@@ -1213,7 +1226,9 @@ static int tc_main_link_enable(struct tc_data *tc) ret =regmap_write (tc->regmap,DP0_SRCCTRL ,tc_srcctrl (tc) |DP0_SRCCTRL_SCRMBLDIS |DP0_SRCCTRL_AUTOCORRECT | -DP0_SRCCTRL_TP1 ); +DP0_SRCCTRL_TP1 | +FIELD_PREP (DP0_SRCCTRL_PRE0 , tc->pre_emphasis[0 ]) | +FIELD_PREP (DP0_SRCCTRL_PRE1 , tc->pre_emphasis[1 ]));if (ret)return ret;@@ -1248,7 +1263,9 @@ static int tc_main_link_enable(struct tc_data *tc) ret =regmap_write (tc->regmap,DP0_SRCCTRL ,tc_srcctrl (tc) |DP0_SRCCTRL_SCRMBLDIS |DP0_SRCCTRL_AUTOCORRECT | -DP0_SRCCTRL_TP2 ); +DP0_SRCCTRL_TP2 | +FIELD_PREP (DP0_SRCCTRL_PRE0 , tc->pre_emphasis[0 ]) | +FIELD_PREP (DP0_SRCCTRL_PRE1 , tc->pre_emphasis[1 ]));if (ret)return ret;@@ -1274,7 +1291,9 @@ static int tc_main_link_enable(struct tc_data *tc)/* Clear Training Pattern, set AutoCorrect Mode = 1 */ ret =regmap_write (tc->regmap,DP0_SRCCTRL ,tc_srcctrl (tc) | -DP0_SRCCTRL_AUTOCORRECT ); +DP0_SRCCTRL_AUTOCORRECT | +FIELD_PREP (DP0_SRCCTRL_PRE0 , tc->pre_emphasis[0 ]) | +FIELD_PREP (DP0_SRCCTRL_PRE1 , tc->pre_emphasis[1 ]));if (ret)return ret;
drivers/gpu/drm/bridge/tc358767.c static int tc_probe_bridge_endpoint(struct tc_data *tc) · line 2459
Quoted 6 lines
drivers/gpu/drm/bridge/tc358767.c +3
-0@@ -2435,6 +2454,18 @@ static int tc_probe_bridge_endpoint(struct tc_data *tc)return -EINVAL ; } mode |=BIT (endpoint.port); +if (endpoint.port !=2 ) +continue ; +
Mh, I know currently there are not other port-specific properties. But maybe it's easier to read if 'if (endpoint.port == 2) {' is used.
But either way, this looks good.
Quoted 13 lines
drivers/gpu/drm/bridge/tc358767.c +9
-0+of_property_read_u8_array (node,"toshiba,pre-emphasis" , + tc->pre_emphasis, +ARRAY_SIZE (tc->pre_emphasis)); + +if (tc->pre_emphasis[0 ] <0 || tc->pre_emphasis[0 ] >2 || + tc->pre_emphasis[1 ] <0 || tc->pre_emphasis[1 ] >2 ) { +dev_err (dev,"Incorrect Pre-Emphasis setting, use either 0=0dB 1=3.5dB 2=6dB\n" ); +return -EINVAL ; + } }if (mode == mode_dpi_to_edp || mode == mode_dpi_to_dp) {
Signature · 4 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/
Re: [PATCH v3 2/2] drm/bridge: tc358767: Add configurable default preemphasis
On 6/26/24 9:36 AM, Alexander Stein wrote:
Hi,
sorry for the late reply.
Quoted 10 lines
drivers/gpu/drm/bridge/tc358767.c static int tc_probe_bridge_endpoint(struct tc_data *tc) · line 2459
Quoted 7 lines
drivers/gpu/drm/bridge/tc358767.c +3
-0@@ -2435,6 +2454,18 @@ static int tc_probe_bridge_endpoint(struct tc_data *tc)return -EINVAL ; } mode |=BIT (endpoint.port); +if (endpoint.port !=2 ) +continue ; +Mh, I know currently there are not other port-specific properties. But maybe it's easier to read if 'if (endpoint.port == 2) {' is used.
Fixed in V4, thanks.
Hi Marek,
Am Dienstag, 25. Juni 2024, 14:05:14 CEST schrieb Marek Vasut:
Quoted 59 lines
Document default DP port preemphasis configurable via new DT property "toshiba,pre-emphasis". This is useful in case the DP link properties are known and starting link training from preemphasis setting of 0 dB is not useful. The preemphasis can be set separately for both DP lanes in range 0=0dB, 1=3.5dB, 2=6dB .
This is an endpoint property, not a port property, because the TC9595 datasheet does mention that the DP might operate in some sort of split mode, where each DP lane is used to feed one display, so in that case there might be two endpoints.
Signed-off-by Marek Vasut <[email protected]>---
Cc: Andrzej Hajda <[email protected]>
Cc: Conor Dooley <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Jernej Skrabec <[email protected]>
Cc: Jonas Karlman <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Maarten Lankhorst <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Robert Foss <[email protected]>
Cc: Thomas Zimmermann <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
V2: - Fix the type to u8 array
- Fix the enum items to match what they represent
V3: - Update commit message, expand on this being an endpoint property--- .../display/bridge/toshiba,tc358767.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.yaml +11
-0@@ -98,6 +98,24 @@ properties: reference to a valid eDP panel input endpoint node. This port is optional, treated as DP panel if not defined + properties: + endpoint: + $ref: /schemas/media/video-interfaces.yaml# + unevaluatedProperties: false + + properties: + toshiba,pre-emphasis: + description: + Display port output Pre-Emphasis settings for both DP lanes. + $ref: /schemas/types.yaml#/definitions/uint8-array + minItems: 2
Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.yaml properties: · line 121
Quoted 10 lines
Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.yaml +7
-0+ maxItems: 2 + items: + enum: + - 0 # No pre-emphasis + - 1 # 3.5dB pre-emphasis + - 2 # 6dB pre-emphasis + oneOf: - required: - port@0
I get this warning:
Quoted 2 lines
mx8mp-tqma8mpql-mba8mpxl.dtb: bridge@f: ports:port@2:endpoint: Unevaluated properties are not allowed ('toshiba,pre-emphasis' was unexpected)
DT node looks like this:
port@2 {
reg = <2>;
endpoint {
toshiba,pre-emphasis = /bits/ 8 <1 1>;
};
};I think you are missing this change as well:
-- 8< --
Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.yaml +2 -1
@@ -92,7 +92,8 @@ properties: reference to a valid DPI output or input endpoint node. port@2: - $ref: /schemas/graph.yaml#/properties/port + $ref: /schemas/graph.yaml#/$defs/port-base + unevaluatedProperties: false description: | eDP/DP output port. The remote endpoint phandle should be a reference to a valid eDP panel input endpoint node. This port is
-- 8< --
How would you determine the values to be set here? I suspect it's the value from register DP0_SnkLTChReq (0x6d4) after link training. Are they dependent on the actual display to be attached?
Best regards,
Alexander
Signature · 4 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/
On 6/26/24 9:29 AM, Alexander Stein wrote:
Hi,
Quoted 25 lines
Quoted 5 lines
+
oneOf:
- required:
- port@0I get this warning:
Quoted 2 lines
mx8mp-tqma8mpql-mba8mpxl.dtb: bridge@f: ports:port@2:endpoint: Unevaluated properties are not allowed ('toshiba,pre-emphasis' was unexpected)
DT node looks like this:
port@2 { reg = <2>; endpoint { toshiba,pre-emphasis = /bits/ 8 <1 1>; }; };I think you are missing this change as well:
-- 8< --
Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.yaml properties:
Quoted 10 lines
Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.yaml +2
-2@@ -92,7 +92,8 @@ properties: reference to a valid DPI output or input endpoint node. port@2: - $ref: /schemas/graph.yaml#/properties/port + $ref: /schemas/graph.yaml#/$defs/port-base + unevaluatedProperties: false description: | eDP/DP output port. The remote endpoint phandle should be a reference to a valid eDP panel input endpoint node. This port is -- 8< --
Picked for V4, thank you !
Quoted 3 lines
How would you determine the values to be set here? I suspect it's the value from register
DP0_SnkLTChReq(0x6d4) after link training. Are they dependent on the actual display to be attached?
In my case, I only did trial-and-error, because the test hardware I have available right now ... well, it is a test hardware and won't work reliably with pre-emphasis 0, so I had to up it a bit.