Skip to contentSkip to conversation

drm/i915/dp: HAX Try the bspec value for CLKTOP2_CORECLKCTL

PATCH New Manasi Navare 2 participants 5 messages Jul 16, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/i915/dp: HAX Try the bspec value for CLKTOP2_CORECLKCTL

---
 drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 4 ++++
 drivers/gpu/drm/i915/i915_reg.h               | 1 +
 2 files changed, 5 insertions(+)
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +4 -0
index aeb6ee395cce..229c942aa7d7 100644
@@ -3142,6 +3142,10 @@ static bool icl_mg_pll_find_divisors(int clock_khz, bool is_dp, bool use_ssc,
 			state->mg_clktop2_coreclkctl1 =
 				MG_CLKTOP2_CORECLKCTL1_A_DIVRATIO(a_divratio);
 
+			if (is_dkl && !(a_divratio & 1))
+				state->mg_clktop2_coreclkctl1 |=
+					MG_CLKTOP2_CORECLKCTL1_A_DIVRETIMER_EN;
+
 			state->mg_clktop2_hsclkctl =
 				MG_CLKTOP2_HSCLKCTL_TLINEDRV_CLKSEL(tlinedrv) |
 				MG_CLKTOP2_HSCLKCTL_CORE_INPUTSEL(inputsel) |
drivers/gpu/drm/i915/i915_reg.h +1 -0
index b9607ac3620d..c11aa7c4d708 100644
@@ -10323,6 +10323,7 @@ enum skl_power_gate {
 #define   MG_CLKTOP2_CORECLKCTL1_B_DIVRATIO_MASK	(0xff << 16)
 #define   MG_CLKTOP2_CORECLKCTL1_A_DIVRATIO(x)		((x) << 8)
 #define   MG_CLKTOP2_CORECLKCTL1_A_DIVRATIO_MASK	(0xff << 8)
+#define   MG_CLKTOP2_CORECLKCTL1_A_DIVRETIMER_EN	(1 << 1)
 #define MG_CLKTOP2_CORECLKCTL1(tc_port) _MMIO_PORT((tc_port), \
 						   _MG_CLKTOP2_CORECLKCTL1_PORT1, \
 						   _MG_CLKTOP2_CORECLKCTL1_PORT2)
Signature · 6 lines
2.19.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/2 drm/i915/display/dp: Hacks for testing link training fail errors

Keep the link rate const at 2.7 Gpbs, lane count =4 and do not fallback on link training. See if kms_atomic_transition test passes in constant configuration

---
 drivers/gpu/drm/i915/display/intel_dp.c               | 7 +++++--
 drivers/gpu/drm/i915/display/intel_dp_link_training.c | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +5 -2
index d6295eb20b63..070d8f83a28a 100644
@@ -425,6 +425,9 @@ static void intel_dp_set_common_rates(struct intel_dp *intel_dp)
 		intel_dp->common_rates[0] = 162000;
 		intel_dp->num_common_rates = 1;
 	}
+	/* Hack for VLK-7806 testing */
+	intel_dp->common_rates[0] = 270000;
+	intel_dp->num_common_rates = 1;
 }
 
 static bool intel_dp_link_params_valid(struct intel_dp *intel_dp, int link_rate,
@@ -2284,8 +2287,8 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,
 	limits.min_clock = 0;
 	limits.max_clock = common_len - 1;
 
-	limits.min_lane_count = 1;
-	limits.max_lane_count = intel_dp_max_lane_count(intel_dp);
+	limits.min_lane_count = 4;
+	limits.max_lane_count = 4;/*intel_dp_max_lane_count(intel_dp);*/
 
 	limits.min_bpp = intel_dp_min_bpp(pipe_config);
 	limits.max_bpp = intel_dp_compute_bpp(intel_dp, pipe_config);
drivers/gpu/drm/i915/display/intel_dp_link_training.c +3 -3
index f2c8b56be9ea..0653ace2b62a 100644
@@ -415,12 +415,12 @@ intel_dp_start_link_train(struct intel_dp *intel_dp)
 		drm_dbg_kms(&dp_to_i915(intel_dp)->drm,
 			    "Link Training failed with HOBL active, not enabling it from now on");
 		intel_dp->hobl_failed = true;
-	} else if (intel_dp_get_link_train_fallback_values(intel_dp,
+	}/* else if (intel_dp_get_link_train_fallback_values(intel_dp,
 							   intel_dp->link_rate,
 							   intel_dp->lane_count)) {
 		return;
-	}
+		}*/
 
 	/* Schedule a Hotplug Uevent to userspace to start modeset */
-	schedule_work(&intel_connector->modeset_retry_work);
+	//schedule_work(&intel_connector->modeset_retry_work);
 }
Signature · 6 lines
2.19.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915/dp: HAX Try the bspec value for CLKTOP2_CORECLKCTL

In reply to Manasi Navare
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915/dp: HAX Try the bspec value for CLKTOP2_CORECLKCTL
URL : https://patchwork.freedesktop.org/series/79569/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
7e44cd55cc41 drm/i915/dp: HAX Try the bspec value for CLKTOP2_CORECLKCTL
-:7: WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one

total: 0 errors, 1 warnings, 0 checks, 17 lines checked 745bd4981bd6 drm/i915/display/dp: Hacks for testing link training fail errors -:47: ERROR:SPACING: space required after that close brace '}' #47: FILE: drivers/gpu/drm/i915/display/intel_dp_link_training.c:418:
+ }/* else if (intel_dp_get_link_train_fallback_values(intel_dp,

-:52: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #52: FILE: drivers/gpu/drm/i915/display/intel_dp_link_training.c:422:
+ }*/

total: 1 errors, 1 warnings, 0 checks, 34 lines checked

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

[Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/2] drm/i915/dp: HAX Try the bspec value for CLKTOP2_CORECLKCTL

In reply to Manasi Navare
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915/dp: HAX Try the bspec value for CLKTOP2_CORECLKCTL
URL : https://patchwork.freedesktop.org/series/79569/
State : warning

== Summary ==

$ dim sparse --fast origin/drm-tip
Sparse version: v0.6.0
Fast mode used, each commit won't be checked separately.

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915/dp: HAX Try the bspec value for CLKTOP2_CORECLKCTL

In reply to Manasi Navare
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915/dp: HAX Try the bspec value for CLKTOP2_CORECLKCTL
URL : https://patchwork.freedesktop.org/series/79569/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_8759 -> Patchwork_18198
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_18198 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_18198, please notify your bug team 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_18198/index.html

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_18198:

### IGT changes ###

#### Possible regressions ####

* igt@i915_pm_backlight@basic-brightness:
- fi-icl-u2: [PASS][1] -> [SKIP][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-icl-u2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-icl-u2/igt@[email protected]

* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- fi-tgl-y: [PASS][3] -> [SKIP][4] +19 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-tgl-y/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-tgl-y/igt@[email protected]

* igt@kms_flip@basic-flip-vs-wf_vblank:
- fi-tgl-y: NOTRUN -> [SKIP][5] +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-tgl-y/igt@kms_flip@basic-flip-vs-wf_vblank.html

* igt@kms_psr@cursor_plane_move:
- fi-kbl-r: [PASS][6] -> [CRASH][7] +3 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-r/igt@kms_psr@cursor_plane_move.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-kbl-r/igt@kms_psr@cursor_plane_move.html

* igt@kms_psr@primary_page_flip:
- fi-icl-u2: [PASS][8] -> [CRASH][9] +3 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-icl-u2/igt@kms_psr@primary_page_flip.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-icl-u2/igt@kms_psr@primary_page_flip.html

* igt@kms_psr@sprite_plane_onoff:
- fi-tgl-y: [PASS][10] -> [CRASH][11] +3 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-tgl-y/igt@kms_psr@sprite_plane_onoff.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-tgl-y/igt@kms_psr@sprite_plane_onoff.html

* igt@kms_setmode@basic-clone-single-crtc:
- fi-icl-u2: [PASS][12] -> [WARN][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-icl-u2/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-icl-u2/igt@[email protected]
- fi-tgl-y: [PASS][14] -> [WARN][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-tgl-y/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-tgl-y/igt@[email protected]

#### Warnings ####

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-tgl-y: [DMESG-WARN][16] ([i915#1982]) -> [SKIP][17] +1 similar issue
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-tgl-y/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-tgl-y/igt@[email protected]

Known issues
------------

Here are the changes found in Patchwork_18198 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_module_load@reload:
- fi-tgl-u2: [PASS][18] -> [DMESG-WARN][19] ([i915#402])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-tgl-u2/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-tgl-u2/igt@[email protected]

* igt@kms_pipe_crc_basic@read-crc-pipe-b:
- fi-kbl-r: [PASS][20] -> [SKIP][21] ([fdo#109271]) +21 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-r/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-kbl-r/igt@[email protected]

* igt@kms_setmode@basic-clone-single-crtc:
- fi-kbl-r: [PASS][22] -> [WARN][23] ([i915#2100])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-r/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-kbl-r/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_suspend@basic-s0:
- fi-kbl-x1275: [DMESG-WARN][24] ([i915#1982] / [i915#62] / [i915#92] / [i915#95]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-x1275/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-kbl-x1275/igt@[email protected]
- fi-tgl-u2: [FAIL][26] ([i915#1888]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-tgl-u2/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-tgl-u2/igt@[email protected]

* igt@i915_pm_rpm@module-reload:
- fi-kbl-x1275: [SKIP][28] ([fdo#109271]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-x1275/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-kbl-x1275/igt@[email protected]

* igt@kms_flip@basic-flip-vs-modeset@b-dp1:
- fi-kbl-x1275: [DMESG-WARN][30] ([i915#62] / [i915#92]) -> [PASS][31] +29 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-x1275/igt@kms_flip@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-kbl-x1275/igt@kms_flip@[email protected]

* igt@kms_force_connector_basic@force-edid:
- fi-kbl-x1275: [DMESG-WARN][32] ([i915#62] / [i915#92] / [i915#95]) -> [PASS][33] +8 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-kbl-x1275/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-kbl-x1275/igt@[email protected]

* igt@kms_psr@cursor_plane_move:
- fi-whl-u: [SKIP][34] ([fdo#109271] / [i915#668]) -> [PASS][35] +3 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-whl-u/igt@kms_psr@cursor_plane_move.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-whl-u/igt@kms_psr@cursor_plane_move.html

* igt@prime_vgem@basic-write:
- fi-tgl-y: [DMESG-WARN][36] ([i915#402]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8759/fi-tgl-y/igt@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/fi-tgl-y/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2100]: https://gitlab.freedesktop.org/drm/intel/issues/2100
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#668]: https://gitlab.freedesktop.org/drm/intel/issues/668
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95

Participating hosts (45 -> 40)
------------------------------

Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper

Build changes
-------------

* Linux: CI_DRM_8759 -> Patchwork_18198

CI-20190529: 20190529
CI_DRM_8759: 9136d875406863759c4c7939f4b32edf7d76b007 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5738: bc8b56fe177af34fbde7b96f1f66614a0014c6ef @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18198: 745bd4981bd6e99938d3d5e540d98637e161a755 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

745bd4981bd6 drm/i915/display/dp: Hacks for testing link training fail errors 7e44cd55cc41 drm/i915/dp: HAX Try the bspec value for CLKTOP2_CORECLKCTL

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18198/index.html

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx