drm/i915: Reduce Data Link N value for 1 lane DP->hdmi converters
Subsystems (2)
PATCH v2 1/1 drm/i915: Reduce Data Link N value for 1 lane DP->hdmi converters
From: Clint Taylor <[email protected]>
Several major vendor USB-C->HDMI converters fail to recover a 5.4 GHz 1 lane signal if the Data Link N is greater than 0x80000.
Patch detects when 1 lane 5.4 GHz signal is being used and makes the maximum value 20 bit instead of the maximum specification supported 24 bit value.
v2: Detect specific device that exhibits the issue.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93578
--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_display.c | 20 ++++++++++++++------ drivers/gpu/drm/i915/intel_dp.c | 14 ++++++++++++-- drivers/gpu/drm/i915/intel_dp_mst.c | 3 ++- 5 files changed, 32 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -580,7 +580,8 @@ struct intel_link_m_n {void intel_link_compute_m_n (int bpp,int nlanes,int pixel_clock,int link_clock, -struct intel_link_m_n *m_n); +struct intel_link_m_n *m_n, +bool reduced_n);/* Interface history: *
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -4869,6 +4869,8 @@ enum {#define DATA_LINK_M_N_MASK (0xffffff)#define DATA_LINK_N_MAX (0x800000) +/* Maximum N value useable on some DP->HDMI converters */ +#define DATA_LINK_REDUCED_N_MAX (0x80000)#define _PIPEA_DATA_N_G4X 0x70054#define _PIPEB_DATA_N_G4X 0x71054
drivers/gpu/drm/i915/intel_display.c +14 -6
@@ -6139,7 +6139,7 @@ static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc, pipe_config->fdi_lanes = lane;intel_link_compute_m_n (pipe_config->pipe_bpp, lane, fdi_dotclock, - link_bw, &pipe_config->fdi_m_n); + link_bw, &pipe_config->fdi_m_n, false); ret =ironlake_check_fdi_lanes (dev, intel_crtc->pipe, pipe_config);if (ret == -EINVAL && pipe_config->pipe_bpp >6 *3 ) {
@@ -6315,9 +6315,10 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc, }static void compute_m_n (unsigned int m,unsigned int n, -uint32_t *ret_m,uint32_t *ret_n) +uint32_t *ret_m,uint32_t *ret_n, +uint32_t max_link_n) { - *ret_n = min_t(unsigned int, roundup_pow_of_two(n), DATA_LINK_N_MAX); + *ret_n = min_t(unsigned int, roundup_pow_of_two(n), max_link_n); *ret_m =div_u64 ((uint64_t ) m * *ret_n, n);intel_reduce_m_n_ratio (ret_m, ret_n); }
@@ -6325,16 +6326,23 @@ static void compute_m_n(unsigned int m, unsigned int n,void intel_link_compute_m_n (int bits_per_pixel,int nlanes,int pixel_clock,int link_clock, -struct intel_link_m_n *m_n) +struct intel_link_m_n *m_n, +bool reduced_n) { +uint32_t max_link_n =DATA_LINK_N_MAX ; m_n->tu =64 ; +if ((reduced_n) && (nlanes ==1 ) && (link_clock >=540000 )) + max_link_n =DATA_LINK_REDUCED_N_MAX ; +compute_m_n (bits_per_pixel * pixel_clock, link_clock * nlanes *8 , - &m_n->gmch_m, &m_n->gmch_n); + &m_n->gmch_m, &m_n->gmch_n, + max_link_n);compute_m_n (pixel_clock, link_clock, - &m_n->link_m, &m_n->link_n); + &m_n->link_m, &m_n->link_n, + max_link_n); }static inline bool intel_panel_use_ssc (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/intel_dp.c +12 -2
@@ -1624,6 +1624,8 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,int common_rates[DP_MAX_SUPPORTED_RATES ] = {};int common_len;uint8_t link_bw, rate_select; +char id[6 ]; +bool reduced_n = false; common_len =intel_dp_common_rates (intel_dp, common_rates);
@@ -1750,10 +1752,17 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,DRM_DEBUG_KMS ("DP link bw required %i available %i\n" , mode_rate, link_avail); +/* Quirk to detect DP->HDMI converter */ +drm_dp_downstream_id (&intel_dp->aux, id); +if (!strncmp (id ,"7737" ,4 )) { + reduced_n = true; + } +intel_link_compute_m_n (bpp, lane_count, adjusted_mode->crtc_clock, pipe_config->port_clock, - &pipe_config->dp_m_n); + &pipe_config->dp_m_n, + reduced_n);if (intel_connector->panel.downclock_mode !=NULL && dev_priv->drrs.type ==SEAMLESS_DRRS_SUPPORT ) {
@@ -1761,7 +1770,8 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,intel_link_compute_m_n (bpp, lane_count, intel_connector->panel.downclock_mode->clock, pipe_config->port_clock, - &pipe_config->dp_m2_n2); + &pipe_config->dp_m2_n2, + reduced_n); }/*
drivers/gpu/drm/i915/intel_dp_mst.c +2 -1
@@ -75,7 +75,8 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,intel_link_compute_m_n (bpp, lane_count, adjusted_mode->crtc_clock, pipe_config->port_clock, - &pipe_config->dp_m_n); + &pipe_config->dp_m_n, + false); pipe_config->dp_m_n.tu = slots;
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 8 lines · On Thu, Mar 23, 2017 at 04:38:58PM -0700, [email protected] wrote:
From: Clint Taylor <[email protected]>
Several major vendor USB-C->HDMI converters fail to recover a 5.4 GHz 1 lane signal if the Data Link N is greater than
0x80000.
Patch detects when 1 lane 5.4 GHz signal is being used and makes the maximum value 20 bit instead of the maximum specification supported 24 bit value.v2: Detect specific device that exhibits the issue.
Since this is a sink quirk, shouldn't we have this in the dp helpers to be able to share it with all other drivers. There will be more quirks like this, starting with a sink quirk table imo makes sense (like we already have an edid quirk table).
-Daniel
Quoted 159 lines
Cc Dhinakaran Pandiyan <[email protected]>Cc Jani Nikula <[email protected]>Cc Anusha Srivatsa <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93578
Signed-off-by Clint Taylor <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_display.c | 20 ++++++++++++++------ drivers/gpu/drm/i915/intel_dp.c | 14 ++++++++++++-- drivers/gpu/drm/i915/intel_dp_mst.c | 3 ++- 5 files changed, 32 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-1@@ -580,7 +580,8 @@ struct intel_link_m_n {void intel_link_compute_m_n (int bpp,int nlanes,int pixel_clock,int link_clock, -struct intel_link_m_n *m_n); +struct intel_link_m_n *m_n, +bool reduced_n);/* Interface history: * drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -4869,6 +4869,8 @@ enum {#define DATA_LINK_M_N_MASK (0xffffff)#define DATA_LINK_N_MAX (0x800000) +/* Maximum N value useable on some DP->HDMI converters */ +#define DATA_LINK_REDUCED_N_MAX (0x80000)#define _PIPEA_DATA_N_G4X 0x70054#define _PIPEB_DATA_N_G4X 0x71054drivers/gpu/drm/i915/intel_display.c +14
-6@@ -6139,7 +6139,7 @@ static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc, pipe_config->fdi_lanes = lane;intel_link_compute_m_n (pipe_config->pipe_bpp, lane, fdi_dotclock, - link_bw, &pipe_config->fdi_m_n); + link_bw, &pipe_config->fdi_m_n, false); ret =ironlake_check_fdi_lanes (dev, intel_crtc->pipe, pipe_config);if (ret == -EINVAL && pipe_config->pipe_bpp >6 *3 ) {@@ -6315,9 +6315,10 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc, }static void compute_m_n (unsigned int m,unsigned int n, -uint32_t *ret_m,uint32_t *ret_n) +uint32_t *ret_m,uint32_t *ret_n, +uint32_t max_link_n) { - *ret_n = min_t(unsigned int, roundup_pow_of_two(n), DATA_LINK_N_MAX); + *ret_n = min_t(unsigned int, roundup_pow_of_two(n), max_link_n); *ret_m =div_u64 ((uint64_t ) m * *ret_n, n);intel_reduce_m_n_ratio (ret_m, ret_n); }@@ -6325,16 +6326,23 @@ static void compute_m_n(unsigned int m, unsigned int n,void intel_link_compute_m_n (int bits_per_pixel,int nlanes,int pixel_clock,int link_clock, -struct intel_link_m_n *m_n) +struct intel_link_m_n *m_n, +bool reduced_n) { +uint32_t max_link_n =DATA_LINK_N_MAX ; m_n->tu =64 ; +if ((reduced_n) && (nlanes ==1 ) && (link_clock >=540000 )) + max_link_n =DATA_LINK_REDUCED_N_MAX ; +compute_m_n (bits_per_pixel * pixel_clock, link_clock * nlanes *8 , - &m_n->gmch_m, &m_n->gmch_n); + &m_n->gmch_m, &m_n->gmch_n, + max_link_n);compute_m_n (pixel_clock, link_clock, - &m_n->link_m, &m_n->link_n); + &m_n->link_m, &m_n->link_n, + max_link_n); }static inline bool intel_panel_use_ssc (struct drm_i915_private *dev_priv)drivers/gpu/drm/i915/intel_dp.c +12
-2@@ -1624,6 +1624,8 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,int common_rates[DP_MAX_SUPPORTED_RATES ] = {};int common_len;uint8_t link_bw, rate_select; +char id[6 ]; +bool reduced_n = false; common_len =intel_dp_common_rates (intel_dp, common_rates);@@ -1750,10 +1752,17 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,DRM_DEBUG_KMS ("DP link bw required %i available %i\n" , mode_rate, link_avail); +/* Quirk to detect DP->HDMI converter */ +drm_dp_downstream_id (&intel_dp->aux, id); +if (!strncmp (id ,"7737" ,4 )) { + reduced_n = true; + } +intel_link_compute_m_n (bpp, lane_count, adjusted_mode->crtc_clock, pipe_config->port_clock, - &pipe_config->dp_m_n); + &pipe_config->dp_m_n, + reduced_n);if (intel_connector->panel.downclock_mode !=NULL && dev_priv->drrs.type ==SEAMLESS_DRRS_SUPPORT ) {@@ -1761,7 +1770,8 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,intel_link_compute_m_n (bpp, lane_count, intel_connector->panel.downclock_mode->clock, pipe_config->port_clock, - &pipe_config->dp_m2_n2); + &pipe_config->dp_m2_n2, + reduced_n); }/* drivers/gpu/drm/i915/intel_dp_mst.c +2
-1@@ -75,7 +75,8 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,intel_link_compute_m_n (bpp, lane_count, adjusted_mode->crtc_clock, pipe_config->port_clock, - &pipe_config->dp_m_n); + &pipe_config->dp_m_n, + false); pipe_config->dp_m_n.tu = slots;Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Reduce Data Link N value for 1 lane DP->hdmi converters (rev2)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915: Reduce Data Link N value for 1 lane DP->hdmi converters (rev2)
URL : https://patchwork.freedesktop.org/series/21724/
State : success
== Summary ==
Series 21724v2 drm/i915: Reduce Data Link N value for 1 lane DP->hdmi converters
https://patchwork.freedesktop.org/api/1.0/series/21724/revisions/2/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> FAIL (fi-snb-2600) fdo#100007fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 471s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time: 456s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 536s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 583s fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 506s fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 time: 506s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 439s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 437s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 433s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 518s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 493s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 483s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 488s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 633s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 492s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 530s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time: 467s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 547s fi-snb-2600 total:278 pass:248 dwarn:0 dfail:0 fail:1 skip:29 time: 419s
fi-bsw-n3050 failed to collect. IGT log at Patchwork_4287/fi-bsw-n3050/igt.log
fd27e1e4c9b5dc11966b4953432bd6e0510da308 drm-tip: 2017y-03m-24d-08h-39m-20s UTC integration manifest fd3c6c1 drm/i915: Reduce Data Link N value for 1 lane DP->hdmi converters
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4287/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx