diff mbox series

drm/i915: Fix HW readout for crtc_clock in HDMI mode

Message ID 20190808133741.10113-1-imre.deak@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: Fix HW readout for crtc_clock in HDMI mode | expand

Commit Message

Imre Deak Aug. 8, 2019, 1:37 p.m. UTC
The conversion during HDMI HW readout from port_clock to crtc_clock was
missed when HDMI 10bpc support was added, so fix that.

Fixes: cd9e11a8bf25 ("drm/i915/icl: Add 10-bit support for hdmi")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109593
Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
 drivers/gpu/drm/i915/display/intel_ddi.c           | 9 +++++----
 drivers/gpu/drm/i915/display/intel_display_types.h | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

Comments

Imre Deak Aug. 9, 2019, 8:47 a.m. UTC | #1
On Fri, Aug 09, 2019 at 06:55:53AM +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Fix HW readout for crtc_clock in HDMI mode (rev2)
> URL   : https://patchwork.freedesktop.org/series/64909/
> State : failure
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_6657_full -> Patchwork_13923_full
> ====================================================
> 
> Summary
> -------
> 
>   **FAILURE**
> 
>   Serious unknown changes coming with Patchwork_13923_full absolutely need to be
>   verified manually.
>   
>   If you think the reported changes have nothing to do with the changes
>   introduced in Patchwork_13923_full, please notify your bug team to allow them
>   to document this new failure mode, which will reduce false positives in CI.
> 
>   
> 
> Possible new issues
> -------------------
> 
>   Here are the unknown changes that may have been introduced in Patchwork_13923_full:
> 
> ### IGT changes ###
> 
> #### Possible regressions ####
> 
>   * igt@prime_busy@wait-hang-blt:
>     - shard-apl:          [PASS][1] -> [DMESG-WARN][2]
>    [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-apl2/igt@prime_busy@wait-hang-blt.html
>    [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-apl7/igt@prime_busy@wait-hang-blt.html

Unrelated existing issue:
*ERROR* Failed to enable hdcp (-110)
https://bugs.freedesktop.org/show_bug.cgi?id=111317

I asked Lakshmi to update the bug filter.

> Known issues
> ------------
> 
>   Here are the changes found in Patchwork_13923_full that come from known issues:
> 
> ### IGT changes ###
> 
> #### Issues hit ####
> 
>   * igt@gem_ctx_isolation@rcs0-s3:
>     - shard-apl:          [PASS][3] -> [DMESG-WARN][4] ([fdo#108566]) +7 similar issues
>    [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-apl1/igt@gem_ctx_isolation@rcs0-s3.html
>    [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-apl6/igt@gem_ctx_isolation@rcs0-s3.html
> 
>   * igt@gem_ctx_isolation@vcs1-s3:
>     - shard-kbl:          [PASS][5] -> [INCOMPLETE][6] ([fdo#103665])
>    [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-kbl3/igt@gem_ctx_isolation@vcs1-s3.html
>    [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-kbl3/igt@gem_ctx_isolation@vcs1-s3.html
> 
>   * igt@gem_exec_schedule@in-order-bsd:
>     - shard-iclb:         [PASS][7] -> [SKIP][8] ([fdo#111325]) +3 similar issues
>    [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb5/igt@gem_exec_schedule@in-order-bsd.html
>    [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb2/igt@gem_exec_schedule@in-order-bsd.html
> 
>   * igt@gem_exec_schedule@preempt-contexts-bsd2:
>     - shard-iclb:         [PASS][9] -> [SKIP][10] ([fdo#109276]) +12 similar issues
>    [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb1/igt@gem_exec_schedule@preempt-contexts-bsd2.html
>    [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb5/igt@gem_exec_schedule@preempt-contexts-bsd2.html
> 
>   * igt@gem_exec_suspend@basic-s3:
>     - shard-kbl:          [PASS][11] -> [DMESG-WARN][12] ([fdo#108566]) +4 similar issues
>    [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-kbl2/igt@gem_exec_suspend@basic-s3.html
>    [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-kbl6/igt@gem_exec_suspend@basic-s3.html
> 
>   * igt@kms_flip@flip-vs-expired-vblank:
>     - shard-glk:          [PASS][13] -> [FAIL][14] ([fdo#105363]) +1 similar issue
>    [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-glk1/igt@kms_flip@flip-vs-expired-vblank.html
>    [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-glk7/igt@kms_flip@flip-vs-expired-vblank.html
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render:
>     - shard-iclb:         [PASS][15] -> [FAIL][16] ([fdo#103167]) +5 similar issues
>    [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render.html
>    [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render.html
> 
>   * igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
>     - shard-skl:          [PASS][17] -> [FAIL][18] ([fdo#108145])
>    [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
>    [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
> 
>   * igt@kms_psr2_su@frontbuffer:
>     - shard-iclb:         [PASS][19] -> [SKIP][20] ([fdo#109642] / [fdo#111068])
>    [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
>    [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb4/igt@kms_psr2_su@frontbuffer.html
> 
>   * igt@kms_psr@psr2_primary_mmap_cpu:
>     - shard-iclb:         [PASS][21] -> [SKIP][22] ([fdo#109441]) +3 similar issues
>    [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
>    [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb4/igt@kms_psr@psr2_primary_mmap_cpu.html
> 
>   * igt@perf@oa-exponents:
>     - shard-glk:          [PASS][23] -> [FAIL][24] ([fdo#105483])
>    [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-glk8/igt@perf@oa-exponents.html
>    [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-glk4/igt@perf@oa-exponents.html
> 
>   
> #### Possible fixes ####
> 
>   * igt@gem_exec_balancer@smoke:
>     - shard-iclb:         [SKIP][25] ([fdo#110854]) -> [PASS][26]
>    [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb5/igt@gem_exec_balancer@smoke.html
>    [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb2/igt@gem_exec_balancer@smoke.html
> 
>   * igt@gem_exec_schedule@reorder-wide-bsd:
>     - shard-iclb:         [SKIP][27] ([fdo#111325]) -> [PASS][28] +5 similar issues
>    [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb1/igt@gem_exec_schedule@reorder-wide-bsd.html
>    [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb3/igt@gem_exec_schedule@reorder-wide-bsd.html
> 
>   * igt@gem_exec_schedule@semaphore-noskip:
>     - shard-iclb:         [FAIL][29] ([fdo#110946]) -> [PASS][30]
>    [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb1/igt@gem_exec_schedule@semaphore-noskip.html
>    [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb3/igt@gem_exec_schedule@semaphore-noskip.html
> 
>   * igt@i915_pm_rpm@system-suspend-execbuf:
>     - shard-iclb:         [INCOMPLETE][31] ([fdo#107713] / [fdo#108840]) -> [PASS][32]
>    [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb2/igt@i915_pm_rpm@system-suspend-execbuf.html
>    [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb3/igt@i915_pm_rpm@system-suspend-execbuf.html
> 
>   * igt@i915_pm_rps@reset:
>     - shard-skl:          [FAIL][33] ([fdo#102250]) -> [PASS][34]
>    [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-skl8/igt@i915_pm_rps@reset.html
>    [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-skl3/igt@i915_pm_rps@reset.html
> 
>   * igt@i915_suspend@fence-restore-tiled2untiled:
>     - shard-apl:          [DMESG-WARN][35] ([fdo#108566]) -> [PASS][36] +3 similar issues
>    [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-apl3/igt@i915_suspend@fence-restore-tiled2untiled.html
>    [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-apl5/igt@i915_suspend@fence-restore-tiled2untiled.html
> 
>   * igt@kms_cursor_crc@pipe-a-cursor-suspend:
>     - shard-kbl:          [INCOMPLETE][37] ([fdo#103665]) -> [PASS][38]
>    [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-kbl1/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
>    [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-kbl1/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
> 
>   * igt@kms_cursor_crc@pipe-c-cursor-suspend:
>     - shard-kbl:          [DMESG-WARN][39] ([fdo#108566]) -> [PASS][40] +2 similar issues
>    [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-kbl4/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
>    [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-kbl1/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
> 
>   * igt@kms_flip@basic-flip-vs-wf_vblank:
>     - shard-apl:          [DMESG-WARN][41] -> [PASS][42]
>    [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-apl4/igt@kms_flip@basic-flip-vs-wf_vblank.html
>    [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-apl4/igt@kms_flip@basic-flip-vs-wf_vblank.html
> 
>   * igt@kms_flip@flip-vs-expired-vblank-interruptible:
>     - shard-skl:          [FAIL][43] ([fdo#105363]) -> [PASS][44]
>    [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-skl9/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
>    [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-skl1/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
>     - shard-iclb:         [FAIL][45] ([fdo#103167]) -> [PASS][46] +6 similar issues
>    [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
>    [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
> 
>   * igt@kms_plane@pixel-format-pipe-a-planes-source-clamping:
>     - shard-iclb:         [INCOMPLETE][47] ([fdo#107713] / [fdo#110036 ]) -> [PASS][48]
>    [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb4/igt@kms_plane@pixel-format-pipe-a-planes-source-clamping.html
>    [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb6/igt@kms_plane@pixel-format-pipe-a-planes-source-clamping.html
> 
>   * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
>     - shard-skl:          [INCOMPLETE][49] ([fdo#104108]) -> [PASS][50] +1 similar issue
>    [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-skl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
>    [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-skl2/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
> 
>   * igt@kms_psr@psr2_cursor_render:
>     - shard-iclb:         [SKIP][51] ([fdo#109441]) -> [PASS][52] +6 similar issues
>    [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb5/igt@kms_psr@psr2_cursor_render.html
>    [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
> 
>   * igt@kms_setmode@basic:
>     - shard-skl:          [FAIL][53] ([fdo#99912]) -> [PASS][54]
>    [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-skl2/igt@kms_setmode@basic.html
>    [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-skl7/igt@kms_setmode@basic.html
> 
>   * igt@perf@polling:
>     - shard-skl:          [FAIL][55] ([fdo#110728]) -> [PASS][56]
>    [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-skl4/igt@perf@polling.html
>    [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-skl10/igt@perf@polling.html
> 
>   * igt@prime_vgem@fence-wait-bsd2:
>     - shard-iclb:         [SKIP][57] ([fdo#109276]) -> [PASS][58] +13 similar issues
>    [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb5/igt@prime_vgem@fence-wait-bsd2.html
>    [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb2/igt@prime_vgem@fence-wait-bsd2.html
> 
>   
> #### Warnings ####
> 
>   * igt@gem_ctx_isolation@vcs1-nonpriv:
>     - shard-iclb:         [FAIL][59] ([fdo#111329]) -> [SKIP][60] ([fdo#109276])
>    [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb1/igt@gem_ctx_isolation@vcs1-nonpriv.html
>    [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb8/igt@gem_ctx_isolation@vcs1-nonpriv.html
> 
>   * igt@gem_exec_params@invalid-bsd-ring:
>     - shard-iclb:         [SKIP][61] ([fdo#109276]) -> [FAIL][62] ([fdo#111328])
>    [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb3/igt@gem_exec_params@invalid-bsd-ring.html
>    [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb4/igt@gem_exec_params@invalid-bsd-ring.html
> 
>   * igt@gem_exec_schedule@independent-bsd2:
>     - shard-iclb:         [SKIP][63] ([fdo#109276]) -> [FAIL][64] ([fdo#110946])
>    [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb5/igt@gem_exec_schedule@independent-bsd2.html
>    [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb2/igt@gem_exec_schedule@independent-bsd2.html
> 
>   * igt@gem_mocs_settings@mocs-rc6-bsd2:
>     - shard-iclb:         [SKIP][65] ([fdo#109276]) -> [FAIL][66] ([fdo#111330])
>    [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb5/igt@gem_mocs_settings@mocs-rc6-bsd2.html
>    [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb2/igt@gem_mocs_settings@mocs-rc6-bsd2.html
> 
>   * igt@kms_dp_dsc@basic-dsc-enable-edp:
>     - shard-iclb:         [SKIP][67] ([fdo#109349]) -> [DMESG-WARN][68] ([fdo#107724])
>    [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb6/igt@kms_dp_dsc@basic-dsc-enable-edp.html
>    [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
> 
>   
>   {name}: This element is suppressed. This means it is ignored when computing
>           the status of the difference (SUCCESS, WARNING, or FAILURE).
> 
>   [fdo#102250]: https://bugs.freedesktop.org/show_bug.cgi?id=102250
>   [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
>   [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
>   [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
>   [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
>   [fdo#105483]: https://bugs.freedesktop.org/show_bug.cgi?id=105483
>   [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
>   [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
>   [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
>   [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
>   [fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
>   [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
>   [fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
>   [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
>   [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
>   [fdo#110036 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110036 
>   [fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
>   [fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
>   [fdo#110946]: https://bugs.freedesktop.org/show_bug.cgi?id=110946
>   [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
>   [fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
>   [fdo#111328]: https://bugs.freedesktop.org/show_bug.cgi?id=111328
>   [fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329
>   [fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
>   [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
> 
> 
> Participating hosts (10 -> 10)
> ------------------------------
> 
>   No changes in participating hosts
> 
> 
> Build changes
> -------------
> 
>   * CI: CI-20190529 -> None
>   * Linux: CI_DRM_6657 -> Patchwork_13923
> 
>   CI-20190529: 20190529
>   CI_DRM_6657: 00952d067bbbb0342b696191e1f8180ed6abb641 @ git://anongit.freedesktop.org/gfx-ci/linux
>   IGT_5125: 35d81d01b1599b4bc4df0e09e25f6f531eed4f8a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>   Patchwork_13923: 0c603f9e79e65c9282767f6f23398f0fe40aeec9 @ 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_13923/
Imre Deak Aug. 20, 2019, 1:15 p.m. UTC | #2
On Fri, Aug 09, 2019 at 11:47:12AM +0300, Imre Deak wrote:
> On Fri, Aug 09, 2019 at 06:55:53AM +0000, Patchwork wrote:
> > == Series Details ==
> > 
> > Series: drm/i915: Fix HW readout for crtc_clock in HDMI mode (rev2)
> > URL   : https://patchwork.freedesktop.org/series/64909/
> > State : failure

Pushed to -dinq, thanks for the review.

> > 
> > == Summary ==
> > 
> > CI Bug Log - changes from CI_DRM_6657_full -> Patchwork_13923_full
> > ====================================================
> > 
> > Summary
> > -------
> > 
> >   **FAILURE**
> > 
> >   Serious unknown changes coming with Patchwork_13923_full absolutely need to be
> >   verified manually.
> >   
> >   If you think the reported changes have nothing to do with the changes
> >   introduced in Patchwork_13923_full, please notify your bug team to allow them
> >   to document this new failure mode, which will reduce false positives in CI.
> > 
> >   
> > 
> > Possible new issues
> > -------------------
> > 
> >   Here are the unknown changes that may have been introduced in Patchwork_13923_full:
> > 
> > ### IGT changes ###
> > 
> > #### Possible regressions ####
> > 
> >   * igt@prime_busy@wait-hang-blt:
> >     - shard-apl:          [PASS][1] -> [DMESG-WARN][2]
> >    [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-apl2/igt@prime_busy@wait-hang-blt.html
> >    [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-apl7/igt@prime_busy@wait-hang-blt.html
> 
> Unrelated existing issue:
> *ERROR* Failed to enable hdcp (-110)
> https://bugs.freedesktop.org/show_bug.cgi?id=111317
> 
> I asked Lakshmi to update the bug filter.
> 
> > Known issues
> > ------------
> > 
> >   Here are the changes found in Patchwork_13923_full that come from known issues:
> > 
> > ### IGT changes ###
> > 
> > #### Issues hit ####
> > 
> >   * igt@gem_ctx_isolation@rcs0-s3:
> >     - shard-apl:          [PASS][3] -> [DMESG-WARN][4] ([fdo#108566]) +7 similar issues
> >    [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-apl1/igt@gem_ctx_isolation@rcs0-s3.html
> >    [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-apl6/igt@gem_ctx_isolation@rcs0-s3.html
> > 
> >   * igt@gem_ctx_isolation@vcs1-s3:
> >     - shard-kbl:          [PASS][5] -> [INCOMPLETE][6] ([fdo#103665])
> >    [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-kbl3/igt@gem_ctx_isolation@vcs1-s3.html
> >    [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-kbl3/igt@gem_ctx_isolation@vcs1-s3.html
> > 
> >   * igt@gem_exec_schedule@in-order-bsd:
> >     - shard-iclb:         [PASS][7] -> [SKIP][8] ([fdo#111325]) +3 similar issues
> >    [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb5/igt@gem_exec_schedule@in-order-bsd.html
> >    [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb2/igt@gem_exec_schedule@in-order-bsd.html
> > 
> >   * igt@gem_exec_schedule@preempt-contexts-bsd2:
> >     - shard-iclb:         [PASS][9] -> [SKIP][10] ([fdo#109276]) +12 similar issues
> >    [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb1/igt@gem_exec_schedule@preempt-contexts-bsd2.html
> >    [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb5/igt@gem_exec_schedule@preempt-contexts-bsd2.html
> > 
> >   * igt@gem_exec_suspend@basic-s3:
> >     - shard-kbl:          [PASS][11] -> [DMESG-WARN][12] ([fdo#108566]) +4 similar issues
> >    [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-kbl2/igt@gem_exec_suspend@basic-s3.html
> >    [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-kbl6/igt@gem_exec_suspend@basic-s3.html
> > 
> >   * igt@kms_flip@flip-vs-expired-vblank:
> >     - shard-glk:          [PASS][13] -> [FAIL][14] ([fdo#105363]) +1 similar issue
> >    [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-glk1/igt@kms_flip@flip-vs-expired-vblank.html
> >    [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-glk7/igt@kms_flip@flip-vs-expired-vblank.html
> > 
> >   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render:
> >     - shard-iclb:         [PASS][15] -> [FAIL][16] ([fdo#103167]) +5 similar issues
> >    [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render.html
> >    [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render.html
> > 
> >   * igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
> >     - shard-skl:          [PASS][17] -> [FAIL][18] ([fdo#108145])
> >    [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
> >    [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
> > 
> >   * igt@kms_psr2_su@frontbuffer:
> >     - shard-iclb:         [PASS][19] -> [SKIP][20] ([fdo#109642] / [fdo#111068])
> >    [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
> >    [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb4/igt@kms_psr2_su@frontbuffer.html
> > 
> >   * igt@kms_psr@psr2_primary_mmap_cpu:
> >     - shard-iclb:         [PASS][21] -> [SKIP][22] ([fdo#109441]) +3 similar issues
> >    [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
> >    [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb4/igt@kms_psr@psr2_primary_mmap_cpu.html
> > 
> >   * igt@perf@oa-exponents:
> >     - shard-glk:          [PASS][23] -> [FAIL][24] ([fdo#105483])
> >    [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-glk8/igt@perf@oa-exponents.html
> >    [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-glk4/igt@perf@oa-exponents.html
> > 
> >   
> > #### Possible fixes ####
> > 
> >   * igt@gem_exec_balancer@smoke:
> >     - shard-iclb:         [SKIP][25] ([fdo#110854]) -> [PASS][26]
> >    [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb5/igt@gem_exec_balancer@smoke.html
> >    [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb2/igt@gem_exec_balancer@smoke.html
> > 
> >   * igt@gem_exec_schedule@reorder-wide-bsd:
> >     - shard-iclb:         [SKIP][27] ([fdo#111325]) -> [PASS][28] +5 similar issues
> >    [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb1/igt@gem_exec_schedule@reorder-wide-bsd.html
> >    [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb3/igt@gem_exec_schedule@reorder-wide-bsd.html
> > 
> >   * igt@gem_exec_schedule@semaphore-noskip:
> >     - shard-iclb:         [FAIL][29] ([fdo#110946]) -> [PASS][30]
> >    [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb1/igt@gem_exec_schedule@semaphore-noskip.html
> >    [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb3/igt@gem_exec_schedule@semaphore-noskip.html
> > 
> >   * igt@i915_pm_rpm@system-suspend-execbuf:
> >     - shard-iclb:         [INCOMPLETE][31] ([fdo#107713] / [fdo#108840]) -> [PASS][32]
> >    [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb2/igt@i915_pm_rpm@system-suspend-execbuf.html
> >    [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb3/igt@i915_pm_rpm@system-suspend-execbuf.html
> > 
> >   * igt@i915_pm_rps@reset:
> >     - shard-skl:          [FAIL][33] ([fdo#102250]) -> [PASS][34]
> >    [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-skl8/igt@i915_pm_rps@reset.html
> >    [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-skl3/igt@i915_pm_rps@reset.html
> > 
> >   * igt@i915_suspend@fence-restore-tiled2untiled:
> >     - shard-apl:          [DMESG-WARN][35] ([fdo#108566]) -> [PASS][36] +3 similar issues
> >    [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-apl3/igt@i915_suspend@fence-restore-tiled2untiled.html
> >    [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-apl5/igt@i915_suspend@fence-restore-tiled2untiled.html
> > 
> >   * igt@kms_cursor_crc@pipe-a-cursor-suspend:
> >     - shard-kbl:          [INCOMPLETE][37] ([fdo#103665]) -> [PASS][38]
> >    [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-kbl1/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
> >    [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-kbl1/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
> > 
> >   * igt@kms_cursor_crc@pipe-c-cursor-suspend:
> >     - shard-kbl:          [DMESG-WARN][39] ([fdo#108566]) -> [PASS][40] +2 similar issues
> >    [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-kbl4/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
> >    [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-kbl1/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
> > 
> >   * igt@kms_flip@basic-flip-vs-wf_vblank:
> >     - shard-apl:          [DMESG-WARN][41] -> [PASS][42]
> >    [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-apl4/igt@kms_flip@basic-flip-vs-wf_vblank.html
> >    [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-apl4/igt@kms_flip@basic-flip-vs-wf_vblank.html
> > 
> >   * igt@kms_flip@flip-vs-expired-vblank-interruptible:
> >     - shard-skl:          [FAIL][43] ([fdo#105363]) -> [PASS][44]
> >    [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-skl9/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
> >    [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-skl1/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
> > 
> >   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
> >     - shard-iclb:         [FAIL][45] ([fdo#103167]) -> [PASS][46] +6 similar issues
> >    [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
> >    [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
> > 
> >   * igt@kms_plane@pixel-format-pipe-a-planes-source-clamping:
> >     - shard-iclb:         [INCOMPLETE][47] ([fdo#107713] / [fdo#110036 ]) -> [PASS][48]
> >    [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb4/igt@kms_plane@pixel-format-pipe-a-planes-source-clamping.html
> >    [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb6/igt@kms_plane@pixel-format-pipe-a-planes-source-clamping.html
> > 
> >   * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
> >     - shard-skl:          [INCOMPLETE][49] ([fdo#104108]) -> [PASS][50] +1 similar issue
> >    [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-skl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
> >    [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-skl2/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
> > 
> >   * igt@kms_psr@psr2_cursor_render:
> >     - shard-iclb:         [SKIP][51] ([fdo#109441]) -> [PASS][52] +6 similar issues
> >    [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb5/igt@kms_psr@psr2_cursor_render.html
> >    [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
> > 
> >   * igt@kms_setmode@basic:
> >     - shard-skl:          [FAIL][53] ([fdo#99912]) -> [PASS][54]
> >    [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-skl2/igt@kms_setmode@basic.html
> >    [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-skl7/igt@kms_setmode@basic.html
> > 
> >   * igt@perf@polling:
> >     - shard-skl:          [FAIL][55] ([fdo#110728]) -> [PASS][56]
> >    [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-skl4/igt@perf@polling.html
> >    [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-skl10/igt@perf@polling.html
> > 
> >   * igt@prime_vgem@fence-wait-bsd2:
> >     - shard-iclb:         [SKIP][57] ([fdo#109276]) -> [PASS][58] +13 similar issues
> >    [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb5/igt@prime_vgem@fence-wait-bsd2.html
> >    [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb2/igt@prime_vgem@fence-wait-bsd2.html
> > 
> >   
> > #### Warnings ####
> > 
> >   * igt@gem_ctx_isolation@vcs1-nonpriv:
> >     - shard-iclb:         [FAIL][59] ([fdo#111329]) -> [SKIP][60] ([fdo#109276])
> >    [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb1/igt@gem_ctx_isolation@vcs1-nonpriv.html
> >    [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb8/igt@gem_ctx_isolation@vcs1-nonpriv.html
> > 
> >   * igt@gem_exec_params@invalid-bsd-ring:
> >     - shard-iclb:         [SKIP][61] ([fdo#109276]) -> [FAIL][62] ([fdo#111328])
> >    [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb3/igt@gem_exec_params@invalid-bsd-ring.html
> >    [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb4/igt@gem_exec_params@invalid-bsd-ring.html
> > 
> >   * igt@gem_exec_schedule@independent-bsd2:
> >     - shard-iclb:         [SKIP][63] ([fdo#109276]) -> [FAIL][64] ([fdo#110946])
> >    [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb5/igt@gem_exec_schedule@independent-bsd2.html
> >    [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb2/igt@gem_exec_schedule@independent-bsd2.html
> > 
> >   * igt@gem_mocs_settings@mocs-rc6-bsd2:
> >     - shard-iclb:         [SKIP][65] ([fdo#109276]) -> [FAIL][66] ([fdo#111330])
> >    [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb5/igt@gem_mocs_settings@mocs-rc6-bsd2.html
> >    [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb2/igt@gem_mocs_settings@mocs-rc6-bsd2.html
> > 
> >   * igt@kms_dp_dsc@basic-dsc-enable-edp:
> >     - shard-iclb:         [SKIP][67] ([fdo#109349]) -> [DMESG-WARN][68] ([fdo#107724])
> >    [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6657/shard-iclb6/igt@kms_dp_dsc@basic-dsc-enable-edp.html
> >    [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13923/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
> > 
> >   
> >   {name}: This element is suppressed. This means it is ignored when computing
> >           the status of the difference (SUCCESS, WARNING, or FAILURE).
> > 
> >   [fdo#102250]: https://bugs.freedesktop.org/show_bug.cgi?id=102250
> >   [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
> >   [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
> >   [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
> >   [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
> >   [fdo#105483]: https://bugs.freedesktop.org/show_bug.cgi?id=105483
> >   [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
> >   [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
> >   [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
> >   [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
> >   [fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
> >   [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
> >   [fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
> >   [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
> >   [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
> >   [fdo#110036 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110036 
> >   [fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
> >   [fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
> >   [fdo#110946]: https://bugs.freedesktop.org/show_bug.cgi?id=110946
> >   [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
> >   [fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
> >   [fdo#111328]: https://bugs.freedesktop.org/show_bug.cgi?id=111328
> >   [fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329
> >   [fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
> >   [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
> > 
> > 
> > Participating hosts (10 -> 10)
> > ------------------------------
> > 
> >   No changes in participating hosts
> > 
> > 
> > Build changes
> > -------------
> > 
> >   * CI: CI-20190529 -> None
> >   * Linux: CI_DRM_6657 -> Patchwork_13923
> > 
> >   CI-20190529: 20190529
> >   CI_DRM_6657: 00952d067bbbb0342b696191e1f8180ed6abb641 @ git://anongit.freedesktop.org/gfx-ci/linux
> >   IGT_5125: 35d81d01b1599b4bc4df0e09e25f6f531eed4f8a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
> >   Patchwork_13923: 0c603f9e79e65c9282767f6f23398f0fe40aeec9 @ 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_13923/
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index aa5b2440513c..65396f913f56 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -1467,10 +1467,11 @@  static void ddi_dotclock_get(struct intel_crtc_state *pipe_config)
 	else if (intel_crtc_has_dp_encoder(pipe_config))
 		dotclock = intel_dotclock_calculate(pipe_config->port_clock,
 						    &pipe_config->dp_m_n);
-	else if (pipe_config->has_hdmi_sink && pipe_config->pipe_bpp == 36)
-		dotclock = pipe_config->port_clock * 2 / 3;
-	else
-		dotclock = pipe_config->port_clock;
+	else if (pipe_config->has_hdmi_sink) {
+		int bpp = max(24, pipe_config->pipe_bpp);
+
+		dotclock = pipe_config->port_clock * 24 / bpp;
+	}
 
 	if (pipe_config->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
 	    !intel_crtc_has_dp_encoder(pipe_config))
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index a88ec9aa9ca0..21cb7ee34d45 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -866,7 +866,7 @@  struct intel_crtc_state {
 
 	/*
 	 * Frequence the dpll for the port should run at. Differs from the
-	 * adjusted dotclock e.g. for DP or 12bpc hdmi mode. This is also
+	 * adjusted dotclock e.g. for DP or 10/12bpc hdmi mode. This is also
 	 * already multiplied by pixel_multiplier.
 	 */
 	int port_clock;