Skip to contentSkip to conversation

drm/i915: remove __i915_printk()

PATCH In review Jani Nikula 5 participants 21 messages Aug 6, 2024 – Aug 8, 2024

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

cover drm/i915: remove __i915_printk()

I don't think we need the bug reporting request in the few specific places that lead to __i915_printk(). With them gone, there's really no need for __i915_printk(). Just switch to regular drm logging.

Jani Nikula (3):
drm/i915: remove a few __i915_printk() uses
drm/i915: remove i915_report_error()
drm/i915: remove __i915_printk()

 drivers/gpu/drm/i915/i915_driver.c |  8 ++---
 drivers/gpu/drm/i915/i915_utils.c  | 51 +++---------------------------
 drivers/gpu/drm/i915/i915_utils.h  | 16 ++++------
 3 files changed, 15 insertions(+), 60 deletions(-)
Signature · 1 line
2.39.2
#1 lore raw

PATCH 1/3 drm/i915: remove a few __i915_printk() uses

__i915_printk() does nothing for notice/info levels. Just use the regular drm_notice() and drm_info() calls.

---
 drivers/gpu/drm/i915/i915_utils.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_utils.c +5 -5
index 6f9e7b354b54..bee32222f0fd 100644
@@ -54,8 +54,8 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level,
 
 void add_taint_for_CI(struct drm_i915_private *i915, unsigned int taint)
 {
-	__i915_printk(i915, KERN_NOTICE, "CI tainted:%#x by %pS\n",
-		      taint, (void *)_RET_IP_);
+	drm_notice(&i915->drm, "CI tainted: %#x by %pS\n",
+		   taint, __builtin_return_address(0));
 
 	/* Failures that occur during fault injection testing are expected */
 	if (!i915_error_injected())
@@ -74,9 +74,9 @@ int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
 	if (++i915_probe_fail_count < i915_modparams.inject_probe_failure)
 		return 0;
 
-	__i915_printk(i915, KERN_INFO,
-		      "Injecting failure %d at checkpoint %u [%s:%d]\n",
-		      err, i915_modparams.inject_probe_failure, func, line);
+	drm_info(&i915->drm, "Injecting failure %d at checkpoint %u [%s:%d]\n",
+		 err, i915_modparams.inject_probe_failure, func, line);
+
 	i915_modparams.inject_probe_failure = 0;
 	return err;
 }
Signature · 1 line
2.39.2
#6 lore raw

PATCH 2/3 drm/i915: remove i915_report_error()

In reply to Jani Nikula

i915_report_error() has only two users, both in driver probe. I doubt these cases are worth having a dedicated wrapper to also print bug reporting info. Just switch them to regular drm_err() and remove the wrapper.

---
 drivers/gpu/drm/i915/i915_driver.c | 8 ++++----
 drivers/gpu/drm/i915/i915_utils.h  | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_driver.c +4 -4
index fb8e9c2fcea5..94dca1d8bb15 100644
@@ -451,8 +451,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
 	if (HAS_PPGTT(dev_priv)) {
 		if (intel_vgpu_active(dev_priv) &&
 		    !intel_vgpu_has_full_ppgtt(dev_priv)) {
-			i915_report_error(dev_priv,
-					  "incompatible vGPU found, support for isolated ppGTT required\n");
+			drm_err(&dev_priv->drm,
+				"incompatible vGPU found, support for isolated ppGTT required\n");
 			return -ENXIO;
 		}
 	}
@@ -465,8 +465,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
 		 */
 		if (intel_vgpu_active(dev_priv) &&
 		    !intel_vgpu_has_hwsp_emulation(dev_priv)) {
-			i915_report_error(dev_priv,
-					  "old vGPU host found, support for HWSP emulation required\n");
+			drm_err(&dev_priv->drm,
+				"old vGPU host found, support for HWSP emulation required\n");
 			return -ENXIO;
 		}
 	}
drivers/gpu/drm/i915/i915_utils.h +0 -3
index 06ec6ceb61d5..feb078ae246f 100644
@@ -49,9 +49,6 @@ void __printf(3, 4)
 __i915_printk(struct drm_i915_private *dev_priv, const char *level,
 	      const char *fmt, ...);
 
