diff mbox series

drm/i915/ehl: Update voltage level checks

Message ID 20191118164412.26216-1-matthew.d.roper@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915/ehl: Update voltage level checks | expand

Commit Message

Matt Roper Nov. 18, 2019, 4:44 p.m. UTC
The bspec was recently updated with new cdclk -> voltage level tables to
accomodate the new 324/326.4 cdclk values.

Bspec: 21809
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Vivek Kasireddy <vivek.kasireddy@intel.com>
Cc: Bob Paauwe <bob.j.paauwe@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
There are some platform tagging issues on this bspec page and multiple
tables are actually tagged with the EHL label, but the bspec changelog
makes it pretty clear which table we're supposed to be using (plus the
other tables don't match the set of cdclks supported by the platform).

 drivers/gpu/drm/i915/display/intel_cdclk.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Matt Roper Nov. 18, 2019, 4:50 p.m. UTC | #1
On Mon, Nov 18, 2019 at 08:44:12AM -0800, Matt Roper wrote:
> The bspec was recently updated with new cdclk -> voltage level tables to
> accomodate the new 324/326.4 cdclk values.
> 
> Bspec: 21809
> Cc: José Roberto de Souza <jose.souza@intel.com>
> Cc: Vivek Kasireddy <vivek.kasireddy@intel.com>
> Cc: Bob Paauwe <bob.j.paauwe@intel.com>
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>

And

Fixes: 63c9dae71dc5 ("drm/i915/ehl: Add voltage level requirement table")

since using the old table could result in us requesting too low a
voltage level for the highest cdclk values.


Matt

