* [PATCH] drm/i915: Account for CD2X divider in ICL+ vco calculation
@ 2019-09-05 21:38 Matt Roper
2019-09-05 22:34 ` ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Matt Roper @ 2019-09-05 21:38 UTC (permalink / raw)
To: intel-gfx; +Cc: Lucas De Marchi
When calculating the PLL ratio we were still assuming that the CD2X
divider is always /1. For the new frequencies that use a /2 divider
that needs to be accounted for, otherwise our VCO result will be twice
as large as it should be.
Fixes: 3d1da92baffe ("drm/i915: Add 324mhz and 326.4mhz cdclks for gen11+")
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
drivers/gpu/drm/i915/display/intel_cdclk.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 1329d3e60e26..55801aeefd1c 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -1794,6 +1794,7 @@ static int icl_calc_cdclk(int min_cdclk, unsigned int ref)
static int icl_calc_cdclk_pll_vco(struct drm_i915_private *dev_priv, int cdclk)
{
+ int cd2xdiv;
int ratio;
if (cdclk == dev_priv->cdclk.hw.bypass)
@@ -1805,27 +1806,37 @@ static int icl_calc_cdclk_pll_vco(struct drm_i915_private *dev_priv, int cdclk)
/* fall through */
case 172800:
case 307200:
- case 326400:
case 556800:
case 652800:
+ cd2xdiv = 1;
WARN_ON(dev_priv->cdclk.hw.ref != 19200 &&
dev_priv->cdclk.hw.ref != 38400);
break;
case 180000:
case 312000:
- case 324000:
case 552000:
case 648000:
+ cd2xdiv = 1;
WARN_ON(dev_priv->cdclk.hw.ref != 24000);
break;
case 192000:
+ cd2xdiv = 1;
WARN_ON(dev_priv->cdclk.hw.ref != 19200 &&
dev_priv->cdclk.hw.ref != 38400 &&
dev_priv->cdclk.hw.ref != 24000);
break;
+ case 326400:
+ cd2xdiv = 2;
+ WARN_ON(dev_priv->cdclk.hw.ref != 19200 &&
+ dev_priv->cdclk.hw.ref != 38400);
+ break;
+ case 324000:
+ cd2xdiv = 2;
+ WARN_ON(dev_priv->cdclk.hw.ref != 24000);
+ break;
}
- ratio = cdclk / (dev_priv->cdclk.hw.ref / 2);
+ ratio = cdclk / (dev_priv->cdclk.hw.ref / cd2xdiv / 2);
return dev_priv->cdclk.hw.ref * ratio;
}
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Account for CD2X divider in ICL+ vco calculation
2019-09-05 21:38 [PATCH] drm/i915: Account for CD2X divider in ICL+ vco calculation Matt Roper
@ 2019-09-05 22:34 ` Patchwork
2019-09-06 5:24 ` ✓ Fi.CI.IGT: " Patchwork
2019-09-06 11:20 ` [PATCH] " Ville Syrjälä
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2019-09-05 22:34 UTC (permalink / raw)
To: Matt Roper; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Account for CD2X divider in ICL+ vco calculation
URL : https://patchwork.freedesktop.org/series/66305/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6839 -> Patchwork_14298
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/
Known issues
------------
Here are the changes found in Patchwork_14298 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_basic@create-close:
- fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/fi-icl-u3/igt@gem_basic@create-close.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/fi-icl-u3/igt@gem_basic@create-close.html
#### Possible fixes ####
* igt@gem_ctx_create@basic-files:
- fi-icl-u3: [INCOMPLETE][3] ([fdo#107713] / [fdo#109100]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/fi-icl-u3/igt@gem_ctx_create@basic-files.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/fi-icl-u3/igt@gem_ctx_create@basic-files.html
* igt@i915_module_load@reload:
- fi-blb-e6850: [INCOMPLETE][5] ([fdo#107718]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/fi-blb-e6850/igt@i915_module_load@reload.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/fi-blb-e6850/igt@i915_module_load@reload.html
* igt@i915_selftest@live_requests:
- {fi-icl-guc}: [INCOMPLETE][7] ([fdo#107713] / [fdo#109644] / [fdo#110464]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/fi-icl-guc/igt@i915_selftest@live_requests.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/fi-icl-guc/igt@i915_selftest@live_requests.html
* igt@kms_busy@basic-flip-c:
- fi-skl-6770hq: [SKIP][9] ([fdo#109271] / [fdo#109278]) -> [PASS][10] +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/fi-skl-6770hq/igt@kms_busy@basic-flip-c.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/fi-skl-6770hq/igt@kms_busy@basic-flip-c.html
* igt@kms_flip@basic-flip-vs-dpms:
- fi-skl-6770hq: [SKIP][11] ([fdo#109271]) -> [PASS][12] +23 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/fi-skl-6770hq/igt@kms_flip@basic-flip-vs-dpms.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/fi-skl-6770hq/igt@kms_flip@basic-flip-vs-dpms.html
#### Warnings ####
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][13] ([fdo#111096]) -> [FAIL][14] ([fdo#111407])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109644]: https://bugs.freedesktop.org/show_bug.cgi?id=109644
[fdo#110464]: https://bugs.freedesktop.org/show_bug.cgi?id=110464
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
Participating hosts (55 -> 46)
------------------------------
Missing (9): fi-ilk-m540 fi-tgl-u fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6839 -> Patchwork_14298
CI-20190529: 20190529
CI_DRM_6839: d3d45e02f5adaa9b9dae212460b3d93cc6e28a4b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5171: 1911564805fe454919e8a5846534a0c1ef376a33 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14298: 7b9b0d4206bc47817065982f0301e5e85901cccc @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
7b9b0d4206bc drm/i915: Account for CD2X divider in ICL+ vco calculation
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: Account for CD2X divider in ICL+ vco calculation
2019-09-05 21:38 [PATCH] drm/i915: Account for CD2X divider in ICL+ vco calculation Matt Roper
2019-09-05 22:34 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2019-09-06 5:24 ` Patchwork
2019-09-06 11:20 ` [PATCH] " Ville Syrjälä
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2019-09-06 5:24 UTC (permalink / raw)
To: Matt Roper; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Account for CD2X divider in ICL+ vco calculation
URL : https://patchwork.freedesktop.org/series/66305/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6839_full -> Patchwork_14298_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_14298_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@rcs0-s3:
- shard-apl: [PASS][1] -> [DMESG-WARN][2] ([fdo#108566]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-apl4/igt@gem_ctx_isolation@rcs0-s3.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-apl5/igt@gem_ctx_isolation@rcs0-s3.html
* igt@gem_ctx_shared@exec-single-timeline-bsd1:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#109276]) +10 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-iclb1/igt@gem_ctx_shared@exec-single-timeline-bsd1.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-iclb6/igt@gem_ctx_shared@exec-single-timeline-bsd1.html
* igt@gem_ctx_switch@rcs0-queue:
- shard-glk: [PASS][5] -> [INCOMPLETE][6] ([fdo#103359] / [k.org#198133])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-glk5/igt@gem_ctx_switch@rcs0-queue.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-glk4/igt@gem_ctx_switch@rcs0-queue.html
* igt@gem_exec_schedule@out-order-bsd:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#111325])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-iclb5/igt@gem_exec_schedule@out-order-bsd.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-iclb1/igt@gem_exec_schedule@out-order-bsd.html
* igt@gem_softpin@noreloc-s3:
- shard-skl: [PASS][9] -> [INCOMPLETE][10] ([fdo#104108])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-skl10/igt@gem_softpin@noreloc-s3.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-skl4/igt@gem_softpin@noreloc-s3.html
* igt@gem_tiled_swapping@non-threaded:
- shard-apl: [PASS][11] -> [DMESG-WARN][12] ([fdo#108686])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-apl6/igt@gem_tiled_swapping@non-threaded.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-apl1/igt@gem_tiled_swapping@non-threaded.html
* igt@gem_workarounds@suspend-resume-context:
- shard-kbl: [PASS][13] -> [INCOMPLETE][14] ([fdo#103665])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-kbl6/igt@gem_workarounds@suspend-resume-context.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-kbl4/igt@gem_workarounds@suspend-resume-context.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: [PASS][15] -> [FAIL][16] ([fdo#103167]) +3 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-iclb7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt:
- shard-skl: [PASS][17] -> [FAIL][18] ([fdo#103167])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-skl3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-skl4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-gtt.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-snb: [PASS][19] -> [FAIL][20] ([fdo#103375]) +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-snb7/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-snb1/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][21] -> [FAIL][22] ([fdo#108145] / [fdo#110403])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-skl5/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-skl8/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][23] -> [SKIP][24] ([fdo#109441]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-iclb6/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- shard-apl: [PASS][25] -> [INCOMPLETE][26] ([fdo#103927])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-apl3/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-apl3/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html
* igt@kms_vblank@pipe-b-query-busy:
- shard-iclb: [PASS][27] -> [INCOMPLETE][28] ([fdo#107713])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-iclb8/igt@kms_vblank@pipe-b-query-busy.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-iclb1/igt@kms_vblank@pipe-b-query-busy.html
* igt@perf@polling:
- shard-skl: [PASS][29] -> [FAIL][30] ([fdo#110728])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-skl9/igt@perf@polling.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-skl1/igt@perf@polling.html
* igt@prime_busy@hang-vebox:
- shard-hsw: [PASS][31] -> [INCOMPLETE][32] ([fdo#103540])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-hsw7/igt@prime_busy@hang-vebox.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-hsw4/igt@prime_busy@hang-vebox.html
#### Possible fixes ####
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [SKIP][33] ([fdo#110841]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-iclb4/igt@gem_ctx_shared@exec-single-timeline-bsd.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-iclb7/igt@gem_ctx_shared@exec-single-timeline-bsd.html
* igt@gem_exec_balancer@bonded-imm:
- shard-apl: [INCOMPLETE][35] ([fdo#103927]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-apl8/igt@gem_exec_balancer@bonded-imm.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-apl1/igt@gem_exec_balancer@bonded-imm.html
* igt@gem_exec_schedule@preempt-contexts-bsd1:
- shard-iclb: [SKIP][37] ([fdo#109276]) -> [PASS][38] +5 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-iclb3/igt@gem_exec_schedule@preempt-contexts-bsd1.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-iclb2/igt@gem_exec_schedule@preempt-contexts-bsd1.html
* igt@gem_exec_schedule@reorder-wide-bsd:
- shard-iclb: [SKIP][39] ([fdo#111325]) -> [PASS][40] +2 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-iclb2/igt@gem_exec_schedule@reorder-wide-bsd.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-iclb6/igt@gem_exec_schedule@reorder-wide-bsd.html
* igt@gem_exec_suspend@basic-s4-devices:
- shard-hsw: [FAIL][41] ([fdo#111550]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-hsw7/igt@gem_exec_suspend@basic-s4-devices.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-hsw7/igt@gem_exec_suspend@basic-s4-devices.html
* igt@gem_mmap_gtt@hang:
- shard-iclb: [INCOMPLETE][43] ([fdo#107713]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-iclb7/igt@gem_mmap_gtt@hang.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-iclb5/igt@gem_mmap_gtt@hang.html
* igt@gem_tiled_swapping@non-threaded:
- shard-glk: [DMESG-WARN][45] ([fdo#108686]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-glk3/igt@gem_tiled_swapping@non-threaded.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-glk3/igt@gem_tiled_swapping@non-threaded.html
* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [DMESG-WARN][47] ([fdo#108566]) -> [PASS][48] +5 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-apl5/igt@gem_workarounds@suspend-resume-context.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-apl5/igt@gem_workarounds@suspend-resume-context.html
* igt@i915_pm_rpm@pm-tiling:
- shard-hsw: [FAIL][49] ([fdo#111548]) -> [PASS][50] +4 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-hsw7/igt@i915_pm_rpm@pm-tiling.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-hsw6/igt@i915_pm_rpm@pm-tiling.html
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [FAIL][51] ([fdo#103375]) -> [PASS][52] +4 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-apl3/igt@i915_suspend@fence-restore-tiled2untiled.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-apl3/igt@i915_suspend@fence-restore-tiled2untiled.html
* igt@i915_suspend@forcewake:
- shard-snb: [FAIL][53] ([fdo#103375]) -> [PASS][54] +3 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-snb5/igt@i915_suspend@forcewake.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-snb4/igt@i915_suspend@forcewake.html
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [FAIL][55] ([fdo#105363]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-skl9/igt@kms_flip@flip-vs-expired-vblank.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-skl1/igt@kms_flip@flip-vs-expired-vblank.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite:
- shard-iclb: [FAIL][57] ([fdo#103167]) -> [PASS][58] +3 similar issues
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-onoff:
- shard-skl: [FAIL][59] ([fdo#103167]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-skl7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-onoff.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-skl7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-onoff.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-hsw: [FAIL][61] ([fdo#103375]) -> [PASS][62] +4 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-hsw7/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-hsw2/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][63] ([fdo#108145]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
* igt@kms_psr@psr2_cursor_plane_onoff:
- shard-iclb: [SKIP][65] ([fdo#109441]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-iclb7/igt@kms_psr@psr2_cursor_plane_onoff.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-iclb2/igt@kms_psr@psr2_cursor_plane_onoff.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][67] ([fdo#99912]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-apl7/igt@kms_setmode@basic.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-apl6/igt@kms_setmode@basic.html
- shard-hsw: [FAIL][69] ([fdo#99912]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-hsw2/igt@kms_setmode@basic.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-hsw7/igt@kms_setmode@basic.html
* igt@perf_pmu@rc6:
- shard-apl: [FAIL][71] ([fdo#111545]) -> [PASS][72] +9 similar issues
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-apl3/igt@perf_pmu@rc6.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-apl3/igt@perf_pmu@rc6.html
#### Warnings ####
* igt@gem_mocs_settings@mocs-isolation-bsd2:
- shard-iclb: [SKIP][73] ([fdo#109276]) -> [FAIL][74] ([fdo#111330])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-iclb7/igt@gem_mocs_settings@mocs-isolation-bsd2.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-iclb2/igt@gem_mocs_settings@mocs-isolation-bsd2.html
* igt@i915_pm_rpm@modeset-lpsp-stress:
- shard-hsw: [FAIL][75] ([fdo#111548]) -> [SKIP][76] ([fdo#109271])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-hsw7/igt@i915_pm_rpm@modeset-lpsp-stress.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-hsw2/igt@i915_pm_rpm@modeset-lpsp-stress.html
* igt@i915_suspend@debugfs-reader:
- shard-apl: [FAIL][77] ([fdo#103375]) -> [DMESG-WARN][78] ([fdo#108566])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-apl3/igt@i915_suspend@debugfs-reader.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-apl3/igt@i915_suspend@debugfs-reader.html
* igt@perf_pmu@cpu-hotplug:
- shard-hsw: [TIMEOUT][79] ([fdo#111546]) -> [INCOMPLETE][80] ([fdo#103540])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6839/shard-hsw7/igt@perf_pmu@cpu-hotplug.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14298/shard-hsw4/igt@perf_pmu@cpu-hotplug.html
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
[fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
[fdo#111545]: https://bugs.freedesktop.org/show_bug.cgi?id=111545
[fdo#111546]: https://bugs.freedesktop.org/show_bug.cgi?id=111546
[fdo#111548]: https://bugs.freedesktop.org/show_bug.cgi?id=111548
[fdo#111550]: https://bugs.freedesktop.org/show_bug.cgi?id=111550
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6839 -> Patchwork_14298
CI-20190529: 20190529
CI_DRM_6839: d3d45e02f5adaa9b9dae212460b3d93cc6e28a4b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5171: 1911564805fe454919e8a5846534a0c1ef376a33 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14298: 7b9b0d4206bc47817065982f0301e5e85901cccc @ 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_14298/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Account for CD2X divider in ICL+ vco calculation
2019-09-05 21:38 [PATCH] drm/i915: Account for CD2X divider in ICL+ vco calculation Matt Roper
2019-09-05 22:34 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-09-06 5:24 ` ✓ Fi.CI.IGT: " Patchwork
@ 2019-09-06 11:20 ` Ville Syrjälä
2 siblings, 0 replies; 4+ messages in thread
From: Ville Syrjälä @ 2019-09-06 11:20 UTC (permalink / raw)
To: Matt Roper; +Cc: intel-gfx, Lucas De Marchi
On Thu, Sep 05, 2019 at 02:38:24PM -0700, Matt Roper wrote:
> When calculating the PLL ratio we were still assuming that the CD2X
> divider is always /1. For the new frequencies that use a /2 divider
> that needs to be accounted for, otherwise our VCO result will be twice
> as large as it should be.
>
> Fixes: 3d1da92baffe ("drm/i915: Add 324mhz and 326.4mhz cdclks for gen11+")
> Cc: José Roberto de Souza <jose.souza@intel.com>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_cdclk.c | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index 1329d3e60e26..55801aeefd1c 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -1794,6 +1794,7 @@ static int icl_calc_cdclk(int min_cdclk, unsigned int ref)
>
> static int icl_calc_cdclk_pll_vco(struct drm_i915_private *dev_priv, int cdclk)
> {
> + int cd2xdiv;
> int ratio;
>
> if (cdclk == dev_priv->cdclk.hw.bypass)
> @@ -1805,27 +1806,37 @@ static int icl_calc_cdclk_pll_vco(struct drm_i915_private *dev_priv, int cdclk)
> /* fall through */
> case 172800:
> case 307200:
> - case 326400:
> case 556800:
> case 652800:
> + cd2xdiv = 1;
> WARN_ON(dev_priv->cdclk.hw.ref != 19200 &&
> dev_priv->cdclk.hw.ref != 38400);
> break;
> case 180000:
> case 312000:
> - case 324000:
> case 552000:
> case 648000:
> + cd2xdiv = 1;
> WARN_ON(dev_priv->cdclk.hw.ref != 24000);
> break;
> case 192000:
> + cd2xdiv = 1;
> WARN_ON(dev_priv->cdclk.hw.ref != 19200 &&
> dev_priv->cdclk.hw.ref != 38400 &&
> dev_priv->cdclk.hw.ref != 24000);
> break;
> + case 326400:
> + cd2xdiv = 2;
> + WARN_ON(dev_priv->cdclk.hw.ref != 19200 &&
> + dev_priv->cdclk.hw.ref != 38400);
> + break;
> + case 324000:
> + cd2xdiv = 2;
> + WARN_ON(dev_priv->cdclk.hw.ref != 24000);
> + break;
> }
>
> - ratio = cdclk / (dev_priv->cdclk.hw.ref / 2);
> + ratio = cdclk / (dev_priv->cdclk.hw.ref / cd2xdiv / 2);
>
> return dev_priv->cdclk.hw.ref * ratio;
Isn't that just cdclk*cd2xdiv*2 ?
I do kinda like the idea of not hardcoding the vco ratio here.
We should probably do the same for the older platforms as well...
> }
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-06 11:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-05 21:38 [PATCH] drm/i915: Account for CD2X divider in ICL+ vco calculation Matt Roper
2019-09-05 22:34 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-09-06 5:24 ` ✓ Fi.CI.IGT: " Patchwork
2019-09-06 11:20 ` [PATCH] " Ville Syrjälä
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.