| Message ID | 20250205232855.3017421-1-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/dp_mst: Fix getting display pointer in intel_dp_mst_compute_min_hblank() | expand |
Thank You for the fix. Tested-by: Khaled Almahallawy <khaled.almahallawy@intel.com> Reviewed-by: Khaled Almahallawy <khaled.almahallawy@intel.com> On Thu, 2025-02-06 at 01:28 +0200, Imre Deak wrote: > The MST intel_connector::encoder pointer is NULL if the connector > hasn't > been enabled before, so it can't be used to retrieve the display > pointer. Use instead the connector pointer directly, which also > simplifies things. > > Fixes: a5ebe00c2ace ("drm/i915/dp: Guarantee a minimum HBlank time") > Reported-by: Khaled Almahallawy <khaled.almahallawy@intel.com> > Cc: Arun R Murthy <arun.r.murthy@intel.com> > Cc: Suraj Kandpal <suraj.kandpal@intel.com> > Signed-off-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c > b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index f58d56a1ea03a..1d43c2574e616 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -213,8 +213,7 @@ static void > intel_dp_mst_compute_min_hblank(struct intel_crtc_state *crtc_state, > struct intel_connector > *connector, > int bpp_x16) > { > - struct intel_encoder *encoder = connector->encoder; > - struct intel_display *display = to_intel_display(encoder); > + struct intel_display *display = to_intel_display(connector); > const struct drm_display_mode *adjusted_mode = > &crtc_state- > >hw.adjusted_mode; > int symbol_size = intel_dp_is_uhbr(crtc_state) ? 32 : 8;
On Thu, Feb 06, 2025 at 03:06:18PM +0000, Patchwork wrote: > == Series Details == > > Series: drm/i915/dp_mst: Fix getting display pointer in intel_dp_mst_compute_min_hblank() (rev2) > URL : https://patchwork.freedesktop.org/series/144387/ > State : success Thanks for the report, testing and review, patch is pushed to drm-intel-next. On bat-mtlp-9 there is still a related but separate issue, I'll follow up with a fix for that. > > == Summary == > > CI Bug Log - changes from CI_DRM_16076 -> Patchwork_144387v2 > ==================================================== > > Summary > ------- > > **WARNING** > > Minor unknown changes coming with Patchwork_144387v2 need to be verified > manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_144387v2, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them > to document this new failure mode, which will reduce false positives in CI. > > External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_144387v2/index.html > > Participating hosts (45 -> 43) > ------------------------------ > > Missing (2): fi-snb-2520m fi-pnv-d510 > > Possible new issues > ------------------- > > Here are the unknown changes that may have been introduced in Patchwork_144387v2: > > ### IGT changes ### > > #### Warnings #### > > * igt@i915_module_load@load: > - bat-mtlp-9: [ABORT][1] ([i915#13641]) -> [ABORT][2] > [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16076/bat-mtlp-9/igt@i915_module_load@load.html > [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_144387v2/bat-mtlp-9/igt@i915_module_load@load.html > > > Known issues > ------------ > > Here are the changes found in Patchwork_144387v2 that come from known issues: > > ### IGT changes ### > > #### Issues hit #### > > * igt@dmabuf@all-tests@dma_fence_chain: > - fi-bsw-nick: [PASS][3] -> [INCOMPLETE][4] ([i915#12904]) +1 other test incomplete > [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16076/fi-bsw-nick/igt@dmabuf@all-tests@dma_fence_chain.html > [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_144387v2/fi-bsw-nick/igt@dmabuf@all-tests@dma_fence_chain.html > > * igt@i915_pm_rpm@module-reload: > - bat-dg1-7: [PASS][5] -> [FAIL][6] ([i915#13633]) > [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16076/bat-dg1-7/igt@i915_pm_rpm@module-reload.html > [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_144387v2/bat-dg1-7/igt@i915_pm_rpm@module-reload.html > - bat-rpls-4: [PASS][7] -> [FAIL][8] ([i915#13633]) > [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16076/bat-rpls-4/igt@i915_pm_rpm@module-reload.html > [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_144387v2/bat-rpls-4/igt@i915_pm_rpm@module-reload.html > > * igt@i915_selftest@live@workarounds: > - bat-mtlp-6: [PASS][9] -> [DMESG-FAIL][10] ([i915#12061]) +1 other test dmesg-fail > [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16076/bat-mtlp-6/igt@i915_selftest@live@workarounds.html > [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_144387v2/bat-mtlp-6/igt@i915_selftest@live@workarounds.html > - bat-arls-6: [PASS][11] -> [DMESG-FAIL][12] ([i915#12061]) +1 other test dmesg-fail > [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16076/bat-arls-6/igt@i915_selftest@live@workarounds.html > [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_144387v2/bat-arls-6/igt@i915_selftest@live@workarounds.html > > * igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence: > - bat-dg2-11: [PASS][13] -> [SKIP][14] ([i915#9197]) +3 other tests skip > [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16076/bat-dg2-11/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence.html > [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_144387v2/bat-dg2-11/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence.html > > > #### Warnings #### > > * igt@core_hotunplug@unbind-rebind: > - fi-kbl-7567u: [DMESG-WARN][15] ([i915#11621] / [i915#180]) -> [DMESG-WARN][16] ([i915#11621] / [i915#180] / [i915#1982]) > [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16076/fi-kbl-7567u/igt@core_hotunplug@unbind-rebind.html > [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_144387v2/fi-kbl-7567u/igt@core_hotunplug@unbind-rebind.html > > > [i915#11621]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11621 > [i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061 > [i915#12904]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12904 > [i915#13633]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13633 > [i915#13641]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13641 > [i915#180]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/180 > [i915#1982]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1982 > [i915#9197]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9197 > > > Build changes > ------------- > > * Linux: CI_DRM_16076 -> Patchwork_144387v2 > > CI-20190529: 20190529 > CI_DRM_16076: 7a632b6798b6a05b63725249e3209afea13ea499 @ git://anongit.freedesktop.org/gfx-ci/linux > IGT_8224: c659b986ba648584d36b3cfece897bc84a33dcbb @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git > Patchwork_144387v2: 7a632b6798b6a05b63725249e3209afea13ea499 @ git://anongit.freedesktop.org/gfx-ci/linux > > > ### Linux commits > > 55cb2fc137f9 drm/i915/dp_mst: Fix getting display pointer in intel_dp_mst_compute_min_hblank() > > == Logs == > > For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_144387v2/index.html
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index f58d56a1ea03a..1d43c2574e616 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -213,8 +213,7 @@ static void intel_dp_mst_compute_min_hblank(struct intel_crtc_state *crtc_state, struct intel_connector *connector, int bpp_x16) { - struct intel_encoder *encoder = connector->encoder; - struct intel_display *display = to_intel_display(encoder); + struct intel_display *display = to_intel_display(connector); const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode; int symbol_size = intel_dp_is_uhbr(crtc_state) ? 32 : 8;
The MST intel_connector::encoder pointer is NULL if the connector hasn't been enabled before, so it can't be used to retrieve the display pointer. Use instead the connector pointer directly, which also simplifies things. Fixes: a5ebe00c2ace ("drm/i915/dp: Guarantee a minimum HBlank time") Reported-by: Khaled Almahallawy <khaled.almahallawy@intel.com> Cc: Arun R Murthy <arun.r.murthy@intel.com> Cc: Suraj Kandpal <suraj.kandpal@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> --- drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)