> ---
> There are some platform tagging issues on this bspec page and multiple
> tables are actually tagged with the EHL label, but the bspec changelog
> makes it pretty clear which table we're supposed to be using (plus the
> other tables don't match the set of cdclks supported by the platform).
> 
>  drivers/gpu/drm/i915/display/intel_cdclk.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index 8b702317557e..7d1ab1e5b7c3 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -1273,7 +1273,9 @@ static u8 icl_calc_voltage_level(int cdclk)
>  
>  static u8 ehl_calc_voltage_level(int cdclk)
>  {
> -	if (cdclk > 312000)
> +	if (cdclk > 326400)
> +		return 3;
> +	else if (cdclk > 312000)
>  		return 2;
>  	else if (cdclk > 180000)
>  		return 1;
> -- 
> 2.21.0
>
Souza, Jose Nov. 18, 2019, 7:02 p.m. UTC | #2
On Mon, 2019-11-18 at 08:50 -0800, Matt Roper wrote:
> On Mon, Nov 18, 2019 at 08:44:12AM -0800, Matt Roper wrote:
> > The bspec was recently updated with new cdclk -> voltage level
> > tables to
> > accomodate the new 324/326.4 cdclk values.
> > 
> > Bspec: 21809
> > Cc: José Roberto de Souza <jose.souza@intel.com>
> > Cc: Vivek Kasireddy <vivek.kasireddy@intel.com>
> > Cc: Bob Paauwe <bob.j.paauwe@intel.com>
> > Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> 
> And
> 
> Fixes: 63c9dae71dc5 ("drm/i915/ehl: Add voltage level requirement
> table")
> 
> since using the old table could result in us requesting too low a
> voltage level for the highest cdclk values.


Reviewed-by: José Roberto de Souza <jose.souza@intel.com>


> 
> 
> Matt
> 
> > ---
> > There are some platform tagging issues on this bspec page and
> > multiple
> > tables are actually tagged with the EHL label, but the bspec
> > changelog
> > makes it pretty clear which table we're supposed to be using (plus
> > the
> > other tables don't match the set of cdclks supported by the
> > platform).
> > 
> >  drivers/gpu/drm/i915/display/intel_cdclk.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c
> > b/drivers/gpu/drm/i915/display/intel_cdclk.c
> > index 8b702317557e..7d1ab1e5b7c3 100644
> > --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> > +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> > @@ -1273,7 +1273,9 @@ static u8 icl_calc_voltage_level(int cdclk)
> >  
> >  static u8 ehl_calc_voltage_level(int cdclk)
> >  {
> > -	if (cdclk > 312000)
> > +	if (cdclk > 326400)
> > +		return 3;
> > +	else if (cdclk > 312000)
> >  		return 2;
> >  	else if (cdclk > 180000)
> >  		return 1;
> > -- 
> > 2.21.0
> >
Matt Roper Nov. 19, 2019, 5:08 a.m. UTC | #3
On Tue, Nov 19, 2019 at 04:37:49AM +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915/ehl: Update voltage level checks
> URL   : https://patchwork.freedesktop.org/series/69634/
> State : success
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_7365_full -> Patchwork_15317_full
> ====================================================
> 
> Summary
> -------
> 
>   **SUCCESS**
> 
>   No regressions found.
> 

Applied to dinq.  Thanks Jose for the review.


Matt

>   
> 
> Known issues
> ------------
> 
>   Here are the changes found in Patchwork_15317_full that come from known issues:
> 
> ### IGT changes ###
> 
> #### Issues hit ####
> 
>   * igt@gem_ctx_isolation@vcs1-dirty-create:
>     - shard-iclb:         [PASS][1] -> [SKIP][2] ([fdo#109276] / [fdo#112080]) +4 similar issues
>    [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb4/igt@gem_ctx_isolation@vcs1-dirty-create.html
>    [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb5/igt@gem_ctx_isolation@vcs1-dirty-create.html
> 
>   * igt@gem_ctx_shared@q-smoketest-all:
>     - shard-tglb:         [PASS][3] -> [INCOMPLETE][4] ([fdo#111735])
>    [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-tglb4/igt@gem_ctx_shared@q-smoketest-all.html
>    [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-tglb4/igt@gem_ctx_shared@q-smoketest-all.html
> 
>   * igt@gem_exec_schedule@promotion-bsd1:
>     - shard-iclb:         [PASS][5] -> [SKIP][6] ([fdo#109276]) +11 similar issues
>    [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb1/igt@gem_exec_schedule@promotion-bsd1.html
>    [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb6/igt@gem_exec_schedule@promotion-bsd1.html
> 
>   * igt@gem_exec_schedule@reorder-wide-bsd:
>     - shard-iclb:         [PASS][7] -> [SKIP][8] ([fdo#112146]) +7 similar issues
>    [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb6/igt@gem_exec_schedule@reorder-wide-bsd.html
>    [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb1/igt@gem_exec_schedule@reorder-wide-bsd.html
> 
>   * igt@gem_exec_schedule@smoketest-vebox:
>     - shard-tglb:         [PASS][9] -> [INCOMPLETE][10] ([fdo#111998])
>    [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-tglb4/igt@gem_exec_schedule@smoketest-vebox.html
>    [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-tglb6/igt@gem_exec_schedule@smoketest-vebox.html
> 
>   * igt@gem_exec_suspend@basic-s3:
>     - shard-tglb:         [PASS][11] -> [INCOMPLETE][12] ([fdo#111736] / [fdo#111850])
>    [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-tglb6/igt@gem_exec_suspend@basic-s3.html
>    [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-tglb5/igt@gem_exec_suspend@basic-s3.html
> 
>   * igt@gem_userptr_blits@map-fixed-invalidate-busy-gup:
>     - shard-hsw:          [PASS][13] -> [DMESG-WARN][14] ([fdo#111870])
>    [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-hsw8/igt@gem_userptr_blits@map-fixed-invalidate-busy-gup.html
>    [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-hsw1/igt@gem_userptr_blits@map-fixed-invalidate-busy-gup.html
> 
>   * igt@gem_userptr_blits@sync-unmap:
>     - shard-snb:          [PASS][15] -> [DMESG-WARN][16] ([fdo#111870]) +1 similar issue
>    [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-snb5/igt@gem_userptr_blits@sync-unmap.html
>    [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-snb7/igt@gem_userptr_blits@sync-unmap.html
> 
>   * igt@kms_color@pipe-a-ctm-green-to-red:
>     - shard-skl:          [PASS][17] -> [FAIL][18] ([fdo#107201])
>    [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-skl2/igt@kms_color@pipe-a-ctm-green-to-red.html
>    [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-skl4/igt@kms_color@pipe-a-ctm-green-to-red.html
> 
>   * igt@kms_flip@flip-vs-expired-vblank:
>     - shard-skl:          [PASS][19] -> [FAIL][20] ([fdo#105363]) +1 similar issue
>    [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-skl8/igt@kms_flip@flip-vs-expired-vblank.html
>    [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-skl10/igt@kms_flip@flip-vs-expired-vblank.html
> 
>   * igt@kms_flip@flip-vs-suspend-interruptible:
>     - shard-tglb:         [PASS][21] -> [INCOMPLETE][22] ([fdo#111832] / [fdo#111850] / [fdo#112031])
>    [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-tglb9/igt@kms_flip@flip-vs-suspend-interruptible.html
>    [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-tglb1/igt@kms_flip@flip-vs-suspend-interruptible.html
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
>     - shard-iclb:         [PASS][23] -> [FAIL][24] ([fdo#103167]) +4 similar issues
>    [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
>    [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt:
>     - shard-tglb:         [PASS][25] -> [FAIL][26] ([fdo#103167]) +2 similar issues
>    [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-tglb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt.html
>    [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-tglb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt.html
> 
>   * igt@kms_frontbuffer_tracking@fbc-suspend:
>     - shard-kbl:          [PASS][27] -> [DMESG-WARN][28] ([fdo#108566]) +4 similar issues
>    [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-kbl6/igt@kms_frontbuffer_tracking@fbc-suspend.html
>    [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-kbl4/igt@kms_frontbuffer_tracking@fbc-suspend.html
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-suspend:
>     - shard-tglb:         [PASS][29] -> [INCOMPLETE][30] ([fdo#111832] / [fdo#111850] / [fdo#111884])
>    [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-tglb9/igt@kms_frontbuffer_tracking@fbcpsr-suspend.html
>    [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-tglb3/igt@kms_frontbuffer_tracking@fbcpsr-suspend.html
> 
>   * igt@kms_frontbuffer_tracking@psr-1p-rte:
>     - shard-skl:          [PASS][31] -> [FAIL][32] ([fdo#103167])
>    [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-skl2/igt@kms_frontbuffer_tracking@psr-1p-rte.html
>    [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-skl4/igt@kms_frontbuffer_tracking@psr-1p-rte.html
> 
>   * igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
>     - shard-skl:          [PASS][33] -> [FAIL][34] ([fdo#108145])
>    [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-skl2/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
>    [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-skl4/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
> 
>   * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
>     - shard-skl:          [PASS][35] -> [FAIL][36] ([fdo#108145] / [fdo#110403])
>    [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
>    [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
> 
>   * igt@kms_psr@psr2_primary_page_flip:
>     - shard-iclb:         [PASS][37] -> [SKIP][38] ([fdo#109441]) +1 similar issue
>    [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
>    [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb1/igt@kms_psr@psr2_primary_page_flip.html
> 
>   * igt@kms_setmode@basic:
>     - shard-skl:          [PASS][39] -> [FAIL][40] ([fdo#99912])
>    [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-skl1/igt@kms_setmode@basic.html
>    [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-skl3/igt@kms_setmode@basic.html
>     - shard-hsw:          [PASS][41] -> [FAIL][42] ([fdo#99912])
>    [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-hsw6/igt@kms_setmode@basic.html
>    [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-hsw1/igt@kms_setmode@basic.html
> 
>   * igt@kms_universal_plane@universal-plane-gen9-features-pipe-a:
>     - shard-kbl:          [PASS][43] -> [DMESG-WARN][44] ([fdo#103558] / [fdo#105602]) +41 similar issues
>    [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-kbl4/igt@kms_universal_plane@universal-plane-gen9-features-pipe-a.html
>    [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-kbl7/igt@kms_universal_plane@universal-plane-gen9-features-pipe-a.html
> 
>   * igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
>     - shard-tglb:         [PASS][45] -> [INCOMPLETE][46] ([fdo#111850])
>    [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-tglb7/igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend.html
>    [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-tglb1/igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend.html
> 
>   * igt@kms_vblank@pipe-c-ts-continuation-suspend:
>     - shard-apl:          [PASS][47] -> [DMESG-WARN][48] ([fdo#108566])
>    [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-apl7/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
>    [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-apl4/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
> 
>   * igt@perf_pmu@init-busy-vcs1:
>     - shard-iclb:         [PASS][49] -> [SKIP][50] ([fdo#112080]) +9 similar issues
>    [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb2/igt@perf_pmu@init-busy-vcs1.html
>    [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb8/igt@perf_pmu@init-busy-vcs1.html
> 
>   
> #### Possible fixes ####
> 
>   * igt@gem_ctx_isolation@vcs1-none:
>     - shard-iclb:         [SKIP][51] ([fdo#109276] / [fdo#112080]) -> [PASS][52] +2 similar issues
>    [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb6/igt@gem_ctx_isolation@vcs1-none.html
>    [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb1/igt@gem_ctx_isolation@vcs1-none.html
> 
>   * igt@gem_ctx_shared@exec-single-timeline-bsd:
>     - shard-iclb:         [SKIP][53] ([fdo#110841]) -> [PASS][54]
>    [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb1/igt@gem_ctx_shared@exec-single-timeline-bsd.html
>    [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb6/igt@gem_ctx_shared@exec-single-timeline-bsd.html
> 
>   * igt@gem_ctx_switch@vcs1-heavy-queue:
>     - shard-iclb:         [SKIP][55] ([fdo#112080]) -> [PASS][56] +4 similar issues
>    [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb6/igt@gem_ctx_switch@vcs1-heavy-queue.html
>    [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb1/igt@gem_ctx_switch@vcs1-heavy-queue.html
> 
>   * igt@gem_exec_nop@basic-series:
>     - shard-tglb:         [INCOMPLETE][57] ([fdo#111747]) -> [PASS][58]
>    [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-tglb6/igt@gem_exec_nop@basic-series.html
>    [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-tglb7/igt@gem_exec_nop@basic-series.html
> 
>   * igt@gem_exec_parallel@basic:
>     - shard-tglb:         [INCOMPLETE][59] ([fdo#111887]) -> [PASS][60]
>    [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-tglb6/igt@gem_exec_parallel@basic.html
>    [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-tglb2/igt@gem_exec_parallel@basic.html
> 
>   * igt@gem_exec_schedule@preempt-other-chain-bsd:
>     - shard-iclb:         [SKIP][61] ([fdo#112146]) -> [PASS][62] +2 similar issues
>    [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb1/igt@gem_exec_schedule@preempt-other-chain-bsd.html
>    [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb6/igt@gem_exec_schedule@preempt-other-chain-bsd.html
> 
>   * igt@gem_exec_schedule@preempt-queue-bsd1:
>     - shard-iclb:         [SKIP][63] ([fdo#109276]) -> [PASS][64] +12 similar issues
>    [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb7/igt@gem_exec_schedule@preempt-queue-bsd1.html
>    [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb4/igt@gem_exec_schedule@preempt-queue-bsd1.html
> 
>   * igt@gem_userptr_blits@sync-unmap:
>     - shard-hsw:          [DMESG-WARN][65] ([fdo#111870]) -> [PASS][66]
>    [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-hsw4/igt@gem_userptr_blits@sync-unmap.html
>    [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-hsw5/igt@gem_userptr_blits@sync-unmap.html
> 
>   * igt@gem_userptr_blits@sync-unmap-after-close:
>     - shard-snb:          [DMESG-WARN][67] ([fdo#111870]) -> [PASS][68]
>    [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-snb1/igt@gem_userptr_blits@sync-unmap-after-close.html
>    [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-snb6/igt@gem_userptr_blits@sync-unmap-after-close.html
> 
>   * igt@i915_pm_dc@dc6-dpms:
>     - shard-iclb:         [FAIL][69] ([fdo#111830 ]) -> [PASS][70] +1 similar issue
>    [69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb3/igt@i915_pm_dc@dc6-dpms.html
>    [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb2/igt@i915_pm_dc@dc6-dpms.html
> 
>   * igt@kms_cursor_crc@pipe-c-cursor-suspend:
>     - shard-iclb:         [INCOMPLETE][71] ([fdo#107713]) -> [PASS][72]
>    [71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb8/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
>    [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb3/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
> 
>   * igt@kms_cursor_crc@pipe-d-cursor-suspend:
>     - shard-tglb:         [INCOMPLETE][73] ([fdo#111850]) -> [PASS][74] +1 similar issue
>    [73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-tglb5/igt@kms_cursor_crc@pipe-d-cursor-suspend.html
>    [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-tglb6/igt@kms_cursor_crc@pipe-d-cursor-suspend.html
> 
>   * igt@kms_flip@flip-vs-suspend-interruptible:
>     - shard-skl:          [INCOMPLETE][75] ([fdo#109507]) -> [PASS][76]
>    [75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-skl10/igt@kms_flip@flip-vs-suspend-interruptible.html
>    [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-skl9/igt@kms_flip@flip-vs-suspend-interruptible.html
>     - shard-snb:          [INCOMPLETE][77] ([fdo#105411]) -> [PASS][78]
>    [77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-snb1/igt@kms_flip@flip-vs-suspend-interruptible.html
>    [78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-snb2/igt@kms_flip@flip-vs-suspend-interruptible.html
> 
>   * igt@kms_flip@plain-flip-fb-recreate-interruptible:
>     - shard-skl:          [FAIL][79] ([fdo#100368]) -> [PASS][80]
>    [79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-skl10/igt@kms_flip@plain-flip-fb-recreate-interruptible.html
>    [80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-skl2/igt@kms_flip@plain-flip-fb-recreate-interruptible.html
> 
>   * igt@kms_flip_tiling@flip-x-tiled:
>     - shard-iclb:         [FAIL][81] ([fdo#108303]) -> [PASS][82]
>    [81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb4/igt@kms_flip_tiling@flip-x-tiled.html
>    [82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb4/igt@kms_flip_tiling@flip-x-tiled.html
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-plflip-blt:
>     - shard-tglb:         [FAIL][83] ([fdo#103167]) -> [PASS][84] +6 similar issues
>    [83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-tglb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-plflip-blt.html
>    [84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-tglb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-plflip-blt.html
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite:
>     - shard-iclb:         [FAIL][85] ([fdo#103167]) -> [PASS][86] +7 similar issues
>    [85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
>    [86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
> 
>   * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
>     - shard-kbl:          [DMESG-WARN][87] ([fdo#108566]) -> [PASS][88] +1 similar issue
>    [87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-kbl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
>    [88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-kbl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
> 
>   * igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
>     - shard-skl:          [FAIL][89] ([fdo#108145] / [fdo#110403]) -> [PASS][90]
>    [89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-skl5/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
>    [90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-skl10/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
> 
>   * igt@kms_psr@psr2_sprite_plane_move:
>     - shard-iclb:         [SKIP][91] ([fdo#109441]) -> [PASS][92] +2 similar issues
>    [91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb1/igt@kms_psr@psr2_sprite_plane_move.html
>    [92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
> 
>   * igt@kms_psr@suspend:
>     - shard-skl:          [INCOMPLETE][93] ([fdo#108972]) -> [PASS][94]
>    [93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-skl1/igt@kms_psr@suspend.html
>    [94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-skl1/igt@kms_psr@suspend.html
>     - shard-tglb:         [INCOMPLETE][95] ([fdo#111832] / [fdo#111850]) -> [PASS][96] +3 similar issues
>    [95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-tglb4/igt@kms_psr@suspend.html
>    [96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-tglb8/igt@kms_psr@suspend.html
> 
>   * igt@perf@short-reads:
>     - shard-kbl:          [TIMEOUT][97] ([fdo#103183]) -> [PASS][98]
>    [97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-kbl4/igt@perf@short-reads.html
>    [98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-kbl7/igt@perf@short-reads.html
>     - shard-glk:          [TIMEOUT][99] ([fdo#103183]) -> [PASS][100]
>    [99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-glk7/igt@perf@short-reads.html
>    [100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-glk7/igt@perf@short-reads.html
> 
>   
> #### Warnings ####
> 
>   * igt@gem_ctx_isolation@vcs1-nonpriv:
>     - shard-iclb:         [FAIL][101] ([fdo#111329]) -> [SKIP][102] ([fdo#109276] / [fdo#112080])
>    [101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb1/igt@gem_ctx_isolation@vcs1-nonpriv.html
>    [102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb7/igt@gem_ctx_isolation@vcs1-nonpriv.html
> 
>   * igt@gem_ctx_isolation@vcs1-nonpriv-switch:
>     - shard-iclb:         [SKIP][103] ([fdo#109276] / [fdo#112080]) -> [FAIL][104] ([fdo#111329])
>    [103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-iclb3/igt@gem_ctx_isolation@vcs1-nonpriv-switch.html
>    [104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-iclb4/igt@gem_ctx_isolation@vcs1-nonpriv-switch.html
> 
>   * igt@gem_ctx_isolation@vcs2-dirty-switch:
>     - shard-tglb:         [SKIP][105] ([fdo#111912] / [fdo#112080]) -> [SKIP][106] ([fdo#112080])
>    [105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-tglb5/igt@gem_ctx_isolation@vcs2-dirty-switch.html
>    [106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/shard-tglb9/igt@gem_ctx_isolation@vcs2-dirty-switch.html
> 
>   * igt@gem_persistent_relocs@forked-faulting-reloc-thrash-inactive:
>     - shard-apl:          [TIMEOUT][107] ([fdo#112113]) -> [DMESG-FAIL][108] ([fdo#112309])
>    [107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7365/shard-
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15317/index.html
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 8b702317557e..7d1ab1e5b7c3 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -1273,7 +1273,9 @@  static u8 icl_calc_voltage_level(int cdclk)
 
 static u8 ehl_calc_voltage_level(int cdclk)
 {
-	if (cdclk > 312000)
+	if (cdclk > 326400)
+		return 3;
+	else if (cdclk > 312000)
 		return 2;
 	else if (cdclk > 180000)
 		return 1;