-#define i915_report_error(dev_priv, fmt, ...)				   \
-	__i915_printk(dev_priv, KERN_ERR, fmt, ##__VA_ARGS__)
-
 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
 
 int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
Signature · 1 line
2.39.2
#10 lore raw

PATCH 3/3 drm/i915: remove __i915_printk()

In reply to Jani Nikula

With the previous cleanups, the last remaining user of __i915_printk() is i915_probe_error(). Switch that to use drm_dbg() and drm_err() instead, dropping the request to report bugs in the few remaining specific cases.

---
 drivers/gpu/drm/i915/i915_utils.c | 41 -------------------------------
 drivers/gpu/drm/i915/i915_utils.h | 13 +++++-----
 2 files changed, 6 insertions(+), 48 deletions(-)
drivers/gpu/drm/i915/i915_utils.c +0 -41
index bee32222f0fd..b34a2d3d331d 100644
@@ -11,47 +11,6 @@
 #include "i915_reg.h"
 #include "i915_utils.h"
 
-#define FDO_BUG_MSG "Please file a bug on drm/i915; see " FDO_BUG_URL " for details."
-
-void
-__i915_printk(struct drm_i915_private *dev_priv, const char *level,
-	      const char *fmt, ...)
-{
-	static bool shown_bug_once;
-	struct device *kdev = dev_priv->drm.dev;
-	bool is_error = level[1] <= KERN_ERR[1];
-	bool is_debug = level[1] == KERN_DEBUG[1];
-	struct va_format vaf;
-	va_list args;
-
-	if (is_debug && !drm_debug_enabled(DRM_UT_DRIVER))
-		return;
-
-	va_start(args, fmt);
-
-	vaf.fmt = fmt;
-	vaf.va = &args;
-
-	if (is_error)
-		dev_printk(level, kdev, "%pV", &vaf);
-	else
-		dev_printk(level, kdev, "[" DRM_NAME ":%ps] %pV",
-			   __builtin_return_address(0), &vaf);
-
-	va_end(args);
-
-	if (is_error && !shown_bug_once) {
-		/*
-		 * Ask the user to file a bug report for the error, except
-		 * if they may have caused the bug by fiddling with unsafe
-		 * module parameters.
-		 */
-		if (!test_taint(TAINT_USER))
-			dev_notice(kdev, "%s", FDO_BUG_MSG);
-		shown_bug_once = true;
-	}
-}
-
 void add_taint_for_CI(struct drm_i915_private *i915, unsigned int taint)
 {
 	drm_notice(&i915->drm, "CI tainted: %#x by %pS\n",
drivers/gpu/drm/i915/i915_utils.h +6 -7
index feb078ae246f..71bdc89bd621 100644
@@ -45,10 +45,6 @@ struct timer_list;
 #define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \
 			     __stringify(x), (long)(x))
 
-void __printf(3, 4)
-__i915_printk(struct drm_i915_private *dev_priv, const char *level,
-	      const char *fmt, ...);
-
 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
 
 int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
@@ -66,9 +62,12 @@ bool i915_error_injected(void);
 
 #define i915_inject_probe_failure(i915) i915_inject_probe_error((i915), -ENODEV)
 
-#define i915_probe_error(i915, fmt, ...)				   \
-	__i915_printk(i915, i915_error_injected() ? KERN_DEBUG : KERN_ERR, \
-		      fmt, ##__VA_ARGS__)
+#define i915_probe_error(i915, fmt, ...) ({ \
+	if (i915_error_injected()) \
+		drm_dbg(&(i915)->drm, fmt, ##__VA_ARGS__); \
+	else \
+		drm_err(&(i915)->drm, fmt, ##__VA_ARGS__); \
+})
 
 #define range_overflows(start, size, max) ({ \
 	typeof(start) start__ = (start); \
Signature · 1 line
2.39.2
#16 lore raw

✓ Fi.CI.BAT: success for drm/i915: remove __i915_printk()

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: remove __i915_printk()
URL : https://patchwork.freedesktop.org/series/136927/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_15187 -> Patchwork_136927v1
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/index.html

Participating hosts (38 -> 38)
------------------------------

Additional (1): bat-arls-1
Missing (1): fi-snb-2520m

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

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

### IGT changes ###

#### Issues hit ####

* igt@debugfs_test@basic-hwmon:
- bat-arls-1: NOTRUN -> [SKIP][1] ([i915#9318])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@gem_lmem_swapping@basic@lmem0:
- bat-dg2-11: [PASS][2] -> [FAIL][3] ([i915#10378])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/bat-dg2-11/igt@gem_lmem_swapping@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-dg2-11/igt@gem_lmem_swapping@[email protected]
- bat-dg2-9: [PASS][4] -> [FAIL][5] ([i915#10378])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/bat-dg2-9/igt@gem_lmem_swapping@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-dg2-9/igt@gem_lmem_swapping@[email protected]

* igt@gem_lmem_swapping@random-engines:
- bat-arls-1: NOTRUN -> [SKIP][6] ([i915#10213]) +3 other tests skip
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@gem_mmap@basic:
- bat-arls-1: NOTRUN -> [SKIP][7] ([i915#11343] / [i915#4083])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@gem_render_tiled_blits@basic:
- bat-arls-1: NOTRUN -> [SKIP][8] ([i915#10197] / [i915#10211] / [i915#4079])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@gem_tiled_blits@basic:
- bat-arls-1: NOTRUN -> [SKIP][9] ([i915#10196] / [i915#4077]) +2 other tests skip
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@gem_tiled_pread_basic:
- bat-arls-1: NOTRUN -> [SKIP][10] ([i915#10206] / [i915#4079])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@gem_tiled_pread_basic.html

* igt@i915_pm_rps@basic-api:
- bat-arls-1: NOTRUN -> [SKIP][11] ([i915#10209])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@i915_selftest@live@hangcheck:
- bat-arls-1: NOTRUN -> [DMESG-WARN][12] ([i915#11349] / [i915#11378])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@i915_selftest@[email protected]

* igt@kms_addfb_basic@addfb25-x-tiled-legacy:
- bat-arls-1: NOTRUN -> [SKIP][13] ([i915#10200]) +9 other tests skip
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-arls-1: NOTRUN -> [SKIP][14] ([i915#10202] / [i915#11346]) +1 other test skip
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@kms_dsc@dsc-basic:
- bat-arls-1: NOTRUN -> [SKIP][15] ([i915#11346] / [i915#9886])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@kms_force_connector_basic@force-load-detect:
- bat-arls-1: NOTRUN -> [SKIP][16] ([i915#10207] / [i915#11346])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@kms_pm_backlight@basic-brightness:
- bat-arls-1: NOTRUN -> [SKIP][17] ([i915#11346] / [i915#9812])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@kms_psr@psr-primary-mmap-gtt:
- bat-arls-1: NOTRUN -> [SKIP][18] ([i915#11346] / [i915#9732]) +3 other tests skip
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@kms_setmode@basic-clone-single-crtc:
- bat-arls-1: NOTRUN -> [SKIP][19] ([i915#10208] / [i915#8809])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@prime_vgem@basic-fence-read:
- bat-arls-1: NOTRUN -> [SKIP][20] ([i915#10212] / [i915#3708])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@prime_vgem@basic-gtt:
- bat-arls-1: NOTRUN -> [SKIP][21] ([i915#10196] / [i915#3708] / [i915#4077]) +1 other test skip
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@prime_vgem@basic-read:
- bat-arls-1: NOTRUN -> [SKIP][22] ([i915#10214] / [i915#3708])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

* igt@prime_vgem@basic-write:
- bat-arls-1: NOTRUN -> [SKIP][23] ([i915#10216] / [i915#3708])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-1/igt@[email protected]

#### Possible fixes ####

* igt@i915_selftest@live@hangcheck:
- bat-arls-2: [DMESG-WARN][24] ([i915#11349] / [i915#11378]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/bat-arls-2/igt@i915_selftest@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/bat-arls-2/igt@i915_selftest@[email protected]

[i915#10196]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10196
[i915#10197]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10197
[i915#10200]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10200
[i915#10202]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10202
[i915#10206]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10206
[i915#10207]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10207
[i915#10208]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10208
[i915#10209]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10209
[i915#10211]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10211
[i915#10212]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10212
[i915#10213]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10213
[i915#10214]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10214
[i915#10216]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10216
[i915#10378]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10378
[i915#11343]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11343
[i915#11346]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11346
[i915#11349]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11349
[i915#11378]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11378
[i915#3708]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3708
[i915#4077]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4083
[i915#8809]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8809
[i915#9318]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9318
[i915#9732]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9732
[i915#9812]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9812
[i915#9886]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9886

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

* Linux: CI_DRM_15187 -> Patchwork_136927v1

CI-20190529: 20190529
CI_DRM_15187: 83eea64f81edb86ed3aa368039520810c154fd94 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7957: cb9121cf18a2fa8dfa1f663484f3a460b95e1b41 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_136927v1: 83eea64f81edb86ed3aa368039520810c154fd94 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

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

#17 lore raw

✗ Fi.CI.CHECKPATCH: warning for drm/i915: remove __i915_printk()

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: remove __i915_printk()
URL : https://patchwork.freedesktop.org/series/136927/
State : warning

== Summary ==

Error: dim checkpatch failed
35cd2f6098a9 drm/i915: remove a few __i915_printk() uses e4981bdebe5c drm/i915: remove i915_report_error()
545c1e43b479 drm/i915: remove __i915_printk()
-:87: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #87: FILE: drivers/gpu/drm/i915/i915_utils.h:65:
+#define i915_probe_error(i915, fmt, ...) ({ \
+ if (i915_error_injected()) \
+ drm_dbg(&(i915)->drm, fmt, ##__VA_ARGS__); \
+ else \
+ drm_err(&(i915)->drm, fmt, ##__VA_ARGS__); \
+})

-:87: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'fmt' - possible side-effects? #87: FILE: drivers/gpu/drm/i915/i915_utils.h:65:
+#define i915_probe_error(i915, fmt, ...) ({ \
+ if (i915_error_injected()) \
+ drm_dbg(&(i915)->drm, fmt, ##__VA_ARGS__); \
+ else \
+ drm_err(&(i915)->drm, fmt, ##__VA_ARGS__); \
+})

total: 0 errors, 0 warnings, 2 checks, 72 lines checked

Reviewed-by on v1 1/3
#2 lore raw

RE: [PATCH 1/3] drm/i915: remove a few __i915_printk() uses

In reply to Jani Nikula

-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Jani Nikula
Sent: Tuesday, August 6, 2024 6:39 AM
To: [email protected]
Cc: Nikula, Jani <[email protected]>
Subject: [PATCH 1/3] drm/i915: remove a few __i915_printk() uses

Quoted 5 lines

__i915_printk() does nothing for notice/info levels. Just use the regular drm_notice() and drm_info() calls.

LGTM.

-Jonathan Cavitt

Quoted 36 lines
---
 drivers/gpu/drm/i915/i915_utils.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_utils.c +5 -5
index 6f9e7b354b54..bee32222f0fd 100644
@@ -54,8 +54,8 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level,
 
 void add_taint_for_CI(struct drm_i915_private *i915, unsigned int taint)
 {
-	__i915_printk(i915, KERN_NOTICE, "CI tainted:%#x by %pS\n",
-		      taint, (void *)_RET_IP_);
+	drm_notice(&i915->drm, "CI tainted: %#x by %pS\n",
+		   taint, __builtin_return_address(0));
 
 	/* Failures that occur during fault injection testing are expected */
 	if (!i915_error_injected())
@@ -74,9 +74,9 @@ int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
 	if (++i915_probe_fail_count < i915_modparams.inject_probe_failure)
 		return 0;
 
-	__i915_printk(i915, KERN_INFO,
-		      "Injecting failure %d at checkpoint %u [%s:%d]\n",
-		      err, i915_modparams.inject_probe_failure, func, line);
+	drm_info(&i915->drm, "Injecting failure %d at checkpoint %u [%s:%d]\n",
+		 err, i915_modparams.inject_probe_failure, func, line);
+
 	i915_modparams.inject_probe_failure = 0;
 	return err;
 }
Signature · 1 line
2.39.2
Reviewed-by on v1 2/3
#7 lore raw

RE: [PATCH 2/3] drm/i915: remove i915_report_error()

In reply to Jani Nikula

-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Jani Nikula
Sent: Tuesday, August 6, 2024 6:39 AM
To: [email protected]
Cc: Nikula, Jani <[email protected]>
Subject: [PATCH 2/3] drm/i915: remove i915_report_error()

Quoted 5 lines

i915_report_error() has only two users, both in driver probe. I doubt these cases are worth having a dedicated wrapper to also print bug reporting info. Just switch them to regular drm_err() and remove the wrapper.

The commit message might be better if worded as such:

"""
i915_report_error presently acts as a wrapper for __i915_printk. In practice, it would be better to use drm level error reporting wherever possible, so replace all uses of i915_report_error with the equivalent drm_err call. Doing so leaves i915_report_error with no users, so remove it.
"""

With this change:

-Jonathan Cavitt

Quoted 51 lines
---
 drivers/gpu/drm/i915/i915_driver.c | 8 ++++----
 drivers/gpu/drm/i915/i915_utils.h  | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_driver.c +4 -4
index fb8e9c2fcea5..94dca1d8bb15 100644
@@ -451,8 +451,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
 	if (HAS_PPGTT(dev_priv)) {
 		if (intel_vgpu_active(dev_priv) &&
 		    !intel_vgpu_has_full_ppgtt(dev_priv)) {
-			i915_report_error(dev_priv,
-					  "incompatible vGPU found, support for isolated ppGTT required\n");
+			drm_err(&dev_priv->drm,
+				"incompatible vGPU found, support for isolated ppGTT required\n");
 			return -ENXIO;
 		}
 	}
@@ -465,8 +465,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
 		 */
 		if (intel_vgpu_active(dev_priv) &&
 		    !intel_vgpu_has_hwsp_emulation(dev_priv)) {
-			i915_report_error(dev_priv,
-					  "old vGPU host found, support for HWSP emulation required\n");
+			drm_err(&dev_priv->drm,
+				"old vGPU host found, support for HWSP emulation required\n");
 			return -ENXIO;
 		}
 	}
drivers/gpu/drm/i915/i915_utils.h +0 -3
index 06ec6ceb61d5..feb078ae246f 100644
@@ -49,9 +49,6 @@ void __printf(3, 4)
 __i915_printk(struct drm_i915_private *dev_priv, const char *level,
 	      const char *fmt, ...);
 
-#define i915_report_error(dev_priv, fmt, ...)				   \
-	__i915_printk(dev_priv, KERN_ERR, fmt, ##__VA_ARGS__)
-
 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
 
 int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
Signature · 1 line
2.39.2
Reviewed-by on v1 3/3
#11 lore raw
In reply to Jani Nikula

-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Jani Nikula
Sent: Tuesday, August 6, 2024 6:39 AM
To: [email protected]
Cc: Nikula, Jani <[email protected]>
Subject: [PATCH 3/3] drm/i915: remove __i915_printk()

Quoted 5 lines

With the previous cleanups, the last remaining user of __i915_printk() is i915_probe_error(). Switch that to use drm_dbg() and drm_err() instead, dropping the request to report bugs in the few remaining specific cases.

LGTM.

-Jonathan Cavitt

Quoted 94 lines
---
 drivers/gpu/drm/i915/i915_utils.c | 41 -------------------------------
 drivers/gpu/drm/i915/i915_utils.h | 13 +++++-----
 2 files changed, 6 insertions(+), 48 deletions(-)
drivers/gpu/drm/i915/i915_utils.c +0 -41
index bee32222f0fd..b34a2d3d331d 100644
@@ -11,47 +11,6 @@
 #include "i915_reg.h"
 #include "i915_utils.h"
 
-#define FDO_BUG_MSG "Please file a bug on drm/i915; see " FDO_BUG_URL " for details."
-
-void
-__i915_printk(struct drm_i915_private *dev_priv, const char *level,
-	      const char *fmt, ...)
-{
-	static bool shown_bug_once;
-	struct device *kdev = dev_priv->drm.dev;
-	bool is_error = level[1] <= KERN_ERR[1];
-	bool is_debug = level[1] == KERN_DEBUG[1];
-	struct va_format vaf;
-	va_list args;
-
-	if (is_debug && !drm_debug_enabled(DRM_UT_DRIVER))
-		return;
-
-	va_start(args, fmt);
-
-	vaf.fmt = fmt;
-	vaf.va = &args;
-
-	if (is_error)
-		dev_printk(level, kdev, "%pV", &vaf);
-	else
-		dev_printk(level, kdev, "[" DRM_NAME ":%ps] %pV",
-			   __builtin_return_address(0), &vaf);
-
-	va_end(args);
-
-	if (is_error && !shown_bug_once) {
-		/*
-		 * Ask the user to file a bug report for the error, except
-		 * if they may have caused the bug by fiddling with unsafe
-		 * module parameters.
-		 */
-		if (!test_taint(TAINT_USER))
-			dev_notice(kdev, "%s", FDO_BUG_MSG);
-		shown_bug_once = true;
-	}
-}
-
 void add_taint_for_CI(struct drm_i915_private *i915, unsigned int taint)
 {
 	drm_notice(&i915->drm, "CI tainted: %#x by %pS\n",
drivers/gpu/drm/i915/i915_utils.h +6 -7
index feb078ae246f..71bdc89bd621 100644
@@ -45,10 +45,6 @@ struct timer_list;
 #define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \
 			     __stringify(x), (long)(x))
 
-void __printf(3, 4)
-__i915_printk(struct drm_i915_private *dev_priv, const char *level,
-	      const char *fmt, ...);
-
 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
 
 int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
@@ -66,9 +62,12 @@ bool i915_error_injected(void);
 
 #define i915_inject_probe_failure(i915) i915_inject_probe_error((i915), -ENODEV)
 
-#define i915_probe_error(i915, fmt, ...)				   \
-	__i915_printk(i915, i915_error_injected() ? KERN_DEBUG : KERN_ERR, \
-		      fmt, ##__VA_ARGS__)
+#define i915_probe_error(i915, fmt, ...) ({ \
+	if (i915_error_injected()) \
+		drm_dbg(&(i915)->drm, fmt, ##__VA_ARGS__); \
+	else \
+		drm_err(&(i915)->drm, fmt, ##__VA_ARGS__); \
+})
 
 #define range_overflows(start, size, max) ({ \
 	typeof(start) start__ = (start); \
Signature · 1 line
2.39.2
#19 lore raw

✗ Fi.CI.IGT: failure for drm/i915: remove __i915_printk()

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: remove __i915_printk()
URL : https://patchwork.freedesktop.org/series/136927/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_15187_full -> Patchwork_136927v1_full
====================================================

Summary
-------

**FAILURE**

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

If you think the reported changes have nothing to do with the changes
introduced in Patchwork_136927v1_full, please notify your bug team ([email protected]) to allow them to document this new failure mode, which will reduce false positives in CI.

Participating hosts (9 -> 9)
------------------------------

No changes in participating hosts

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

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

### IGT changes ###

#### Possible regressions ####

* igt@i915_pm_rps@thresholds-idle-park:
- shard-dg1: NOTRUN -> [SKIP][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@kms_atomic_transition@modeset-transition-nonblocking-fencing@2x-outputs:
- shard-glk: [PASS][2] -> [FAIL][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-glk7/igt@kms_atomic_transition@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-glk8/igt@kms_atomic_transition@[email protected]

* igt@kms_flip@blocking-wf_vblank@a-hdmi-a2:
- shard-rkl: NOTRUN -> [FAIL][4]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-5/igt@kms_flip@[email protected]

* igt@prime_busy@hang-wait@rcs0:
- shard-glk: NOTRUN -> [INCOMPLETE][5]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-glk3/igt@prime_busy@[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@api_intel_bb@crc32:
- shard-rkl: NOTRUN -> [SKIP][6] ([i915#6230])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@device_reset@unbind-reset-rebind:
- shard-dg1: NOTRUN -> [ABORT][7] ([i915#11814] / [i915#11815])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-16/igt@[email protected]

* igt@drm_fdinfo@most-busy-idle-check-all@rcs0:
- shard-rkl: NOTRUN -> [FAIL][8] ([i915#7742])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@drm_fdinfo@[email protected]

* igt@drm_fdinfo@virtual-busy-all:
- shard-dg1: NOTRUN -> [SKIP][9] ([i915#8414]) +1 other test skip
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@gem_basic@multigpu-create-close:
- shard-rkl: NOTRUN -> [SKIP][10] ([i915#7697])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-3/igt@[email protected]

* igt@gem_ccs@block-copy-compressed:
- shard-dg1: NOTRUN -> [SKIP][11] ([i915#3555] / [i915#9323]) +1 other test skip
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@gem_ctx_persistence@heartbeat-hostile:
- shard-dg1: NOTRUN -> [SKIP][12] ([i915#8555])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@gem_ctx_sseu@invalid-args:
- shard-dg1: NOTRUN -> [SKIP][13] ([i915#280])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-16/igt@[email protected]

* igt@gem_ctx_sseu@mmap-args:
- shard-rkl: NOTRUN -> [SKIP][14] ([i915#280])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@gem_exec_balancer@parallel-bb-first:
- shard-rkl: NOTRUN -> [SKIP][15] ([i915#4525]) +2 other tests skip
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@gem_exec_capture@capture-invisible@lmem0:
- shard-dg1: NOTRUN -> [SKIP][16] ([i915#6334]) +1 other test skip
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@gem_exec_capture@[email protected]

* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-rkl: [PASS][17] -> [FAIL][18] ([i915#2842]) +1 other test fail
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-rkl-4/igt@gem_exec_fair@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-5/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vecs0:
- shard-rkl: NOTRUN -> [FAIL][19] ([i915#2842]) +2 other tests fail
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-2/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-glk: NOTRUN -> [FAIL][20] ([i915#2842])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-glk8/igt@gem_exec_fair@[email protected]

* igt@gem_exec_reloc@basic-gtt-cpu:
- shard-dg1: NOTRUN -> [SKIP][21] ([i915#3281]) +6 other tests skip
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@gem_exec_reloc@basic-wc-read-noreloc:
- shard-rkl: NOTRUN -> [SKIP][22] ([i915#3281]) +11 other tests skip
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@gem_fence_thrash@bo-copy:
- shard-dg1: NOTRUN -> [SKIP][23] ([i915#4860])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@gem_huc_copy@huc-copy:
- shard-rkl: NOTRUN -> [SKIP][24] ([i915#2190])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@gem_lmem_swapping@heavy-verify-random:
- shard-glk: NOTRUN -> [SKIP][25] ([i915#4613]) +1 other test skip
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-glk8/igt@[email protected]

* igt@gem_lmem_swapping@heavy-verify-random-ccs@lmem0:
- shard-dg2: [PASS][26] -> [FAIL][27] ([i915#10446])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-dg2-7/igt@gem_lmem_swapping@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-11/igt@gem_lmem_swapping@[email protected]

* igt@gem_lmem_swapping@parallel-multi:
- shard-rkl: NOTRUN -> [SKIP][28] ([i915#4613]) +1 other test skip
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@gem_mmap_gtt@basic-small-copy-xy:
- shard-dg1: NOTRUN -> [SKIP][29] ([i915#4077]) +9 other tests skip
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@gem_mmap_wc@write-cpu-read-wc-unflushed:
- shard-dg1: NOTRUN -> [SKIP][30] ([i915#4083]) +3 other tests skip
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@gem_partial_pwrite_pread@reads:
- shard-dg1: NOTRUN -> [SKIP][31] ([i915#3282]) +4 other tests skip
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@gem_partial_pwrite_pread@writes-after-reads:
- shard-rkl: NOTRUN -> [SKIP][32] ([i915#3282]) +3 other tests skip
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-2/igt@[email protected]

* igt@gem_pxp@verify-pxp-execution-after-suspend-resume:
- shard-rkl: NOTRUN -> [SKIP][33] ([i915#4270]) +3 other tests skip
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@gem_pxp@verify-pxp-key-change-after-suspend-resume:
- shard-dg1: NOTRUN -> [SKIP][34] ([i915#4270]) +2 other tests skip
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@gem_set_tiling_vs_blt@tiled-to-untiled:
- shard-rkl: NOTRUN -> [SKIP][35] ([i915#8411]) +1 other test skip
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-3/igt@[email protected]

* igt@gem_userptr_blits@invalid-mmap-offset-unsync:
- shard-dg1: NOTRUN -> [SKIP][36] ([i915#3297])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@gen9_exec_parse@bb-oversize:
- shard-rkl: NOTRUN -> [SKIP][37] ([i915#2527]) +2 other tests skip
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-2/igt@[email protected]

* igt@gen9_exec_parse@cmd-crossing-page:
- shard-dg1: NOTRUN -> [SKIP][38] ([i915#2527])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@i915_module_load@reload-with-fault-injection:
- shard-rkl: NOTRUN -> [ABORT][39] ([i915#9820])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]
- shard-dg1: [PASS][40] -> [ABORT][41] ([i915#9820])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-dg1-17/igt@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@i915_pm_freq_api@freq-reset-multiple:
- shard-rkl: NOTRUN -> [SKIP][42] ([i915#8399])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-3/igt@[email protected]

* igt@i915_pm_freq_mult@media-freq@gt0:
- shard-rkl: NOTRUN -> [SKIP][43] ([i915#6590])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-2/igt@i915_pm_freq_mult@[email protected]

* igt@i915_pm_rps@min-max-config-loaded:
- shard-dg1: NOTRUN -> [SKIP][44] ([i915#6621])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@i915_query@hwconfig_table:
- shard-dg1: NOTRUN -> [SKIP][45] ([i915#6245])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@i915_query@hwconfig_table.html

* igt@kms_addfb_basic@clobberred-modifier:
- shard-dg1: NOTRUN -> [SKIP][46] ([i915#4212])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@kms_async_flips@async-flip-with-page-flip-events@pipe-b-hdmi-a-2-y-rc-ccs-cc:
- shard-rkl: NOTRUN -> [SKIP][47] ([i915#8709]) +3 other tests skip
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-5/igt@kms_async_flips@async-flip-with-page-flip-events@pipe-b-hdmi-a-2-y-rc-ccs-cc.html

* igt@kms_async_flips@async-flip-with-page-flip-events@pipe-c-dp-4-4-rc-ccs-cc:
- shard-dg2: NOTRUN -> [SKIP][48] ([i915#8709]) +11 other tests skip
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-11/igt@kms_async_flips@[email protected]

* igt@kms_atomic_transition@plane-all-modeset-transition-fencing@pipe-a-hdmi-a-1:
- shard-snb: [PASS][49] -> [FAIL][50] ([i915#5956])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-snb6/igt@kms_atomic_transition@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-snb7/igt@kms_atomic_transition@[email protected]

* igt@kms_big_fb@4-tiled-max-hw-stride-32bpp-rotate-0-hflip:
- shard-rkl: NOTRUN -> [SKIP][51] ([i915#5286]) +5 other tests skip
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@kms_big_fb@4-tiled-max-hw-stride-32bpp-rotate-180-async-flip:
- shard-dg1: NOTRUN -> [SKIP][52] ([i915#4538] / [i915#5286]) +3 other tests skip
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@kms_big_fb@4-tiled-max-hw-stride-32bpp-rotate-180-async-flip.html

* igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-180-hflip-async-flip:
- shard-glk: NOTRUN -> [SKIP][53] +61 other tests skip
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-glk8/igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-180-hflip-async-flip.html

* igt@kms_big_fb@linear-8bpp-rotate-270:
- shard-dg1: NOTRUN -> [SKIP][54] ([i915#3638])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@kms_big_fb@x-tiled-64bpp-rotate-270:
- shard-rkl: NOTRUN -> [SKIP][55] ([i915#3638]) +4 other tests skip
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-3/igt@[email protected]

* igt@kms_big_fb@yf-tiled-8bpp-rotate-0:
- shard-dg1: NOTRUN -> [SKIP][56] ([i915#4538]) +4 other tests skip
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@kms_big_joiner@basic-force-joiner:
- shard-dg2: NOTRUN -> [SKIP][57] ([i915#10656])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-3/igt@[email protected]
- shard-rkl: NOTRUN -> [SKIP][58] ([i915#10656])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-2/igt@[email protected]

* igt@kms_big_joiner@invalid-modeset:
- shard-dg1: NOTRUN -> [SKIP][59] ([i915#10656])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@kms_ccs@bad-rotation-90-4-tiled-mtl-rc-ccs-cc@pipe-b-hdmi-a-4:
- shard-dg1: NOTRUN -> [SKIP][60] ([i915#6095]) +51 other tests skip
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@kms_ccs@[email protected]

* igt@kms_ccs@bad-rotation-90-y-tiled-gen12-rc-ccs-cc@pipe-a-dp-4:
- shard-dg2: NOTRUN -> [SKIP][61] ([i915#10307] / [i915#6095]) +207 other tests skip
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-11/igt@kms_ccs@[email protected]

* igt@kms_ccs@crc-primary-rotation-180-4-tiled-dg2-mc-ccs@pipe-b-hdmi-a-1:
- shard-rkl: NOTRUN -> [SKIP][62] ([i915#6095]) +67 other tests skip
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@kms_ccs@[email protected]

* igt@kms_ccs@missing-ccs-buffer-y-tiled-ccs@pipe-d-hdmi-a-1:
- shard-dg2: NOTRUN -> [SKIP][63] ([i915#10307] / [i915#10434] / [i915#6095]) +3 other tests skip
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-4/igt@kms_ccs@[email protected]

* igt@kms_cdclk@plane-scaling:
- shard-rkl: NOTRUN -> [SKIP][64] ([i915#3742])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-3/igt@[email protected]

* igt@kms_chamelium_color@ctm-0-50:
- shard-dg1: NOTRUN -> [SKIP][65] +21 other tests skip
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-16/igt@[email protected]

* igt@kms_chamelium_frames@hdmi-crc-fast:
- shard-rkl: NOTRUN -> [SKIP][66] ([i915#7828]) +6 other tests skip
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-2/igt@[email protected]

* igt@kms_chamelium_hpd@dp-hpd-with-enabled-mode:
- shard-dg1: NOTRUN -> [SKIP][67] ([i915#7828]) +4 other tests skip
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@kms_content_protection@atomic-dpms:
- shard-dg1: NOTRUN -> [SKIP][68] ([i915#7116] / [i915#9424])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@kms_content_protection@atomic@pipe-a-dp-4:
- shard-dg2: NOTRUN -> [TIMEOUT][69] ([i915#7173])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-11/igt@kms_content_protection@[email protected]

* igt@kms_content_protection@dp-mst-lic-type-0:
- shard-rkl: NOTRUN -> [SKIP][70] ([i915#3116])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-2/igt@[email protected]

* igt@kms_content_protection@dp-mst-type-0:
- shard-dg1: NOTRUN -> [SKIP][71] ([i915#3299])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@kms_content_protection@lic-type-0:
- shard-dg2: NOTRUN -> [SKIP][72] ([i915#9424])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-5/igt@[email protected]

* igt@kms_content_protection@type1:
- shard-rkl: NOTRUN -> [SKIP][73] ([i915#7118] / [i915#9424])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@kms_content_protection@uevent:
- shard-dg2: NOTRUN -> [SKIP][74] ([i915#7118] / [i915#9424])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-7/igt@[email protected]

* igt@kms_cursor_crc@cursor-onscreen-512x170:
- shard-rkl: NOTRUN -> [SKIP][75] ([i915#11453])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-2/igt@[email protected]

* igt@kms_cursor_crc@cursor-random-32x32:
- shard-dg1: NOTRUN -> [SKIP][76] ([i915#3555]) +2 other tests skip
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- shard-rkl: NOTRUN -> [SKIP][77] ([i915#4103]) +2 other tests skip
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-3/igt@[email protected]

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-varying-size:
- shard-dg1: NOTRUN -> [SKIP][78] ([i915#4103] / [i915#4213])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-varying-size.html

* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-glk: [PASS][79] -> [FAIL][80] ([i915#2346]) +1 other test fail
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-glk8/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-glk3/igt@[email protected]

* igt@kms_dirtyfb@psr-dirtyfb-ioctl:
- shard-rkl: NOTRUN -> [SKIP][81] ([i915#9723])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-3/igt@[email protected]

* igt@kms_dither@fb-8bpc-vs-panel-8bpc:
- shard-dg2: NOTRUN -> [SKIP][82] ([i915#3555])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-7/igt@[email protected]

* igt@kms_dsc@dsc-with-output-formats-with-bpc:
- shard-rkl: NOTRUN -> [SKIP][83] ([i915#3840] / [i915#9053])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-2/igt@[email protected]

* igt@kms_feature_discovery@display-2x:
- shard-dg1: NOTRUN -> [SKIP][84] ([i915#1839])
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-16/igt@[email protected]

* igt@kms_flip@2x-flip-vs-dpms:
- shard-rkl: NOTRUN -> [SKIP][85] +27 other tests skip
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-2/igt@[email protected]

* igt@kms_flip@2x-single-buffer-flip-vs-dpms-off-vs-modeset:
- shard-dg1: NOTRUN -> [SKIP][86] ([i915#9934]) +1 other test skip
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@kms_flip@2x-wf_vblank-ts-check-interruptible@ab-vga1-hdmi-a1:
- shard-snb: [PASS][87] -> [FAIL][88] ([i915#2122])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-snb4/igt@kms_flip@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-snb7/igt@kms_flip@[email protected]

* igt@kms_flip_scaled_crc@flip-32bpp-4tile-to-64bpp-4tile-upscaling@pipe-a-valid-mode:
- shard-rkl: NOTRUN -> [SKIP][89] ([i915#2672]) +2 other tests skip
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@kms_flip_scaled_crc@[email protected]

* igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-32bpp-4tiledg2rcccs-upscaling@pipe-a-valid-mode:
- shard-dg1: NOTRUN -> [SKIP][90] ([i915#2587] / [i915#2672]) +1 other test skip
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-32bpp-4tiledg2rcccs-upscaling@pipe-a-valid-mode.html

* igt@kms_frontbuffer_tracking@fbc-stridechange:
- shard-dg2: [PASS][91] -> [FAIL][92] ([i915#6880]) +1 other test fail
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-dg2-1/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-6/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-shrfb-pgflip-blt:
- shard-rkl: NOTRUN -> [SKIP][93] ([i915#1825]) +36 other tests skip
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-3/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-shrfb-pgflip-blt.html

* igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-blt:
- shard-snb: NOTRUN -> [SKIP][94] +11 other tests skip
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-snb5/igt@[email protected]

* igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-gtt:
- shard-dg1: NOTRUN -> [SKIP][95] ([i915#8708]) +11 other tests skip
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-gtt.html

* igt@kms_frontbuffer_tracking@psr-modesetfrombusy:
- shard-rkl: NOTRUN -> [SKIP][96] ([i915#3023]) +22 other tests skip
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-cpu:
- shard-dg1: NOTRUN -> [SKIP][97] ([i915#3458]) +10 other tests skip
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@kms_hdr@invalid-hdr:
- shard-rkl: NOTRUN -> [SKIP][98] ([i915#3555] / [i915#8228])
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-3/igt@[email protected]

* igt@kms_hdr@static-swap:
- shard-dg1: NOTRUN -> [SKIP][99] ([i915#3555] / [i915#8228]) +1 other test skip
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@kms_panel_fitting@atomic-fastset:
- shard-dg1: NOTRUN -> [SKIP][100] ([i915#6301])
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@kms_plane_multiple@tiling-4:
- shard-rkl: NOTRUN -> [SKIP][101] ([i915#3555]) +5 other tests skip
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@kms_plane_scaling@plane-downscale-factor-0-25-with-rotation@pipe-b-hdmi-a-2:
- shard-dg2: NOTRUN -> [SKIP][102] ([i915#9423]) +24 other tests skip
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-3/igt@kms_plane_scaling@[email protected]

* igt@kms_plane_scaling@plane-downscale-factor-0-25-with-rotation@pipe-c-hdmi-a-3:
- shard-dg1: NOTRUN -> [SKIP][103] ([i915#9423]) +7 other tests skip
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-13/igt@kms_plane_scaling@[email protected]

* igt@kms_plane_scaling@plane-downscale-factor-0-75-with-rotation@pipe-a-hdmi-a-2:
- shard-rkl: NOTRUN -> [SKIP][104] ([i915#9423]) +7 other tests skip
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-3/igt@kms_plane_scaling@[email protected]

* igt@kms_plane_scaling@planes-downscale-factor-0-25-unity-scaling@pipe-b-hdmi-a-4:
- shard-dg1: NOTRUN -> [SKIP][105] ([i915#9728]) +3 other tests skip
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@kms_plane_scaling@[email protected]

* igt@kms_plane_scaling@planes-downscale-factor-0-25-upscale-factor-0-25@pipe-a-hdmi-a-3:
- shard-dg2: NOTRUN -> [SKIP][106] ([i915#5235] / [i915#9423]) +2 other tests skip
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-7/igt@kms_plane_scaling@planes-downscale-factor-0-25-upscale-factor-0-25@pipe-a-hdmi-a-3.html

* igt@kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-25@pipe-b-hdmi-a-2:
- shard-rkl: NOTRUN -> [SKIP][107] ([i915#9728]) +7 other tests skip
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-5/igt@kms_plane_scaling@[email protected]

* igt@kms_pm_backlight@fade-with-dpms:
- shard-rkl: NOTRUN -> [SKIP][108] ([i915#5354])
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-2/igt@[email protected]

* igt@kms_pm_dc@dc5-psr:
- shard-dg1: NOTRUN -> [SKIP][109] ([i915#9685])
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@kms_pm_dc@dc6-dpms:
- shard-tglu: [PASS][110] -> [FAIL][111] ([i915#9295])
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-tglu-6/igt@[email protected]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-tglu-9/igt@[email protected]

* igt@kms_pm_dc@dc6-psr:
- shard-rkl: NOTRUN -> [SKIP][112] ([i915#9685]) +1 other test skip
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@kms_pm_lpsp@kms-lpsp:
- shard-rkl: NOTRUN -> [SKIP][113] ([i915#9340])
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-3/igt@[email protected]

* igt@kms_pm_rpm@modeset-lpsp-stress:
- shard-dg1: NOTRUN -> [SKIP][114] ([i915#9519])
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@kms_pm_rpm@modeset-non-lpsp-stress:
- shard-dg2: [PASS][115] -> [SKIP][116] ([i915#9519]) +5 other tests skip
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-dg2-6/igt@[email protected]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-4/igt@[email protected]

* igt@kms_pm_rpm@modeset-non-lpsp-stress-no-wait:
- shard-rkl: [PASS][117] -> [SKIP][118] ([i915#9519]) +2 other tests skip
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-rkl-5/igt@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-fully-sf:
- shard-rkl: NOTRUN -> [SKIP][119] ([i915#11520]) +3 other tests skip
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-sf:
- shard-dg1: NOTRUN -> [SKIP][120] ([i915#11520]) +2 other tests skip
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@kms_psr2_su@page_flip-xrgb8888:
- shard-dg1: NOTRUN -> [SKIP][121] ([i915#9683])
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@kms_psr2_su@page_flip-xrgb8888.html

* igt@kms_psr@fbc-psr2-basic:
- shard-dg1: NOTRUN -> [SKIP][122] ([i915#1072] / [i915#9732]) +11 other tests skip
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-15/igt@[email protected]

* igt@kms_psr@psr-sprite-plane-move:
- shard-rkl: NOTRUN -> [SKIP][123] ([i915#1072] / [i915#9732]) +19 other tests skip
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-3/igt@[email protected]

* igt@kms_rotation_crc@primary-yf-tiled-reflect-x-90:
- shard-rkl: NOTRUN -> [SKIP][124] ([i915#5289])
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@kms_sysfs_edid_timing:
- shard-dg1: NOTRUN -> [FAIL][125] ([IGT#2] / [i915#6493])
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-16/igt@kms_sysfs_edid_timing.html

* igt@kms_tiled_display@basic-test-pattern:
- shard-rkl: NOTRUN -> [SKIP][126] ([i915#8623])
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-2/igt@[email protected]

* igt@kms_vrr@max-min:
- shard-rkl: NOTRUN -> [SKIP][127] ([i915#9906])
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@kms_writeback@writeback-check-output:
- shard-dg1: NOTRUN -> [SKIP][128] ([i915#2437])
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@kms_writeback@writeback-check-output-xrgb2101010:
- shard-rkl: NOTRUN -> [SKIP][129] ([i915#2437] / [i915#9412]) +1 other test skip
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-2/igt@[email protected]

* igt@kms_writeback@writeback-fb-id:
- shard-rkl: NOTRUN -> [SKIP][130] ([i915#2437])
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

* igt@perf_pmu@busy-double-start@vecs1:
- shard-dg2: [PASS][131] -> [FAIL][132] ([i915#4349]) +3 other tests fail
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-dg2-6/igt@perf_pmu@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-4/igt@perf_pmu@[email protected]

* igt@perf_pmu@rc6@other-idle-gt0:
- shard-rkl: NOTRUN -> [SKIP][133] ([i915#8516])
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-3/igt@perf_pmu@[email protected]

* igt@prime_vgem@basic-gtt:
- shard-dg1: NOTRUN -> [SKIP][134] ([i915#3708] / [i915#4077])
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg1-18/igt@[email protected]

* igt@prime_vgem@basic-write:
- shard-rkl: NOTRUN -> [SKIP][135] ([i915#3291] / [i915#3708])
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-3/igt@[email protected]

* igt@sriov_basic@enable-vfs-autoprobe-on:
- shard-rkl: NOTRUN -> [SKIP][136] ([i915#9917])
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-4/igt@[email protected]

#### Possible fixes ####

* igt@gem_ctx_persistence@smoketest:
- shard-glk: [INCOMPLETE][137] -> [PASS][138]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-glk8/igt@[email protected]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-glk3/igt@[email protected]

* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-rkl: [FAIL][139] ([i915#2842]) -> [PASS][140]
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-rkl-5/igt@gem_exec_fair@[email protected]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-6/igt@gem_exec_fair@[email protected]

* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-onoff:
- shard-snb: [SKIP][141] -> [PASS][142]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-snb4/igt@[email protected]
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-snb7/igt@[email protected]

* igt@kms_pm_rpm@i2c:
- shard-dg2: [FAIL][143] ([i915#8717]) -> [PASS][144]
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-dg2-2/igt@[email protected]
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-5/igt@[email protected]

* igt@kms_pm_rpm@modeset-lpsp-stress:
- shard-dg2: [SKIP][145] ([i915#9519]) -> [PASS][146]
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-dg2-5/igt@[email protected]
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-8/igt@[email protected]

* igt@kms_setmode@basic@pipe-b-hdmi-a-2:
- shard-rkl: [FAIL][147] ([i915#5465]) -> [PASS][148] +1 other test pass
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-rkl-5/igt@kms_setmode@[email protected]
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-6/igt@kms_setmode@[email protected]

* igt@kms_universal_plane@cursor-fb-leak@pipe-b-edp-1:
- shard-mtlp: [FAIL][149] ([i915#9196]) -> [PASS][150]
[149]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-mtlp-1/igt@kms_universal_plane@[email protected]
[150]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-mtlp-3/igt@kms_universal_plane@[email protected]

#### Warnings ####

* igt@i915_module_load@reload-with-fault-injection:
- shard-tglu: [ABORT][151] ([i915#10887] / [i915#9820]) -> [ABORT][152] ([i915#9820])
[151]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-tglu-5/igt@[email protected]
[152]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-tglu-9/igt@[email protected]

* igt@kms_cursor_crc@cursor-onscreen-512x170:
- shard-dg2: [SKIP][153] ([i915#11453] / [i915#3359]) -> [SKIP][154] ([i915#11453])
[153]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-dg2-11/igt@[email protected]
[154]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-3/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-mmap-cpu:
- shard-dg2: [SKIP][155] ([i915#3458]) -> [SKIP][156] ([i915#10433] / [i915#3458])
[155]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-dg2-1/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-mmap-cpu.html
[156]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-4/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-mmap-cpu.html

* igt@kms_frontbuffer_tracking@psr-rgb565-draw-mmap-cpu:
- shard-dg2: [SKIP][157] ([i915#10433] / [i915#3458]) -> [SKIP][158] ([i915#3458]) +4 other tests skip
[157]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-dg2-4/igt@[email protected]
[158]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-10/igt@[email protected]

* igt@kms_pm_dc@dc9-dpms:
- shard-rkl: [SKIP][159] ([i915#3361]) -> [SKIP][160] ([i915#4281])
[159]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-rkl-4/igt@[email protected]
[160]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-rkl-5/igt@[email protected]

* igt@kms_psr@fbc-psr2-sprite-mmap-cpu:
- shard-dg2: [SKIP][161] ([i915#1072] / [i915#9673] / [i915#9732]) -> [SKIP][162] ([i915#1072] / [i915#9732]) +15 other tests skip
[161]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-dg2-11/igt@[email protected]
[162]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-3/igt@[email protected]

* igt@kms_psr@psr2-primary-blt:
- shard-dg2: [SKIP][163] ([i915#1072] / [i915#9732]) -> [SKIP][164] ([i915#1072] / [i915#9673] / [i915#9732]) +11 other tests skip
[163]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15187/shard-dg2-3/igt@[email protected]
[164]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_136927v1/shard-dg2-11/igt@[email protected]

[IGT#2]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/2
[i915#10307]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10307
[i915#10433]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10433
[i915#10434]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10434
[i915#10446]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10446
[i915#10656]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10656
[i915#1072]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1072
[i915#10887]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10887
[i915#11453]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11453
[i915#11520]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11520
[i915#11814]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11814
[i915#11815]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11815
[i915#1825]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1839
[i915#2122]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2122
[i915#2190]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2190
[i915#2346]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2346
[i915#2437]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2527
[i915#2587]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2587
[i915#2672]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2672
[i915#280]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/280
[i915#2842]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2842
[i915#3023]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3023
[i915#3116]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3116
[i915#3281]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3291
[i915#3297]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3299
[i915#3359]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3359
[i915#3361]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3361
[i915#3458]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3458
[i915#3555]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3555
[i915#3638]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3638
[i915#3708]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3708
[i915#3742]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3742
[i915#3840]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3840
[i915#4077]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4077
[i915#4083]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4083
[i915#4103]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4213
[i915#4270]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4270
[i915#4281]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4281
[i915#4349]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4349
[i915#4525]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4525
[i915#4538]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4538
[i915#4613]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4613
[i915#4860]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4860
[i915#5235]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5286
[i915#5289]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5289
[i915#5354]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5354
[i915#5465]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5465
[i915#5956]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5956
[i915#6095]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6095
[i915#6230]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6230
[i915#6245]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6245
[i915#6301]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6301
[i915#6334]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6334
[i915#6493]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6493
[i915#6590]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6590
[i915#6621]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6621
[i915#6880]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6880
[i915#7116]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7118
[i915#7173]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7173
[i915#7697]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7697
[i915#7742]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7828
[i915#8228]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8228
[i915#8399]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8399
[i915#8411]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8411
[i915#8414]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8414
[i915#8516]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8516
[i915#8555]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8555
[i915#8623]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8623
[i915#8708]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8708
[i915#8709]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8709
[i915#8717]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8717
[i915#9053]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9053
[i915#9196]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9196
[i915#9295]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9295
[i915#9323]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9323
[i915#9340]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9340
[i915#9412]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9412
[i915#9423]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9423
[i915#9424]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9424
[i915#9519]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9519
[i915#9673]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9673
[i915#9683]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9683
[i915#9685]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9685
[i915#9723]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9723
[i915#9728]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9728
[i915#9732]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9732
[i915#9820]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9820
[i915#9906]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9906
[i915#9917]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9917
[i915#9934]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9934

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

* Linux: CI_DRM_15187 -> Patchwork_136927v1

CI-20190529: 20190529
CI_DRM_15187: 83eea64f81edb86ed3aa368039520810c154fd94 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7957: cb9121cf18a2fa8dfa1f663484f3a460b95e1b41 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_136927v1: 83eea64f81edb86ed3aa368039520810c154fd94 @ 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_136927v1/index.html

maintainer
#3 lore raw

Re: [PATCH 1/3] drm/i915: remove a few __i915_printk() uses

In reply to Jani Nikula
Quoted 2 lines · Jani Nikula

__i915_printk() does nothing for notice/info levels. Just use the regular drm_notice() and drm_info() calls.

"does nothing"? You mean does nothing _special_?

The patch itself looks okay.

Regards,

Tvrtko

Quoted 33 lines
---
  drivers/gpu/drm/i915/i915_utils.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_utils.c +5 -5
index 6f9e7b354b54..bee32222f0fd 100644
@@ -54,8 +54,8 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level,
 
  void add_taint_for_CI(struct drm_i915_private *i915, unsigned int taint)
  {
-	__i915_printk(i915, KERN_NOTICE, "CI tainted:%#x by %pS\n",
-		      taint, (void *)_RET_IP_);
+	drm_notice(&i915->drm, "CI tainted: %#x by %pS\n",
+		   taint, __builtin_return_address(0));
 
  	/* Failures that occur during fault injection testing are expected */
  	if (!i915_error_injected())
@@ -74,9 +74,9 @@ int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
  	if (++i915_probe_fail_count < i915_modparams.inject_probe_failure)
  		return 0;
 
-	__i915_printk(i915, KERN_INFO,
-		      "Injecting failure %d at checkpoint %u [%s:%d]\n",
-		      err, i915_modparams.inject_probe_failure, func, line);
+	drm_info(&i915->drm, "Injecting failure %d at checkpoint %u [%s:%d]\n",
+		 err, i915_modparams.inject_probe_failure, func, line);
+
  	i915_modparams.inject_probe_failure = 0;
  	return err;
  }
maintainer Reviewed-by on v1 2/3
#8 lore raw

Re: [PATCH 2/3] drm/i915: remove i915_report_error()

In reply to Jani Nikula
Quoted 42 lines · Jani Nikula

i915_report_error() has only two users, both in driver probe. I doubt these cases are worth having a dedicated wrapper to also print bug reporting info. Just switch them to regular drm_err() and remove the wrapper.

---
  drivers/gpu/drm/i915/i915_driver.c | 8 ++++----
  drivers/gpu/drm/i915/i915_utils.h  | 3 ---
  2 files changed, 4 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_driver.c +4 -4
index fb8e9c2fcea5..94dca1d8bb15 100644
@@ -451,8 +451,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
  	if (HAS_PPGTT(dev_priv)) {
  		if (intel_vgpu_active(dev_priv) &&
  		    !intel_vgpu_has_full_ppgtt(dev_priv)) {
-			i915_report_error(dev_priv,
-					  "incompatible vGPU found, support for isolated ppGTT required\n");
+			drm_err(&dev_priv->drm,
+				"incompatible vGPU found, support for isolated ppGTT required\n");
  			return -ENXIO;
  		}
  	}
@@ -465,8 +465,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
  		 */
  		if (intel_vgpu_active(dev_priv) &&
  		    !intel_vgpu_has_hwsp_emulation(dev_priv)) {
-			i915_report_error(dev_priv,
-					  "old vGPU host found, support for HWSP emulation required\n");
+			drm_err(&dev_priv->drm,
+				"old vGPU host found, support for HWSP emulation required\n");
  			return -ENXIO;
  		}
  	}
drivers/gpu/drm/i915/i915_utils.h +0 -0
index 06ec6ceb61d5..feb078ae246f 100644

drivers/gpu/drm/i915/i915_utils.h void __printf(3, 4) · line 54

Quoted 9 lines
drivers/gpu/drm/i915/i915_utils.h +0 -3
@@ -49,9 +49,6 @@ void __printf(3, 4)
  __i915_printk(struct drm_i915_private *dev_priv, const char *level,
  	      const char *fmt, ...);
 
-#define i915_report_error(dev_priv, fmt, ...)				   \
-	__i915_printk(dev_priv, KERN_ERR, fmt, ##__VA_ARGS__)
-
  #if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
 
  int __i915_inject_probe_error(struct drm_i915_private *i915, int err,

Regards,

Tvrtko

maintainer
#12 lore raw
In reply to Jani Nikula
Quoted 4 lines · Jani Nikula

With the previous cleanups, the last remaining user of __i915_printk() is i915_probe_error(). Switch that to use drm_dbg() and drm_err() instead, dropping the request to report bugs in the few remaining specific cases.

Aren't those few cases legitimate probe failures, including anything unexpected which results in non-operational GPU (any -EIO from intel_gt_init())?

So it is effectively completely(*) removing the request to file bugs, or I miss something remained? Or the unmentioned goal is to encourage fewer i915 bug reports on top of the code base cleanup?

Regards,

Tvrtko

*) Apart from display/intel_dp_aux_backlight.c !? :)

Quoted 89 lines
---
  drivers/gpu/drm/i915/i915_utils.c | 41 -------------------------------
  drivers/gpu/drm/i915/i915_utils.h | 13 +++++-----
  2 files changed, 6 insertions(+), 48 deletions(-)
drivers/gpu/drm/i915/i915_utils.c +0 -41
index bee32222f0fd..b34a2d3d331d 100644
@@ -11,47 +11,6 @@
  #include "i915_reg.h"
  #include "i915_utils.h"
 
-#define FDO_BUG_MSG "Please file a bug on drm/i915; see " FDO_BUG_URL " for details."
-
-void
-__i915_printk(struct drm_i915_private *dev_priv, const char *level,
-	      const char *fmt, ...)
-{
-	static bool shown_bug_once;
-	struct device *kdev = dev_priv->drm.dev;
-	bool is_error = level[1] <= KERN_ERR[1];
-	bool is_debug = level[1] == KERN_DEBUG[1];
-	struct va_format vaf;
-	va_list args;
-
-	if (is_debug && !drm_debug_enabled(DRM_UT_DRIVER))
-		return;
-
-	va_start(args, fmt);
-
-	vaf.fmt = fmt;
-	vaf.va = &args;
-
-	if (is_error)
-		dev_printk(level, kdev, "%pV", &vaf);
-	else
-		dev_printk(level, kdev, "[" DRM_NAME ":%ps] %pV",
-			   __builtin_return_address(0), &vaf);
-
-	va_end(args);
-
-	if (is_error && !shown_bug_once) {
-		/*
-		 * Ask the user to file a bug report for the error, except
-		 * if they may have caused the bug by fiddling with unsafe
-		 * module parameters.
-		 */
-		if (!test_taint(TAINT_USER))
-			dev_notice(kdev, "%s", FDO_BUG_MSG);
-		shown_bug_once = true;
-	}
-}
-
  void add_taint_for_CI(struct drm_i915_private *i915, unsigned int taint)
  {
  	drm_notice(&i915->drm, "CI tainted: %#x by %pS\n",
drivers/gpu/drm/i915/i915_utils.h +6 -7
index feb078ae246f..71bdc89bd621 100644
@@ -45,10 +45,6 @@ struct timer_list;
  #define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \
  			     __stringify(x), (long)(x))
 
-void __printf(3, 4)
-__i915_printk(struct drm_i915_private *dev_priv, const char *level,
-	      const char *fmt, ...);
-
  #if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
 
  int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
@@ -66,9 +62,12 @@ bool i915_error_injected(void);
 
  #define i915_inject_probe_failure(i915) i915_inject_probe_error((i915), -ENODEV)
 
-#define i915_probe_error(i915, fmt, ...)				   \
-	__i915_printk(i915, i915_error_injected() ? KERN_DEBUG : KERN_ERR, \
-		      fmt, ##__VA_ARGS__)
+#define i915_probe_error(i915, fmt, ...) ({ \
+	if (i915_error_injected()) \
+		drm_dbg(&(i915)->drm, fmt, ##__VA_ARGS__); \
+	else \
+		drm_err(&(i915)->drm, fmt, ##__VA_ARGS__); \
+})
 
  #define range_overflows(start, size, max) ({ \
  	typeof(start) start__ = (start); \
#4 lore raw

Re: [PATCH 1/3] drm/i915: remove a few __i915_printk() uses

In reply to Tvrtko Ursulin
Quoted 5 lines · Tvrtko Ursulin
Quoted 2 lines · Jani Nikula

__i915_printk() does nothing for notice/info levels. Just use the regular drm_notice() and drm_info() calls.

"does nothing"? You mean does nothing _special_?

Yeah, does nothing in addition to the regular drm logging that we switch to.

Quoted 40 lines

The patch itself looks okay.

Regards,

Tvrtko

Quoted 33 lines
---
  drivers/gpu/drm/i915/i915_utils.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_utils.c +5 -5
index 6f9e7b354b54..bee32222f0fd 100644
@@ -54,8 +54,8 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level,
 
  void add_taint_for_CI(struct drm_i915_private *i915, unsigned int taint)
  {
-	__i915_printk(i915, KERN_NOTICE, "CI tainted:%#x by %pS\n",
-		      taint, (void *)_RET_IP_);
+	drm_notice(&i915->drm, "CI tainted: %#x by %pS\n",
+		   taint, __builtin_return_address(0));
 
  	/* Failures that occur during fault injection testing are expected */
  	if (!i915_error_injected())
@@ -74,9 +74,9 @@ int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
  	if (++i915_probe_fail_count < i915_modparams.inject_probe_failure)
  		return 0;
 
-	__i915_printk(i915, KERN_INFO,
-		      "Injecting failure %d at checkpoint %u [%s:%d]\n",
-		      err, i915_modparams.inject_probe_failure, func, line);
+	drm_info(&i915->drm, "Injecting failure %d at checkpoint %u [%s:%d]\n",
+		 err, i915_modparams.inject_probe_failure, func, line);
+
  	i915_modparams.inject_probe_failure = 0;
  	return err;
  }
Signature · 1 line
Jani Nikula, Intel
#13 lore raw
In reply to Tvrtko Ursulin
Quoted 9 lines · Tvrtko Ursulin
Quoted 4 lines · Jani Nikula

With the previous cleanups, the last remaining user of __i915_printk() is i915_probe_error(). Switch that to use drm_dbg() and drm_err() instead, dropping the request to report bugs in the few remaining specific cases.

Aren't those few cases legitimate probe failures, including anything unexpected which results in non-operational GPU (any -EIO from intel_gt_init())?

They are, and they're still logged as such. Functionally, the only change is removing the bug filing request.

Quoted 3 lines

So it is effectively completely(*) removing the request to file bugs, or I miss something remained? Or the unmentioned goal is to encourage fewer i915 bug reports on top of the code base cleanup?

I should've elaborated this better.

My question is, what makes these cases so special that they warrant logging a bug filing request? First, I would assume the init paths are most tested in CI and least likely to trigger a failure on end user machines. Second, even if they did trigger for the end user, a non-operational GPU is most likely to lead to a bug report even without a request.

To me it just seems weird, and I opted to remove them, not least because it's not common for drivers to do this at all. (And yes, I'd remove the backlight one too.)

The other option is to embrace logging bug reporting requests. But for that I'd rather add a separate function, call it at the relevant places, and not hide it within this complex maze of multi-level debug logging macros.

BR,
Jani.

Quoted 96 lines

Regards,

Tvrtko

*) Apart from display/intel_dp_aux_backlight.c !? :)

Quoted 89 lines
---
  drivers/gpu/drm/i915/i915_utils.c | 41 -------------------------------
  drivers/gpu/drm/i915/i915_utils.h | 13 +++++-----
  2 files changed, 6 insertions(+), 48 deletions(-)
drivers/gpu/drm/i915/i915_utils.c +0 -41
index bee32222f0fd..b34a2d3d331d 100644
@@ -11,47 +11,6 @@
  #include "i915_reg.h"
  #include "i915_utils.h"
 
-#define FDO_BUG_MSG "Please file a bug on drm/i915; see " FDO_BUG_URL " for details."
-
-void
-__i915_printk(struct drm_i915_private *dev_priv, const char *level,
-	      const char *fmt, ...)
-{
-	static bool shown_bug_once;
-	struct device *kdev = dev_priv->drm.dev;
-	bool is_error = level[1] <= KERN_ERR[1];
-	bool is_debug = level[1] == KERN_DEBUG[1];
-	struct va_format vaf;
-	va_list args;
-
-	if (is_debug && !drm_debug_enabled(DRM_UT_DRIVER))
-		return;
-
-	va_start(args, fmt);
-
-	vaf.fmt = fmt;
-	vaf.va = &args;
-
-	if (is_error)
-		dev_printk(level, kdev, "%pV", &vaf);
-	else
-		dev_printk(level, kdev, "[" DRM_NAME ":%ps] %pV",
-			   __builtin_return_address(0), &vaf);
-
-	va_end(args);
-
-	if (is_error && !shown_bug_once) {
-		/*
-		 * Ask the user to file a bug report for the error, except
-		 * if they may have caused the bug by fiddling with unsafe
-		 * module parameters.
-		 */
-		if (!test_taint(TAINT_USER))
-			dev_notice(kdev, "%s", FDO_BUG_MSG);
-		shown_bug_once = true;
-	}
-}
-
  void add_taint_for_CI(struct drm_i915_private *i915, unsigned int taint)
  {
  	drm_notice(&i915->drm, "CI tainted: %#x by %pS\n",
drivers/gpu/drm/i915/i915_utils.h +6 -7
index feb078ae246f..71bdc89bd621 100644
@@ -45,10 +45,6 @@ struct timer_list;
  #define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \
  			     __stringify(x), (long)(x))
 
-void __printf(3, 4)
-__i915_printk(struct drm_i915_private *dev_priv, const char *level,
-	      const char *fmt, ...);
-
  #if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
 
  int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
@@ -66,9 +62,12 @@ bool i915_error_injected(void);
 
  #define i915_inject_probe_failure(i915) i915_inject_probe_error((i915), -ENODEV)
 
-#define i915_probe_error(i915, fmt, ...)				   \
-	__i915_printk(i915, i915_error_injected() ? KERN_DEBUG : KERN_ERR, \
-		      fmt, ##__VA_ARGS__)
+#define i915_probe_error(i915, fmt, ...) ({ \
+	if (i915_error_injected()) \
+		drm_dbg(&(i915)->drm, fmt, ##__VA_ARGS__); \
+	else \
+		drm_err(&(i915)->drm, fmt, ##__VA_ARGS__); \
+})
 
  #define range_overflows(start, size, max) ({ \
  	typeof(start) start__ = (start); \
Signature · 1 line
Jani Nikula, Intel
maintainer Acked-by
#14 lore raw
Quoted 18 lines · Jani Nikula
Quoted 9 lines · Tvrtko Ursulin
Quoted 4 lines · Jani Nikula

With the previous cleanups, the last remaining user of __i915_printk() is i915_probe_error(). Switch that to use drm_dbg() and drm_err() instead, dropping the request to report bugs in the few remaining specific cases.

Aren't those few cases legitimate probe failures, including anything unexpected which results in non-operational GPU (any -EIO from intel_gt_init())?

They are, and they're still logged as such. Functionally, the only change is removing the bug filing request.

Quoted 3 lines

So it is effectively completely(*) removing the request to file bugs, or I miss something remained? Or the unmentioned goal is to encourage fewer i915 bug reports on top of the code base cleanup?

Quoted 8 lines

I should've elaborated this better.

My question is, what makes these cases so special that they warrant logging a bug filing request? First, I would assume the init paths are most tested in CI and least likely to trigger a failure on end user machines. Second, even if they did trigger for the end user, a non-operational GPU is most likely to lead to a bug report even without a request.

Yeah I tend to agree. Just wanted to probe a bit more on the motivation.

Error captures aside, other places which can fail and which we are discussing here are a bit too varied and I agree it is better to simplify, rather than pretend some are more important than the others.

Regards,

Tvrtko

Quoted 112 lines

To me it just seems weird, and I opted to remove them, not least because it's not common for drivers to do this at all. (And yes, I'd remove the backlight one too.)

The other option is to embrace logging bug reporting requests. But for that I'd rather add a separate function, call it at the relevant places, and not hide it within this complex maze of multi-level debug logging macros.

BR,
Jani.

Quoted 96 lines

Regards,

Tvrtko

*) Apart from display/intel_dp_aux_backlight.c !? :)

Quoted 89 lines
---
   drivers/gpu/drm/i915/i915_utils.c | 41 -------------------------------
   drivers/gpu/drm/i915/i915_utils.h | 13 +++++-----
   2 files changed, 6 insertions(+), 48 deletions(-)
drivers/gpu/drm/i915/i915_utils.c +0 -41
index bee32222f0fd..b34a2d3d331d 100644
@@ -11,47 +11,6 @@
   #include "i915_reg.h"
   #include "i915_utils.h"
 
-#define FDO_BUG_MSG "Please file a bug on drm/i915; see " FDO_BUG_URL " for details."
-
-void
-__i915_printk(struct drm_i915_private *dev_priv, const char *level,
-	      const char *fmt, ...)
-{
-	static bool shown_bug_once;
-	struct device *kdev = dev_priv->drm.dev;
-	bool is_error = level[1] <= KERN_ERR[1];
-	bool is_debug = level[1] == KERN_DEBUG[1];
-	struct va_format vaf;
-	va_list args;
-
-	if (is_debug && !drm_debug_enabled(DRM_UT_DRIVER))
-		return;
-
-	va_start(args, fmt);
-
-	vaf.fmt = fmt;
-	vaf.va = &args;
-
-	if (is_error)
-		dev_printk(level, kdev, "%pV", &vaf);
-	else
-		dev_printk(level, kdev, "[" DRM_NAME ":%ps] %pV",
-			   __builtin_return_address(0), &vaf);
-
-	va_end(args);
-
-	if (is_error && !shown_bug_once) {
-		/*
-		 * Ask the user to file a bug report for the error, except
-		 * if they may have caused the bug by fiddling with unsafe
-		 * module parameters.
-		 */
-		if (!test_taint(TAINT_USER))
-			dev_notice(kdev, "%s", FDO_BUG_MSG);
-		shown_bug_once = true;
-	}
-}
-
   void add_taint_for_CI(struct drm_i915_private *i915, unsigned int taint)
   {
   	drm_notice(&i915->drm, "CI tainted: %#x by %pS\n",
drivers/gpu/drm/i915/i915_utils.h +6 -7
index feb078ae246f..71bdc89bd621 100644
@@ -45,10 +45,6 @@ struct timer_list;
   #define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \
   			     __stringify(x), (long)(x))
 
-void __printf(3, 4)
-__i915_printk(struct drm_i915_private *dev_priv, const char *level,
-	      const char *fmt, ...);
-
   #if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
 
   int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
@@ -66,9 +62,12 @@ bool i915_error_injected(void);
 
   #define i915_inject_probe_failure(i915) i915_inject_probe_error((i915), -ENODEV)
 
-#define i915_probe_error(i915, fmt, ...)				   \
-	__i915_printk(i915, i915_error_injected() ? KERN_DEBUG : KERN_ERR, \
-		      fmt, ##__VA_ARGS__)
+#define i915_probe_error(i915, fmt, ...) ({ \
+	if (i915_error_injected()) \
+		drm_dbg(&(i915)->drm, fmt, ##__VA_ARGS__); \
+	else \
+		drm_err(&(i915)->drm, fmt, ##__VA_ARGS__); \
+})
 
   #define range_overflows(start, size, max) ({ \
   	typeof(start) start__ = (start); \
Reviewed-by on v1 2/3
#9 lore raw

Re: [PATCH 2/3] drm/i915: remove i915_report_error()

In reply to Jani Nikula

Hi Jani,

Quoted 6 lines · Jani Nikula

i915_report_error() has only two users, both in driver probe. I doubt these cases are worth having a dedicated wrapper to also print bug reporting info. Just switch them to regular drm_err() and remove the wrapper.

with the commit log imrpovement suggested by Jonathan:

Thanks,
Andi

#20 lore raw
In reply to Jani Nikula
Quoted 3 lines · Jani Nikula

I don't think we need the bug reporting request in the few specific places that lead to __i915_printk(). With them gone, there's really no need for __i915_printk(). Just switch to regular drm logging.

Thanks for the reviews and acks, pushed to din with some of the commit messages improved.

BR,
Jani.

Quoted 10 lines

Jani Nikula (3):
drm/i915: remove a few __i915_printk() uses
drm/i915: remove i915_report_error()
drm/i915: remove __i915_printk()

 drivers/gpu/drm/i915/i915_driver.c |  8 ++---
 drivers/gpu/drm/i915/i915_utils.c  | 51 +++---------------------------
 drivers/gpu/drm/i915/i915_utils.h  | 16 ++++------
 3 files changed, 15 insertions(+), 60 deletions(-)
Signature · 1 line
Jani Nikula, Intel