| Message ID | 20200630233310.10191-1-matthew.s.atwood@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/i915/dp: Correctly advertise HBR3 for GEN11+ | expand |
On Tue, Jun 30, 2020 at 04:33:10PM -0700, Matt Atwood wrote: > intel_dp_set_source_rates() calls intel_dp_is_edp(), which is unsafe to > use before encoder_type is set. This caused GEN11+ to incorrectly strip > HBR3 from source rates for edp. Move intel_dp_set_source_rates() to > after encoder_type is set. Add comment to intel_dp_is_edp() describing > unsafe usages. > > v2: Alter intel_dp_set_source_rates final position (Ville/Manasi). > Remove outdated comment (Ville). > Slight optimization of control flow in intel_dp_init_connector. > Slight rewording in commit message. > > Signed-off-by: Matt Atwood <matthew.s.atwood@intel.com> lgtm Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_dp.c | 28 ++++++++++--------------- > 1 file changed, 11 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 3df5d901dd9d..c9b93c5706af 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -137,6 +137,8 @@ static const u8 valid_dsc_slicecount[] = {1, 2, 4}; > * > * If a CPU or PCH DP output is attached to an eDP panel, this function > * will return true, and false otherwise. > + * > + * This function is not safe to use prior to encoder type being set. > */ > bool intel_dp_is_edp(struct intel_dp *intel_dp) > { > @@ -8157,8 +8159,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, > intel_encoder->base.name)) > return false; > > - intel_dp_set_source_rates(intel_dp); > - > intel_dp->reset_link_params = true; > intel_dp->pps_pipe = INVALID_PIPE; > intel_dp->active_pipe = INVALID_PIPE; > @@ -8174,28 +8174,22 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, > */ > drm_WARN_ON(dev, intel_phy_is_tc(dev_priv, phy)); > type = DRM_MODE_CONNECTOR_eDP; > + intel_encoder->type = INTEL_OUTPUT_EDP; > + > + /* eDP only on port B and/or C on vlv/chv */ > + if (drm_WARN_ON(dev, (IS_VALLEYVIEW(dev_priv) || > + IS_CHERRYVIEW(dev_priv)) && > + port != PORT_B && port != PORT_C)) > + return false; > } else { > type = DRM_MODE_CONNECTOR_DisplayPort; > } > > + intel_dp_set_source_rates(intel_dp); > + > if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > intel_dp->active_pipe = vlv_active_pipe(intel_dp); > > - /* > - * For eDP we always set the encoder type to INTEL_OUTPUT_EDP, but > - * for DP the encoder type can be set by the caller to > - * INTEL_OUTPUT_UNKNOWN for DDI, so don't rewrite it. > - */ > - if (type == DRM_MODE_CONNECTOR_eDP) > - intel_encoder->type = INTEL_OUTPUT_EDP; > - > - /* eDP only on port B and/or C on vlv/chv */ > - if (drm_WARN_ON(dev, (IS_VALLEYVIEW(dev_priv) || > - IS_CHERRYVIEW(dev_priv)) && > - intel_dp_is_edp(intel_dp) && > - port != PORT_B && port != PORT_C)) > - return false; > - > drm_dbg_kms(&dev_priv->drm, > "Adding %s connector on [ENCODER:%d:%s]\n", > type == DRM_MODE_CONNECTOR_eDP ? "eDP" : "DP", > -- > 2.21.3 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Wed, 2020-07-01 at 21:37 +0000, Patchwork wrote: > == Series Details == > > Series: drm/i915/dp: Correctly advertise HBR3 for GEN11+ (rev2) > URL : https://patchwork.freedesktop.org/series/61546/ > State : success > > == Summary == > > CI Bug Log - changes from CI_DRM_8679_full -> Patchwork_18050_full > ==================================================== > > Summary > ------- > > **SUCCESS** > > No regressions found. Pushed to dinq, thanks for the patch. > > > > Known issues > ------------ > > Here are the changes found in Patchwork_18050_full that come from known issues: > > ### IGT changes ### > > #### Issues hit #### > > * igt@drm_import_export@prime: > - shard-tglb: [PASS][1] -> [INCOMPLETE][2] ([i915#750]) > [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-tglb6/igt@drm_import_export@prime.html > [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-tglb5/igt@drm_import_export@prime.html > > * igt@gem_workarounds@suspend-resume: > - shard-skl: [PASS][3] -> [INCOMPLETE][4] ([i915#69]) > [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl6/igt@gem_workarounds@suspend-resume.html > [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-skl1/igt@gem_workarounds@suspend-resume.html > > * igt@i915_suspend@debugfs-reader: > - shard-kbl: [PASS][5] -> [DMESG-WARN][6] ([i915#180]) +1 similar issue > [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl6/igt@i915_suspend@debugfs-reader.html > [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-kbl6/igt@i915_suspend@debugfs-reader.html > > * igt@kms_color@pipe-c-ctm-0-25: > - shard-skl: [PASS][7] -> [DMESG-WARN][8] ([i915#1982]) +12 similar issues > [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl6/igt@kms_color@pipe-c-ctm-0-25.html > [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-skl2/igt@kms_color@pipe-c-ctm-0-25.html > > * igt@kms_cursor_crc@pipe-b-cursor-64x64-random: > - shard-kbl: [PASS][9] -> [DMESG-WARN][10] ([i915#93] / [i915#95]) +3 similar issues > [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl6/igt@kms_cursor_crc@pipe-b-cursor-64x64-random.html > [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-kbl4/igt@kms_cursor_crc@pipe-b-cursor-64x64-random.html > > * igt@kms_cursor_edge_walk@pipe-c-128x128-left-edge: > - shard-kbl: [PASS][11] -> [DMESG-WARN][12] ([i915#1982]) > [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl7/igt@kms_cursor_edge_walk@pipe-c-128x128-left-edge.html > [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-kbl6/igt@kms_cursor_edge_walk@pipe-c-128x128-left-edge.html > > * igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1: > - shard-skl: [PASS][13] -> [FAIL][14] ([i915#79]) > [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl4/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html > [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-skl1/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html > > * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite: > - shard-apl: [PASS][15] -> [DMESG-WARN][16] ([i915#1635] / [i915#95]) +9 similar issues > [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite.html > [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-apl8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite.html > > * igt@kms_hdr@bpc-switch-dpms: > - shard-skl: [PASS][17] -> [FAIL][18] ([i915#1188]) > [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl7/igt@kms_hdr@bpc-switch-dpms.html > [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-skl8/igt@kms_hdr@bpc-switch-dpms.html > > * igt@kms_plane_alpha_blend@pipe-a-coverage-7efc: > - shard-skl: [PASS][19] -> [FAIL][20] ([fdo#108145] / [i915#265]) +1 similar issue > [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl6/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html > [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-skl1/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html > > * igt@kms_plane_alpha_blend@pipe-b-coverage-7efc: > - shard-skl: [PASS][21] -> [DMESG-FAIL][22] ([fdo#108145] / [i915#1982]) > [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl4/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html > [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-skl2/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html > > * igt@kms_prime@basic-crc@second-to-first: > - shard-kbl: [PASS][23] -> [DMESG-FAIL][24] ([i915#95]) > [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl1/igt@kms_prime@basic-crc@second-to-first.html > [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-kbl1/igt@kms_prime@basic-crc@second-to-first.html > > * igt@kms_psr@psr2_cursor_plane_move: > - shard-iclb: [PASS][25] -> [SKIP][26] ([fdo#109441]) +1 similar issue > [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html > [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-iclb5/igt@kms_psr@psr2_cursor_plane_move.html > > * igt@kms_psr@suspend: > - shard-skl: [PASS][27] -> [INCOMPLETE][28] ([i915#198]) > [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl6/igt@kms_psr@suspend.html > [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-skl3/igt@kms_psr@suspend.html > > * igt@kms_setmode@basic: > - shard-hsw: [PASS][29] -> [FAIL][30] ([i915#31]) > [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-hsw4/igt@kms_setmode@basic.html > [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-hsw4/igt@kms_setmode@basic.html > > * igt@kms_vblank@pipe-c-wait-idle: > - shard-apl: [PASS][31] -> [DMESG-WARN][32] ([i915#1982]) > [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl4/igt@kms_vblank@pipe-c-wait-idle.html > [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-apl1/igt@kms_vblank@pipe-c-wait-idle.html > > * igt@perf_pmu@module-unload: > - shard-tglb: [PASS][33] -> [DMESG-WARN][34] ([i915#402]) > [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-tglb6/igt@perf_pmu@module-unload.html > [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-tglb6/igt@perf_pmu@module-unload.html > > > #### Possible fixes #### > > * igt@gem_mmap_gtt@ptrace: > - shard-apl: [DMESG-WARN][35] ([i915#1635] / [i915#95]) -> [PASS][36] +5 similar issues > [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl8/igt@gem_mmap_gtt@ptrace.html > [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-apl8/igt@gem_mmap_gtt@ptrace.html > > * igt@kms_cursor_crc@pipe-a-cursor-128x128-rapid-movement: > - shard-glk: [DMESG-WARN][37] ([i915#118] / [i915#95]) -> [PASS][38] +1 similar issue > [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-glk9/igt@kms_cursor_crc@pipe-a-cursor-128x128-rapid-movement.html > [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-glk9/igt@kms_cursor_crc@pipe-a-cursor-128x128-rapid-movement.html > > * igt@kms_fbcon_fbt@fbc-suspend: > - shard-kbl: [DMESG-WARN][39] ([i915#359]) -> [PASS][40] > [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl1/igt@kms_fbcon_fbt@fbc-suspend.html > [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-kbl6/igt@kms_fbcon_fbt@fbc-suspend.html > > * igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2: > - shard-glk: [FAIL][41] ([i915#79]) -> [PASS][42] > [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-glk2/igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2.html > [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-glk5/igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2.html > > * igt@kms_flip@2x-flip-vs-expired-vblank@ab-vga1-hdmi-a1: > - shard-hsw: [DMESG-WARN][43] ([i915#1982]) -> [PASS][44] > [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-hsw6/igt@kms_flip@2x-flip-vs-expired-vblank@ab-vga1-hdmi-a1.html > [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-hsw6/igt@kms_flip@2x-flip-vs-expired-vblank@ab-vga1-hdmi-a1.html > > * igt@kms_flip@flip-vs-suspend-interruptible@a-dp1: > - shard-kbl: [DMESG-WARN][45] ([i915#180]) -> [PASS][46] +8 similar issues > [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl2/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html > [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-kbl4/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html > > * igt@kms_frontbuffer_tracking@fbcpsr-1p-indfb-fliptrack: > - shard-iclb: [DMESG-WARN][47] ([i915#1982]) -> [PASS][48] > [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-indfb-fliptrack.html > [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-indfb-fliptrack.html > > * igt@kms_frontbuffer_tracking@psr-farfromfence: > - shard-tglb: [DMESG-WARN][49] ([i915#1982]) -> [PASS][50] +3 similar issues > [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-tglb7/igt@kms_frontbuffer_tracking@psr-farfromfence.html > [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-tglb2/igt@kms_frontbuffer_tracking@psr-farfromfence.html > > * igt@kms_psr@psr2_no_drrs: > - shard-iclb: [SKIP][51] ([fdo#109441]) -> [PASS][52] +1 similar issue > [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-iclb3/igt@kms_psr@psr2_no_drrs.html > [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-iclb2/igt@kms_psr@psr2_no_drrs.html > > * igt@kms_vblank@pipe-b-query-idle: > - shard-skl: [DMESG-WARN][53] ([i915#1982]) -> [PASS][54] +10 similar issues > [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl10/igt@kms_vblank@pipe-b-query-idle.html > [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-skl2/igt@kms_vblank@pipe-b-query-idle.html > > * igt@perf_pmu@semaphore-busy@rcs0: > - shard-kbl: [FAIL][55] ([i915#1820]) -> [PASS][56] > [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl7/igt@perf_pmu@semaphore-busy@rcs0.html > [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-kbl2/igt@perf_pmu@semaphore-busy@rcs0.html > > > #### Warnings #### > > * igt@kms_content_protection@atomic: > - shard-kbl: [TIMEOUT][57] ([i915#1319] / [i915#1958]) -> [TIMEOUT][58] ([i915#1319] / [i915#1958] / [i915#2119]) +3 similar issues > [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl1/igt@kms_content_protection@atomic.html > [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-kbl6/igt@kms_content_protection@atomic.html > > * igt@kms_content_protection@srm: > - shard-kbl: [TIMEOUT][59] ([i915#1319] / [i915#1958]) -> [TIMEOUT][60] ([i915#1319] / [i915#2119]) > [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl1/igt@kms_content_protection@srm.html > [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-kbl1/igt@kms_content_protection@srm.html > > * igt@kms_cursor_crc@pipe-a-cursor-suspend: > - shard-kbl: [DMESG-WARN][61] ([i915#180] / [i915#93] / [i915#95]) -> [DMESG-WARN][62] ([i915#93] / [i915#95]) > [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl2/igt@kms_cursor_crc@pipe-a-cursor-suspend.html > [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-kbl3/igt@kms_cursor_crc@pipe-a-cursor-suspend.html > > * igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-ytiled: > - shard-snb: [TIMEOUT][63] ([i915#1958]) -> [TIMEOUT][64] ([i915#1958] / [i915#2119]) +6 similar issues > [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-snb2/igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-ytiled.html > [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-snb6/igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-ytiled.html > > * igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1: > - shard-skl: [FAIL][65] ([i915#79]) -> [FAIL][66] ([i915#46]) > [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl4/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html > [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-skl1/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html > > * igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu: > - shard-apl: [SKIP][67] ([fdo#109271] / [i915#1635]) -> [SKIP][68] ([fdo#109271]) +2 similar issues > [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl1/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu.html > [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-apl3/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu.html > > * igt@kms_frontbuffer_tracking@psr-rgb565-draw-render: > - shard-apl: [SKIP][69] ([fdo#109271]) -> [SKIP][70] ([fdo#109271] / [i915#1635]) +2 similar issues > [69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl1/igt@kms_frontbuffer_tracking@psr-rgb565-draw-render.html > [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-apl3/igt@kms_frontbuffer_tracking@psr-rgb565-draw-render.html > > * igt@kms_lease@lessee_list: > - shard-hsw: [TIMEOUT][71] ([i915#1958]) -> [TIMEOUT][72] ([i915#1958] / [i915#2119]) +5 similar issues > [71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-hsw4/igt@kms_lease@lessee_list.html > [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-hsw7/igt@kms_lease@lessee_list.html > > * igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant: > - shard-kbl: [DMESG-FAIL][73] ([fdo#108145] / [i915#1982] / [i915#95]) -> [DMESG-FAIL][74] ([fdo#108145] / [i915#95]) > [73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl3/igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant.html > [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-kbl1/igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant.html > > * igt@runner@aborted: > - shard-apl: ([FAIL][75], [FAIL][76]) ([fdo#109271] / [i915#1610] / [i915#1635] / [i915#716]) -> ([FAIL][77], [FAIL][78]) ([fdo#109271] / [i915#1635] / [i915#716]) > [75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl7/igt@runner@aborted.html > [76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl1/igt@runner@aborted.html > [77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-apl3/igt@runner@aborted.html > [78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-apl7/igt@runner@aborted.html > - shard-tglb: ([FAIL][79], [FAIL][80]) ([i915#1764] / [i915#2110]) -> [FAIL][81] ([i915#2110]) > [79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-tglb3/igt@runner@aborted.html > [80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-tglb1/igt@runner@aborted.html > [81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/shard-tglb6/igt@runner@aborted.html > > > [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 > [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 > [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 > [i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118 > [i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188 > [i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319 > [i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610 > [i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635 > [i915#1764]: https://gitlab.freedesktop.org/drm/intel/issues/1764 > [i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180 > [i915#1820]: https://gitlab.freedesktop.org/drm/intel/issues/1820 > [i915#1958]: https://gitlab.freedesktop.org/drm/intel/issues/1958 > [i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198 > [i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982 > [i915#2110]: https://gitlab.freedesktop.org/drm/intel/issues/2110 > [i915#2119]: https://gitlab.freedesktop.org/drm/intel/issues/2119 > [i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265 > [i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31 > [i915#359]: https://gitlab.freedesktop.org/drm/intel/issues/359 > [i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402 > [i915#46]: https://gitlab.freedesktop.org/drm/intel/issues/46 > [i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69 > [i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716 > [i915#750]: https://gitlab.freedesktop.org/drm/intel/issues/750 > [i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79 > [i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93 > [i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95 > > > Participating hosts (11 -> 11) > ------------------------------ > > No changes in participating hosts > > > Build changes > ------------- > > * Linux: CI_DRM_8679 -> Patchwork_18050 > > CI-20190529: 20190529 > CI_DRM_8679: 3e20fe558381bf798308d3a1171948676af22376 @ git://anongit.freedesktop.org/gfx-ci/linux > IGT_5718: af1ef32bfae90bcdbaf1b5d84c61ff4e04368505 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools > Patchwork_18050: f1aacc5b50136283c0d2f57dc7e0ff66a52e0fe3 @ git://anongit.freedesktop.org/gfx-ci/linux > piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit > > == Logs == > > For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18050/index.html > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Souza, Jose (2020-07-02 00:24:19) > On Wed, 2020-07-01 at 21:37 +0000, Patchwork wrote: > > == Series Details == > > > > Series: drm/i915/dp: Correctly advertise HBR3 for GEN11+ (rev2) > > URL : https://patchwork.freedesktop.org/series/61546/ > > State : success > > > > == Summary == > > > > CI Bug Log - changes from CI_DRM_8679_full -> Patchwork_18050_full > > ==================================================== > > > > Summary > > ------- > > > > **SUCCESS** > > > > No regressions found. > > Pushed to dinq, thanks for the patch. Something to be concerned about is that this is causing fi-tgl-u2 to exceed the allotted runtime for BAT. It adds something like 5s between each test, adding more than 5 minutes to the incomplete test run before it is killed, 40 tests [20%] short. -Chris
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 3df5d901dd9d..c9b93c5706af 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -137,6 +137,8 @@ static const u8 valid_dsc_slicecount[] = {1, 2, 4}; * * If a CPU or PCH DP output is attached to an eDP panel, this function * will return true, and false otherwise. + * + * This function is not safe to use prior to encoder type being set. */ bool intel_dp_is_edp(struct intel_dp *intel_dp) { @@ -8157,8 +8159,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, intel_encoder->base.name)) return false; - intel_dp_set_source_rates(intel_dp); - intel_dp->reset_link_params = true; intel_dp->pps_pipe = INVALID_PIPE; intel_dp->active_pipe = INVALID_PIPE; @@ -8174,28 +8174,22 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, */ drm_WARN_ON(dev, intel_phy_is_tc(dev_priv, phy)); type = DRM_MODE_CONNECTOR_eDP; + intel_encoder->type = INTEL_OUTPUT_EDP; + + /* eDP only on port B and/or C on vlv/chv */ + if (drm_WARN_ON(dev, (IS_VALLEYVIEW(dev_priv) || + IS_CHERRYVIEW(dev_priv)) && + port != PORT_B && port != PORT_C)) + return false; } else { type = DRM_MODE_CONNECTOR_DisplayPort; } + intel_dp_set_source_rates(intel_dp); + if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) intel_dp->active_pipe = vlv_active_pipe(intel_dp); - /* - * For eDP we always set the encoder type to INTEL_OUTPUT_EDP, but - * for DP the encoder type can be set by the caller to - * INTEL_OUTPUT_UNKNOWN for DDI, so don't rewrite it. - */ - if (type == DRM_MODE_CONNECTOR_eDP) - intel_encoder->type = INTEL_OUTPUT_EDP; - - /* eDP only on port B and/or C on vlv/chv */ - if (drm_WARN_ON(dev, (IS_VALLEYVIEW(dev_priv) || - IS_CHERRYVIEW(dev_priv)) && - intel_dp_is_edp(intel_dp) && - port != PORT_B && port != PORT_C)) - return false; - drm_dbg_kms(&dev_priv->drm, "Adding %s connector on [ENCODER:%d:%s]\n", type == DRM_MODE_CONNECTOR_eDP ? "eDP" : "DP",
intel_dp_set_source_rates() calls intel_dp_is_edp(), which is unsafe to use before encoder_type is set. This caused GEN11+ to incorrectly strip HBR3 from source rates for edp. Move intel_dp_set_source_rates() to after encoder_type is set. Add comment to intel_dp_is_edp() describing unsafe usages. v2: Alter intel_dp_set_source_rates final position (Ville/Manasi). Remove outdated comment (Ville). Slight optimization of control flow in intel_dp_init_connector. Slight rewording in commit message. Signed-off-by: Matt Atwood <matthew.s.atwood@intel.com> --- drivers/gpu/drm/i915/display/intel_dp.c | 28 ++++++++++--------------- 1 file changed, 11 insertions(+), 17 deletions(-)