* [Intel-gfx] [PATCH 0/5] drm/i915/display: debugfs cleanups
@ 2021-08-30 12:53 Jani Nikula
2021-08-30 12:53 ` [Intel-gfx] [PATCH 1/5] drm/i915/debugfs: clean up LPSP status Jani Nikula
` (7 more replies)
0 siblings, 8 replies; 24+ messages in thread
From: Jani Nikula @ 2021-08-30 12:53 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Some minor cleanupi of the display debugfs code.
BR,
Jani.
Jani Nikula (5):
drm/i915/debugfs: clean up LPSP status
drm/i915/debugfs: clean up LPSP capable
drm/i915/debugfs: register LPSP capability on all platforms
drm/i915/display: stop returning errors from debugfs registration
drm/i915/debugfs: pass intel_connector to
intel_connector_debugfs_add()
.../gpu/drm/i915/display/intel_connector.c | 2 +-
.../drm/i915/display/intel_display_debugfs.c | 114 ++++++------------
.../drm/i915/display/intel_display_debugfs.h | 10 +-
3 files changed, 45 insertions(+), 81 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Intel-gfx] [PATCH 1/5] drm/i915/debugfs: clean up LPSP status
2021-08-30 12:53 [Intel-gfx] [PATCH 0/5] drm/i915/display: debugfs cleanups Jani Nikula
@ 2021-08-30 12:53 ` Jani Nikula
2021-09-01 16:13 ` Rodrigo Vivi
2021-08-30 12:53 ` [Intel-gfx] [PATCH 2/5] drm/i915/debugfs: clean up LPSP capable Jani Nikula
` (6 subsequent siblings)
7 siblings, 1 reply; 24+ messages in thread
From: Jani Nikula @ 2021-08-30 12:53 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Clean up the LPSP status printout. No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../drm/i915/display/intel_display_debugfs.c | 37 ++++++-------------
1 file changed, 11 insertions(+), 26 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 8fdacb252bb1..d2a14a9c6857 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -1323,9 +1323,6 @@ static int i915_drrs_status(struct seq_file *m, void *unused)
return 0;
}
-#define LPSP_STATUS(COND) (COND ? seq_puts(m, "LPSP: enabled\n") : \
- seq_puts(m, "LPSP: disabled\n"))
-
static bool
intel_lpsp_power_well_enabled(struct drm_i915_private *i915,
enum i915_power_well_id power_well_id)
@@ -1344,32 +1341,20 @@ intel_lpsp_power_well_enabled(struct drm_i915_private *i915,
static int i915_lpsp_status(struct seq_file *m, void *unused)
{
struct drm_i915_private *i915 = node_to_i915(m->private);
-
- if (DISPLAY_VER(i915) >= 13) {
- LPSP_STATUS(!intel_lpsp_power_well_enabled(i915,
- SKL_DISP_PW_2));
+ bool lpsp_enabled = false;
+
+ if (DISPLAY_VER(i915) >= 13 || IS_DISPLAY_VER(i915, 9, 10)) {
+ lpsp_enabled = !intel_lpsp_power_well_enabled(i915, SKL_DISP_PW_2);
+ } else if (IS_DISPLAY_VER(i915, 11, 12)) {
+ lpsp_enabled = !intel_lpsp_power_well_enabled(i915, ICL_DISP_PW_3);
+ } else if (IS_HASWELL(i915) || IS_BROADWELL(i915)) {
+ lpsp_enabled = !intel_lpsp_power_well_enabled(i915, HSW_DISP_PW_GLOBAL);
+ } else {
+ seq_puts(m, "LPSP: not supported\n");
return 0;
}
- switch (DISPLAY_VER(i915)) {
- case 12:
- case 11:
- LPSP_STATUS(!intel_lpsp_power_well_enabled(i915, ICL_DISP_PW_3));
- break;
- case 10:
- case 9:
- LPSP_STATUS(!intel_lpsp_power_well_enabled(i915, SKL_DISP_PW_2));
- break;
- default:
- /*
- * Apart from HASWELL/BROADWELL other legacy platform doesn't
- * support lpsp.
- */
- if (IS_HASWELL(i915) || IS_BROADWELL(i915))
- LPSP_STATUS(!intel_lpsp_power_well_enabled(i915, HSW_DISP_PW_GLOBAL));
- else
- seq_puts(m, "LPSP: not supported\n");
- }
+ seq_printf(m, "LPSP: %s\n", enableddisabled(lpsp_enabled));
return 0;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [Intel-gfx] [PATCH 2/5] drm/i915/debugfs: clean up LPSP capable
2021-08-30 12:53 [Intel-gfx] [PATCH 0/5] drm/i915/display: debugfs cleanups Jani Nikula
2021-08-30 12:53 ` [Intel-gfx] [PATCH 1/5] drm/i915/debugfs: clean up LPSP status Jani Nikula
@ 2021-08-30 12:53 ` Jani Nikula
2021-09-01 16:14 ` Rodrigo Vivi
2021-08-30 12:53 ` [Intel-gfx] [PATCH 3/5] drm/i915/debugfs: register LPSP capability on all platforms Jani Nikula
` (5 subsequent siblings)
7 siblings, 1 reply; 24+ messages in thread
From: Jani Nikula @ 2021-08-30 12:53 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Clean up the LPSP capability printout. No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../drm/i915/display/intel_display_debugfs.c | 44 +++++++------------
1 file changed, 17 insertions(+), 27 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index d2a14a9c6857..a6dcb95cfc1f 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -2225,14 +2225,12 @@ static int i915_psr_status_show(struct seq_file *m, void *data)
}
DEFINE_SHOW_ATTRIBUTE(i915_psr_status);
-#define LPSP_CAPABLE(COND) (COND ? seq_puts(m, "LPSP: capable\n") : \
- seq_puts(m, "LPSP: incapable\n"))
-
static int i915_lpsp_capability_show(struct seq_file *m, void *data)
{
struct drm_connector *connector = m->private;
struct drm_i915_private *i915 = to_i915(connector->dev);
struct intel_encoder *encoder;
+ bool lpsp_capable = false;
encoder = intel_attached_encoder(to_intel_connector(connector));
if (!encoder)
@@ -2241,35 +2239,27 @@ static int i915_lpsp_capability_show(struct seq_file *m, void *data)
if (connector->status != connector_status_connected)
return -ENODEV;
- if (DISPLAY_VER(i915) >= 13) {
- LPSP_CAPABLE(encoder->port <= PORT_B);
- return 0;
- }
-
- switch (DISPLAY_VER(i915)) {
- case 12:
+ if (DISPLAY_VER(i915) >= 13)
+ lpsp_capable = encoder->port <= PORT_B;
+ else if (DISPLAY_VER(i915) >= 12)
/*
* Actually TGL can drive LPSP on port till DDI_C
* but there is no physical connected DDI_C on TGL sku's,
* even driver is not initilizing DDI_C port for gen12.
*/
- LPSP_CAPABLE(encoder->port <= PORT_B);
- break;
- case 11:
- LPSP_CAPABLE(connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
- connector->connector_type == DRM_MODE_CONNECTOR_eDP);
- break;
- case 10:
- case 9:
- LPSP_CAPABLE(encoder->port == PORT_A &&
- (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
- connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
- connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort));
- break;
- default:
- if (IS_HASWELL(i915) || IS_BROADWELL(i915))
- LPSP_CAPABLE(connector->connector_type == DRM_MODE_CONNECTOR_eDP);
- }
+ lpsp_capable = encoder->port <= PORT_B;
+ else if (DISPLAY_VER(i915) == 11)
+ lpsp_capable = (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
+ connector->connector_type == DRM_MODE_CONNECTOR_eDP);
+ else if (IS_DISPLAY_VER(i915, 9, 10))
+ lpsp_capable = (encoder->port == PORT_A &&
+ (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
+ connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
+ connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort));
+ else if (IS_HASWELL(i915) || IS_BROADWELL(i915))
+ lpsp_capable = connector->connector_type == DRM_MODE_CONNECTOR_eDP;
+
+ seq_printf(m, "LPSP: %s\n", lpsp_capable ? "capable" : "incapable");
return 0;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [Intel-gfx] [PATCH 3/5] drm/i915/debugfs: register LPSP capability on all platforms
2021-08-30 12:53 [Intel-gfx] [PATCH 0/5] drm/i915/display: debugfs cleanups Jani Nikula
2021-08-30 12:53 ` [Intel-gfx] [PATCH 1/5] drm/i915/debugfs: clean up LPSP status Jani Nikula
2021-08-30 12:53 ` [Intel-gfx] [PATCH 2/5] drm/i915/debugfs: clean up LPSP capable Jani Nikula
@ 2021-08-30 12:53 ` Jani Nikula
2021-09-01 16:19 ` Rodrigo Vivi
2021-08-30 12:53 ` [Intel-gfx] [PATCH 4/5] drm/i915/display: stop returning errors from debugfs registration Jani Nikula
` (4 subsequent siblings)
7 siblings, 1 reply; 24+ messages in thread
From: Jani Nikula @ 2021-08-30 12:53 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
The debugfs file shows it's not capable, don't duplicate the info.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../gpu/drm/i915/display/intel_display_debugfs.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index a6dcb95cfc1f..c1cd5d005e08 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -2486,14 +2486,11 @@ int intel_connector_debugfs_add(struct drm_connector *connector)
connector, &i915_dsc_bpp_fops);
}
- /* Legacy panels doesn't lpsp on any platform */
- if ((DISPLAY_VER(dev_priv) >= 9 || IS_HASWELL(dev_priv) ||
- IS_BROADWELL(dev_priv)) &&
- (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
- connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
- connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
- connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
- connector->connector_type == DRM_MODE_CONNECTOR_HDMIB))
+ if (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
+ connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
+ connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
+ connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
+ connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
debugfs_create_file("i915_lpsp_capability", 0444, root,
connector, &i915_lpsp_capability_fops);
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [Intel-gfx] [PATCH 4/5] drm/i915/display: stop returning errors from debugfs registration
2021-08-30 12:53 [Intel-gfx] [PATCH 0/5] drm/i915/display: debugfs cleanups Jani Nikula
` (2 preceding siblings ...)
2021-08-30 12:53 ` [Intel-gfx] [PATCH 3/5] drm/i915/debugfs: register LPSP capability on all platforms Jani Nikula
@ 2021-08-30 12:53 ` Jani Nikula
2021-09-01 16:20 ` Rodrigo Vivi
2021-08-30 12:53 ` [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add() Jani Nikula
` (3 subsequent siblings)
7 siblings, 1 reply; 24+ messages in thread
From: Jani Nikula @ 2021-08-30 12:53 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Failures to register debugfs should be ignored anyway, so stop
propagating errors altogether for clarity and simplicity. No functional
changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../drm/i915/display/intel_display_debugfs.c | 19 +++++--------------
.../drm/i915/display/intel_display_debugfs.h | 8 ++++----
2 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index c1cd5d005e08..845e2dc76f87 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -2443,17 +2443,15 @@ static const struct file_operations i915_dsc_bpp_fops = {
*
* Cleanup will be done by drm_connector_unregister() through a call to
* drm_debugfs_connector_remove().
- *
- * Returns 0 on success, negative error codes on error.
*/
-int intel_connector_debugfs_add(struct drm_connector *connector)
+void intel_connector_debugfs_add(struct drm_connector *connector)
{
struct dentry *root = connector->debugfs_entry;
struct drm_i915_private *dev_priv = to_i915(connector->dev);
/* The connector must have been registered beforehands. */
if (!root)
- return -ENODEV;
+ return;
if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
debugfs_create_file("i915_panel_timings", S_IRUGO, root,
@@ -2493,23 +2491,16 @@ int intel_connector_debugfs_add(struct drm_connector *connector)
connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
debugfs_create_file("i915_lpsp_capability", 0444, root,
connector, &i915_lpsp_capability_fops);
-
- return 0;
}
/**
* intel_crtc_debugfs_add - add i915 specific crtc debugfs files
* @crtc: pointer to a drm_crtc
*
- * Returns 0 on success, negative error codes on error.
- *
* Failure to add debugfs entries should generally be ignored.
*/
-int intel_crtc_debugfs_add(struct drm_crtc *crtc)
+void intel_crtc_debugfs_add(struct drm_crtc *crtc)
{
- if (!crtc->debugfs_entry)
- return -ENODEV;
-
- crtc_updates_add(crtc);
- return 0;
+ if (crtc->debugfs_entry)
+ crtc_updates_add(crtc);
}
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.h b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
index 557901f3eb90..c72e35ecba1f 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.h
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
@@ -12,12 +12,12 @@ struct drm_i915_private;
#ifdef CONFIG_DEBUG_FS
void intel_display_debugfs_register(struct drm_i915_private *i915);
-int intel_connector_debugfs_add(struct drm_connector *connector);
-int intel_crtc_debugfs_add(struct drm_crtc *crtc);
+void intel_connector_debugfs_add(struct drm_connector *connector);
+void intel_crtc_debugfs_add(struct drm_crtc *crtc);
#else
static inline void intel_display_debugfs_register(struct drm_i915_private *i915) {}
-static inline int intel_connector_debugfs_add(struct drm_connector *connector) { return 0; }
-static inline int intel_crtc_debugfs_add(struct drm_crtc *crtc) { return 0; }
+static inline void intel_connector_debugfs_add(struct drm_connector *connector) {}
+static inline void intel_crtc_debugfs_add(struct drm_crtc *crtc) {}
#endif
#endif /* __INTEL_DISPLAY_DEBUGFS_H__ */
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add()
2021-08-30 12:53 [Intel-gfx] [PATCH 0/5] drm/i915/display: debugfs cleanups Jani Nikula
` (3 preceding siblings ...)
2021-08-30 12:53 ` [Intel-gfx] [PATCH 4/5] drm/i915/display: stop returning errors from debugfs registration Jani Nikula
@ 2021-08-30 12:53 ` Jani Nikula
2021-08-30 14:02 ` [Intel-gfx] [PATCH v2] " Jani Nikula
` (4 more replies)
2021-08-30 13:31 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/display: debugfs cleanups Patchwork
` (2 subsequent siblings)
7 siblings, 5 replies; 24+ messages in thread
From: Jani Nikula @ 2021-08-30 12:53 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Prefer the intel_ types. No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_connector.c | 2 +-
drivers/gpu/drm/i915/display/intel_display_debugfs.c | 3 ++-
drivers/gpu/drm/i915/display/intel_display_debugfs.h | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
index 4f49d782eca2..c65f95a9a1ec 100644
--- a/drivers/gpu/drm/i915/display/intel_connector.c
+++ b/drivers/gpu/drm/i915/display/intel_connector.c
@@ -124,7 +124,7 @@ int intel_connector_register(struct drm_connector *connector)
goto err_backlight;
}
- intel_connector_debugfs_add(connector);
+ intel_connector_debugfs_add(intel_connector);
return 0;
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 845e2dc76f87..82043a71e91f 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -2444,8 +2444,9 @@ static const struct file_operations i915_dsc_bpp_fops = {
* Cleanup will be done by drm_connector_unregister() through a call to
* drm_debugfs_connector_remove().
*/
-void intel_connector_debugfs_add(struct drm_connector *connector)
+void intel_connector_debugfs_add(struct intel_connector *intel_connector)
{
+ struct drm_connector *connector = &intel_connector->base;
struct dentry *root = connector->debugfs_entry;
struct drm_i915_private *dev_priv = to_i915(connector->dev);
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.h b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
index c72e35ecba1f..9b89b707ffe6 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.h
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
@@ -6,9 +6,9 @@
#ifndef __INTEL_DISPLAY_DEBUGFS_H__
#define __INTEL_DISPLAY_DEBUGFS_H__
-struct drm_connector;
struct drm_crtc;
struct drm_i915_private;
+struct intel_connector;
#ifdef CONFIG_DEBUG_FS
void intel_display_debugfs_register(struct drm_i915_private *i915);
@@ -16,7 +16,7 @@ void intel_connector_debugfs_add(struct drm_connector *connector);
void intel_crtc_debugfs_add(struct drm_crtc *crtc);
#else
static inline void intel_display_debugfs_register(struct drm_i915_private *i915) {}
-static inline void intel_connector_debugfs_add(struct drm_connector *connector) {}
+static inline void intel_connector_debugfs_add(struct intel_connector *connector) {}
static inline void intel_crtc_debugfs_add(struct drm_crtc *crtc) {}
#endif
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/display: debugfs cleanups
2021-08-30 12:53 [Intel-gfx] [PATCH 0/5] drm/i915/display: debugfs cleanups Jani Nikula
` (4 preceding siblings ...)
2021-08-30 12:53 ` [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add() Jani Nikula
@ 2021-08-30 13:31 ` Patchwork
2021-08-30 14:43 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: debugfs cleanups (rev2) Patchwork
2021-08-30 16:59 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
7 siblings, 0 replies; 24+ messages in thread
From: Patchwork @ 2021-08-30 13:31 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/display: debugfs cleanups
URL : https://patchwork.freedesktop.org/series/94164/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
CC [M] drivers/gpu/drm/i915/display/intel_display_debugfs.o
drivers/gpu/drm/i915/display/intel_display_debugfs.c:2447:6: error: conflicting types for ‘intel_connector_debugfs_add’
void intel_connector_debugfs_add(struct intel_connector *intel_connector)
^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/i915/display/intel_display_debugfs.c:10:
drivers/gpu/drm/i915/display/intel_display_debugfs.h:15:6: note: previous declaration of ‘intel_connector_debugfs_add’ was here
void intel_connector_debugfs_add(struct drm_connector *connector);
^~~~~~~~~~~~~~~~~~~~~~~~~~~
scripts/Makefile.build:271: recipe for target 'drivers/gpu/drm/i915/display/intel_display_debugfs.o' failed
make[4]: *** [drivers/gpu/drm/i915/display/intel_display_debugfs.o] Error 1
scripts/Makefile.build:514: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:514: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:514: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1851: recipe for target 'drivers' failed
make: *** [drivers] Error 2
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Intel-gfx] [PATCH v2] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add()
2021-08-30 12:53 ` [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add() Jani Nikula
@ 2021-08-30 14:02 ` Jani Nikula
2021-08-30 20:48 ` kernel test robot
` (3 subsequent siblings)
4 siblings, 0 replies; 24+ messages in thread
From: Jani Nikula @ 2021-08-30 14:02 UTC (permalink / raw)
To: Jani Nikula, intel-gfx
Prefer the intel_ types. No functional changes.
v2: Fix build.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_connector.c | 2 +-
drivers/gpu/drm/i915/display/intel_display_debugfs.c | 3 ++-
drivers/gpu/drm/i915/display/intel_display_debugfs.h | 6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
index 4f49d782eca2..c65f95a9a1ec 100644
--- a/drivers/gpu/drm/i915/display/intel_connector.c
+++ b/drivers/gpu/drm/i915/display/intel_connector.c
@@ -124,7 +124,7 @@ int intel_connector_register(struct drm_connector *connector)
goto err_backlight;
}
- intel_connector_debugfs_add(connector);
+ intel_connector_debugfs_add(intel_connector);
return 0;
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 845e2dc76f87..82043a71e91f 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -2444,8 +2444,9 @@ static const struct file_operations i915_dsc_bpp_fops = {
* Cleanup will be done by drm_connector_unregister() through a call to
* drm_debugfs_connector_remove().
*/
-void intel_connector_debugfs_add(struct drm_connector *connector)
+void intel_connector_debugfs_add(struct intel_connector *intel_connector)
{
+ struct drm_connector *connector = &intel_connector->base;
struct dentry *root = connector->debugfs_entry;
struct drm_i915_private *dev_priv = to_i915(connector->dev);
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.h b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
index c72e35ecba1f..d3a79c07c384 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.h
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
@@ -6,17 +6,17 @@
#ifndef __INTEL_DISPLAY_DEBUGFS_H__
#define __INTEL_DISPLAY_DEBUGFS_H__
-struct drm_connector;
struct drm_crtc;
struct drm_i915_private;
+struct intel_connector;
#ifdef CONFIG_DEBUG_FS
void intel_display_debugfs_register(struct drm_i915_private *i915);
-void intel_connector_debugfs_add(struct drm_connector *connector);
+void intel_connector_debugfs_add(struct intel_connector *connector);
void intel_crtc_debugfs_add(struct drm_crtc *crtc);
#else
static inline void intel_display_debugfs_register(struct drm_i915_private *i915) {}
-static inline void intel_connector_debugfs_add(struct drm_connector *connector) {}
+static inline void intel_connector_debugfs_add(struct intel_connector *connector) {}
static inline void intel_crtc_debugfs_add(struct drm_crtc *crtc) {}
#endif
--
2.20.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: debugfs cleanups (rev2)
2021-08-30 12:53 [Intel-gfx] [PATCH 0/5] drm/i915/display: debugfs cleanups Jani Nikula
` (5 preceding siblings ...)
2021-08-30 13:31 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/display: debugfs cleanups Patchwork
@ 2021-08-30 14:43 ` Patchwork
2021-08-30 16:59 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
7 siblings, 0 replies; 24+ messages in thread
From: Patchwork @ 2021-08-30 14:43 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 3773 bytes --]
== Series Details ==
Series: drm/i915/display: debugfs cleanups (rev2)
URL : https://patchwork.freedesktop.org/series/94164/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10536 -> Patchwork_20919
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/index.html
Known issues
------------
Here are the changes found in Patchwork_20919 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@cs-gfx:
- fi-rkl-guc: NOTRUN -> [SKIP][1] ([fdo#109315]) +17 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/fi-rkl-guc/igt@amdgpu/amd_basic@cs-gfx.html
* igt@amdgpu/amd_cs_nop@sync-fork-compute0:
- fi-snb-2600: NOTRUN -> [SKIP][2] ([fdo#109271]) +17 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/fi-snb-2600/igt@amdgpu/amd_cs_nop@sync-fork-compute0.html
- fi-kbl-soraka: NOTRUN -> [SKIP][3] ([fdo#109271]) +9 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/fi-kbl-soraka/igt@amdgpu/amd_cs_nop@sync-fork-compute0.html
* igt@i915_selftest@live@gt_lrc:
- fi-rkl-guc: NOTRUN -> [DMESG-WARN][4] ([i915#3958])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/fi-rkl-guc/igt@i915_selftest@live@gt_lrc.html
#### Possible fixes ####
* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [INCOMPLETE][5] ([i915#3921]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/fi-snb-2600/igt@i915_selftest@live@hangcheck.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/fi-snb-2600/igt@i915_selftest@live@hangcheck.html
* igt@i915_selftest@live@workarounds:
- fi-rkl-guc: [DMESG-FAIL][7] ([i915#3928]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/fi-rkl-guc/igt@i915_selftest@live@workarounds.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/fi-rkl-guc/igt@i915_selftest@live@workarounds.html
{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
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#3928]: https://gitlab.freedesktop.org/drm/intel/issues/3928
[i915#3958]: https://gitlab.freedesktop.org/drm/intel/issues/3958
Participating hosts (44 -> 36)
------------------------------
Missing (8): fi-ilk-m540 bat-adls-5 bat-dg1-6 bat-dg1-5 fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus bat-jsl-1
Build changes
-------------
* Linux: CI_DRM_10536 -> Patchwork_20919
CI-20190529: 20190529
CI_DRM_10536: b6d834a72c14ca22b2df32a607c1ee36e8629f1a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6191: e9292b533691784f46eeb9bae522ca7a8710c920 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20919: 07f4526dd116b9f87902d39dd4f5a6797885d950 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
07f4526dd116 drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add()
28356e64a985 drm/i915/display: stop returning errors from debugfs registration
aa74e0a60a5b drm/i915/debugfs: register LPSP capability on all platforms
113b0433f5ad drm/i915/debugfs: clean up LPSP capable
aca5f9973a86 drm/i915/debugfs: clean up LPSP status
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/index.html
[-- Attachment #2: Type: text/html, Size: 4546 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/display: debugfs cleanups (rev2)
2021-08-30 12:53 [Intel-gfx] [PATCH 0/5] drm/i915/display: debugfs cleanups Jani Nikula
` (6 preceding siblings ...)
2021-08-30 14:43 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: debugfs cleanups (rev2) Patchwork
@ 2021-08-30 16:59 ` Patchwork
7 siblings, 0 replies; 24+ messages in thread
From: Patchwork @ 2021-08-30 16:59 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 30264 bytes --]
== Series Details ==
Series: drm/i915/display: debugfs cleanups (rev2)
URL : https://patchwork.freedesktop.org/series/94164/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10536_full -> Patchwork_20919_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_20919_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@process:
- shard-snb: NOTRUN -> [SKIP][1] ([fdo#109271] / [i915#1099]) +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-snb6/igt@gem_ctx_persistence@process.html
* igt@gem_eio@unwedge-stress:
- shard-skl: [PASS][2] -> [TIMEOUT][3] ([i915#2369] / [i915#3063])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-skl4/igt@gem_eio@unwedge-stress.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl2/igt@gem_eio@unwedge-stress.html
- shard-snb: NOTRUN -> [FAIL][4] ([i915#3354])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-snb7/igt@gem_eio@unwedge-stress.html
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-skl: NOTRUN -> [SKIP][5] ([fdo#109271]) +77 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl8/igt@gem_exec_fair@basic-flow@rcs0.html
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-glk: [PASS][6] -> [FAIL][7] ([i915#2842])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-glk6/igt@gem_exec_fair@basic-pace-solo@rcs0.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-glk3/igt@gem_exec_fair@basic-pace-solo@rcs0.html
* igt@gem_exec_fair@basic-pace@vcs0:
- shard-tglb: [PASS][8] -> [FAIL][9] ([i915#2842])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-tglb8/igt@gem_exec_fair@basic-pace@vcs0.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-tglb2/igt@gem_exec_fair@basic-pace@vcs0.html
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-iclb: NOTRUN -> [FAIL][10] ([i915#2842])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-iclb2/igt@gem_exec_fair@basic-pace@vcs1.html
* igt@gem_partial_pwrite_pread@reads:
- shard-skl: [PASS][11] -> [DMESG-WARN][12] ([i915#1982]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-skl9/igt@gem_partial_pwrite_pread@reads.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl9/igt@gem_partial_pwrite_pread@reads.html
* igt@gem_userptr_blits@input-checking:
- shard-apl: NOTRUN -> [DMESG-WARN][13] ([i915#3002])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-apl3/igt@gem_userptr_blits@input-checking.html
* igt@gem_userptr_blits@vma-merge:
- shard-glk: NOTRUN -> [FAIL][14] ([i915#3318])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-glk8/igt@gem_userptr_blits@vma-merge.html
* igt@gen7_exec_parse@basic-allocation:
- shard-glk: NOTRUN -> [SKIP][15] ([fdo#109271]) +77 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-glk9/igt@gen7_exec_parse@basic-allocation.html
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [PASS][16] -> [DMESG-WARN][17] ([i915#1436] / [i915#716])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-skl7/igt@gen9_exec_parse@allowed-single.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl4/igt@gen9_exec_parse@allowed-single.html
* igt@gen9_exec_parse@batch-invalid-length:
- shard-snb: NOTRUN -> [SKIP][18] ([fdo#109271]) +297 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-snb6/igt@gen9_exec_parse@batch-invalid-length.html
* igt@i915_pm_dc@dc6-psr:
- shard-skl: NOTRUN -> [FAIL][19] ([i915#454])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl8/igt@i915_pm_dc@dc6-psr.html
* igt@kms_big_fb@x-tiled-32bpp-rotate-180:
- shard-glk: [PASS][20] -> [DMESG-WARN][21] ([i915#118] / [i915#95])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-glk6/igt@kms_big_fb@x-tiled-32bpp-rotate-180.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-glk4/igt@kms_big_fb@x-tiled-32bpp-rotate-180.html
* igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-hflip:
- shard-apl: NOTRUN -> [SKIP][22] ([fdo#109271] / [i915#3777])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-apl8/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-hflip.html
* igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip:
- shard-skl: NOTRUN -> [SKIP][23] ([fdo#109271] / [i915#3777])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl5/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip.html
- shard-kbl: NOTRUN -> [SKIP][24] ([fdo#109271] / [i915#3777])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl1/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip.html
* igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-180-hflip:
- shard-glk: NOTRUN -> [SKIP][25] ([fdo#109271] / [i915#3777])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-glk8/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-180-hflip.html
* igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0:
- shard-apl: NOTRUN -> [SKIP][26] ([fdo#109271]) +158 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-apl7/igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0.html
* igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0-hflip:
- shard-tglb: NOTRUN -> [SKIP][27] ([fdo#111615])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-tglb2/igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0-hflip.html
* igt@kms_ccs@pipe-a-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs:
- shard-glk: NOTRUN -> [SKIP][28] ([fdo#109271] / [i915#3886]) +2 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-glk8/igt@kms_ccs@pipe-a-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-a-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc:
- shard-kbl: NOTRUN -> [SKIP][29] ([fdo#109271] / [i915#3886]) +5 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl1/igt@kms_ccs@pipe-a-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][30] ([fdo#109271] / [i915#3886]) +6 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-apl2/igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-b-crc-primary-rotation-180-yf_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][31] ([i915#3689]) +1 similar issue
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-tglb2/igt@kms_ccs@pipe-b-crc-primary-rotation-180-yf_tiled_ccs.html
* igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][32] ([i915#3689] / [i915#3886])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-tglb3/igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs:
- shard-skl: NOTRUN -> [SKIP][33] ([fdo#109271] / [i915#3886]) +5 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl5/igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-d-missing-ccs-buffer-y_tiled_ccs:
- shard-iclb: NOTRUN -> [SKIP][34] ([fdo#109278]) +1 similar issue
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-iclb2/igt@kms_ccs@pipe-d-missing-ccs-buffer-y_tiled_ccs.html
* igt@kms_chamelium@vga-frame-dump:
- shard-glk: NOTRUN -> [SKIP][35] ([fdo#109271] / [fdo#111827]) +5 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-glk8/igt@kms_chamelium@vga-frame-dump.html
* igt@kms_chamelium@vga-hpd-for-each-pipe:
- shard-kbl: NOTRUN -> [SKIP][36] ([fdo#109271] / [fdo#111827]) +14 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl1/igt@kms_chamelium@vga-hpd-for-each-pipe.html
- shard-skl: NOTRUN -> [SKIP][37] ([fdo#109271] / [fdo#111827]) +6 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl5/igt@kms_chamelium@vga-hpd-for-each-pipe.html
* igt@kms_color_chamelium@pipe-a-ctm-0-5:
- shard-apl: NOTRUN -> [SKIP][38] ([fdo#109271] / [fdo#111827]) +13 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-apl2/igt@kms_color_chamelium@pipe-a-ctm-0-5.html
* igt@kms_color_chamelium@pipe-c-ctm-limited-range:
- shard-snb: NOTRUN -> [SKIP][39] ([fdo#109271] / [fdo#111827]) +16 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-snb6/igt@kms_color_chamelium@pipe-c-ctm-limited-range.html
* igt@kms_color_chamelium@pipe-c-degamma:
- shard-iclb: NOTRUN -> [SKIP][40] ([fdo#109284] / [fdo#111827])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-iclb7/igt@kms_color_chamelium@pipe-c-degamma.html
* igt@kms_color_chamelium@pipe-d-ctm-blue-to-red:
- shard-tglb: NOTRUN -> [SKIP][41] ([fdo#109284] / [fdo#111827]) +3 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-tglb2/igt@kms_color_chamelium@pipe-d-ctm-blue-to-red.html
* igt@kms_content_protection@content_type_change:
- shard-tglb: NOTRUN -> [SKIP][42] ([fdo#111828])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-tglb2/igt@kms_content_protection@content_type_change.html
* igt@kms_content_protection@legacy:
- shard-apl: NOTRUN -> [TIMEOUT][43] ([i915#1319])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-apl2/igt@kms_content_protection@legacy.html
* igt@kms_content_protection@lic:
- shard-kbl: NOTRUN -> [TIMEOUT][44] ([i915#1319])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl1/igt@kms_content_protection@lic.html
* igt@kms_content_protection@uevent:
- shard-apl: NOTRUN -> [FAIL][45] ([i915#2105])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-apl7/igt@kms_content_protection@uevent.html
* igt@kms_cursor_crc@pipe-d-cursor-32x10-onscreen:
- shard-tglb: NOTRUN -> [SKIP][46] ([i915#3359])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-tglb2/igt@kms_cursor_crc@pipe-d-cursor-32x10-onscreen.html
* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
- shard-skl: [PASS][47] -> [FAIL][48] ([i915#2346]) +1 similar issue
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-skl5/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl3/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: [PASS][49] -> [INCOMPLETE][50] ([i915#155] / [i915#180] / [i915#636])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-kbl3/igt@kms_fbcon_fbt@fbc-suspend.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl7/igt@kms_fbcon_fbt@fbc-suspend.html
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ab-hdmi-a1-hdmi-a2:
- shard-glk: NOTRUN -> [FAIL][51] ([i915#79])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-glk9/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ab-hdmi-a1-hdmi-a2.html
* igt@kms_flip@2x-plain-flip:
- shard-iclb: NOTRUN -> [SKIP][52] ([fdo#109274])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-iclb7/igt@kms_flip@2x-plain-flip.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-draw-blt:
- shard-kbl: NOTRUN -> [SKIP][53] ([fdo#109271]) +99 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl1/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-draw-blt.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-draw-pwrite:
- shard-iclb: NOTRUN -> [SKIP][54] ([fdo#109280]) +2 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@psr-2p-primscrn-spr-indfb-onoff:
- shard-tglb: NOTRUN -> [SKIP][55] ([fdo#111825]) +4 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-tglb3/igt@kms_frontbuffer_tracking@psr-2p-primscrn-spr-indfb-onoff.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- shard-glk: NOTRUN -> [SKIP][56] ([fdo#109271] / [i915#533])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-glk9/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence:
- shard-kbl: NOTRUN -> [SKIP][57] ([fdo#109271] / [i915#533])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl6/igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence.html
* igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes:
- shard-kbl: [PASS][58] -> [DMESG-WARN][59] ([i915#180]) +2 similar issues
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-kbl1/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl7/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html
* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-apl: NOTRUN -> [FAIL][60] ([fdo#108145] / [i915#265]) +2 similar issues
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-apl8/igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb.html
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max:
- shard-glk: NOTRUN -> [FAIL][61] ([fdo#108145] / [i915#265])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-glk9/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][62] -> [FAIL][63] ([fdo#108145] / [i915#265])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl3/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
* igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb:
- shard-kbl: NOTRUN -> [FAIL][64] ([i915#265])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl1/igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb.html
- shard-skl: NOTRUN -> [FAIL][65] ([i915#265])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb.html
* igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping:
- shard-kbl: NOTRUN -> [SKIP][66] ([fdo#109271] / [i915#2733])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl6/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-3:
- shard-tglb: NOTRUN -> [SKIP][67] ([i915#2920])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-tglb2/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-3.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-4:
- shard-apl: NOTRUN -> [SKIP][68] ([fdo#109271] / [i915#658]) +4 similar issues
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-apl3/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-4.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-1:
- shard-skl: NOTRUN -> [SKIP][69] ([fdo#109271] / [i915#658]) +1 similar issue
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl5/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-1.html
- shard-kbl: NOTRUN -> [SKIP][70] ([fdo#109271] / [i915#658]) +3 similar issues
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl1/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-1.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1:
- shard-glk: NOTRUN -> [SKIP][71] ([fdo#109271] / [i915#658]) +1 similar issue
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-glk8/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][72] -> [SKIP][73] ([fdo#109441]) +2 similar issues
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-iclb6/igt@kms_psr@psr2_cursor_render.html
* igt@kms_writeback@writeback-pixel-formats:
- shard-apl: NOTRUN -> [SKIP][74] ([fdo#109271] / [i915#2437])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-apl8/igt@kms_writeback@writeback-pixel-formats.html
* igt@prime_nv_api@i915_nv_double_import:
- shard-tglb: NOTRUN -> [SKIP][75] ([fdo#109291])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-tglb2/igt@prime_nv_api@i915_nv_double_import.html
* igt@prime_nv_pcopy@test1_micro:
- shard-iclb: NOTRUN -> [SKIP][76] ([fdo#109291])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-iclb7/igt@prime_nv_pcopy@test1_micro.html
* igt@sysfs_clients@busy:
- shard-glk: NOTRUN -> [SKIP][77] ([fdo#109271] / [i915#2994])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-glk8/igt@sysfs_clients@busy.html
* igt@sysfs_clients@fair-0:
- shard-apl: NOTRUN -> [SKIP][78] ([fdo#109271] / [i915#2994])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-apl3/igt@sysfs_clients@fair-0.html
* igt@sysfs_clients@recycle:
- shard-kbl: NOTRUN -> [SKIP][79] ([fdo#109271] / [i915#2994])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl6/igt@sysfs_clients@recycle.html
#### Possible fixes ####
* igt@gem_ctx_isolation@preservation-s3@bcs0:
- shard-kbl: [DMESG-WARN][80] ([i915#180]) -> [PASS][81] +3 similar issues
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-kbl7/igt@gem_ctx_isolation@preservation-s3@bcs0.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl3/igt@gem_ctx_isolation@preservation-s3@bcs0.html
* igt@gem_ctx_persistence@legacy-engines-hang@bsd:
- {shard-rkl}: [FAIL][82] ([i915#2410]) -> [PASS][83]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-rkl-2/igt@gem_ctx_persistence@legacy-engines-hang@bsd.html
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-rkl-2/igt@gem_ctx_persistence@legacy-engines-hang@bsd.html
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-tglb: [FAIL][84] ([i915#2842]) -> [PASS][85] +1 similar issue
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-tglb8/igt@gem_exec_fair@basic-none-share@rcs0.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-tglb3/igt@gem_exec_fair@basic-none-share@rcs0.html
* igt@gem_exec_fair@basic-none@rcs0:
- shard-kbl: [FAIL][86] ([i915#2842]) -> [PASS][87]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-kbl7/igt@gem_exec_fair@basic-none@rcs0.html
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl6/igt@gem_exec_fair@basic-none@rcs0.html
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-kbl: [SKIP][88] ([fdo#109271]) -> [PASS][89] +1 similar issue
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-kbl4/igt@gem_exec_fair@basic-pace@vcs1.html
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl4/igt@gem_exec_fair@basic-pace@vcs1.html
* igt@gem_exec_fair@basic-throttle@rcs0:
- {shard-rkl}: [FAIL][90] ([i915#2842]) -> [PASS][91] +1 similar issue
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-rkl-1/igt@gem_exec_fair@basic-throttle@rcs0.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-rkl-1/igt@gem_exec_fair@basic-throttle@rcs0.html
- shard-iclb: [FAIL][92] ([i915#2849]) -> [PASS][93]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-iclb3/igt@gem_exec_fair@basic-throttle@rcs0.html
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-iclb4/igt@gem_exec_fair@basic-throttle@rcs0.html
* igt@gem_exec_suspend@basic-s4-devices:
- {shard-rkl}: [INCOMPLETE][94] ([i915#3189] / [i915#3810]) -> [PASS][95]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-rkl-5/igt@gem_exec_suspend@basic-s4-devices.html
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-rkl-1/igt@gem_exec_suspend@basic-s4-devices.html
* igt@gem_mmap_gtt@basic-wc:
- {shard-rkl}: [FAIL][96] ([i915#3830]) -> [PASS][97]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-rkl-5/igt@gem_mmap_gtt@basic-wc.html
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-rkl-1/igt@gem_mmap_gtt@basic-wc.html
* igt@i915_selftest@live@gt_heartbeat:
- shard-tglb: [DMESG-FAIL][98] ([i915#2291] / [i915#541]) -> [PASS][99]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-tglb2/igt@i915_selftest@live@gt_heartbeat.html
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-tglb7/igt@i915_selftest@live@gt_heartbeat.html
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-kbl: [INCOMPLETE][100] ([i915#155]) -> [PASS][101]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-kbl4/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl1/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-skl: [INCOMPLETE][102] ([i915#300]) -> [PASS][103]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-skl3/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl8/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic:
- shard-glk: [FAIL][104] ([i915#72]) -> [PASS][105]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-glk8/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic.html
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-glk1/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic.html
* igt@kms_flip@2x-plain-flip-fb-recreate-interruptible@bc-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][106] ([i915#2122]) -> [PASS][107]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-glk8/igt@kms_flip@2x-plain-flip-fb-recreate-interruptible@bc-hdmi-a1-hdmi-a2.html
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-glk1/igt@kms_flip@2x-plain-flip-fb-recreate-interruptible@bc-hdmi-a1-hdmi-a2.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1:
- shard-skl: [FAIL][108] ([i915#79]) -> [PASS][109] +1 similar issue
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-skl4/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl2/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][110] ([fdo#108145] / [i915#265]) -> [PASS][111]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-skl3/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl8/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][112] ([fdo#109441]) -> [PASS][113]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-iclb7/igt@kms_psr@psr2_sprite_plane_move.html
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
* igt@perf@polling:
- {shard-rkl}: [FAIL][114] ([i915#1542]) -> [PASS][115]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-rkl-5/igt@perf@polling.html
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-rkl-1/igt@perf@polling.html
* igt@perf_pmu@busy-idle@vecs0:
- shard-skl: [DMESG-WARN][116] ([i915#1982]) -> [PASS][117] +2 similar issues
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-skl3/igt@perf_pmu@busy-idle@vecs0.html
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-skl9/igt@perf_pmu@busy-idle@vecs0.html
* igt@sysfs_timeslice_duration@timeout@vecs0:
- shard-iclb: [FAIL][118] ([i915#1755]) -> [PASS][119]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-iclb7/igt@sysfs_timeslice_duration@timeout@vecs0.html
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-iclb5/igt@sysfs_timeslice_duration@timeout@vecs0.html
#### Warnings ####
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-kbl: [SKIP][120] ([fdo#109271]) -> [FAIL][121] ([i915#2842])
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-kbl4/igt@gem_exec_fair@basic-pace@vecs0.html
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl4/igt@gem_exec_fair@basic-pace@vecs0.html
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][122] ([i915#2684]) -> [WARN][123] ([i915#1804] / [i915#2684])
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-iclb2/igt@i915_pm_rc6_residency@rc6-idle.html
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-iclb6/igt@i915_pm_rc6_residency@rc6-idle.html
* igt@kms_psr2_sf@plane-move-sf-dmg-area-3:
- shard-iclb: [SKIP][124] ([i915#658]) -> [SKIP][125] ([i915#2920]) +1 similar issue
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-iclb7/igt@kms_psr2_sf@plane-move-sf-dmg-area-3.html
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-iclb2/igt@kms_psr2_sf@plane-move-sf-dmg-area-3.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4:
- shard-iclb: [SKIP][126] ([i915#2920]) -> [SKIP][127] ([i915#658]) +2 similar issues
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4.html
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-iclb1/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4.html
* igt@runner@aborted:
- shard-kbl: ([FAIL][128], [FAIL][129], [FAIL][130], [FAIL][131], [FAIL][132]) ([i915#1436] / [i915#180] / [i915#3002] / [i915#3363]) -> ([FAIL][133], [FAIL][134], [FAIL][135], [FAIL][136], [FAIL][137], [FAIL][138]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363] / [i915#92])
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-kbl7/igt@runner@aborted.html
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-kbl7/igt@runner@aborted.html
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-kbl7/igt@runner@aborted.html
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-kbl3/igt@runner@aborted.html
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-kbl4/igt@runner@aborted.html
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl7/igt@runner@aborted.html
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl4/igt@runner@aborted.html
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl7/igt@runner@aborted.html
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl7/igt@runner@aborted.html
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl7/igt@runner@aborted.html
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-kbl2/igt@runner@aborted.html
- shard-apl: ([FAIL][139], [FAIL][140]) ([i915#1814] / [i915#3002] / [i915#3363]) -> ([FAIL][141], [FAIL][142]) ([i915#3002] / [i915#3363])
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-apl8/igt@runner@aborted.html
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10536/shard-apl2/igt@runner@aborted.html
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-apl1/igt@runner@aborted.html
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/shard-apl3/igt@runner@aborted.html
- shard-skl: ([FAIL][143], [FAIL][144]) ([i915#3002] / [i915#3363]) -> ([FAIL][145], [FAIL][146], [FAIL][147]) ([i915#1436] / [i915#3002] / [i915#3363])
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20919/index.html
[-- Attachment #2: Type: text/html, Size: 34000 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add()
2021-08-30 12:53 ` [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add() Jani Nikula
@ 2021-08-30 20:48 ` kernel test robot
2021-08-30 20:48 ` kernel test robot
` (3 subsequent siblings)
4 siblings, 0 replies; 24+ messages in thread
From: kernel test robot @ 2021-08-30 20:48 UTC (permalink / raw)
To: Jani Nikula, intel-gfx; +Cc: kbuild-all, jani.nikula
[-- Attachment #1: Type: text/plain, Size: 5620 bytes --]
Hi Jani,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on drm-tip/drm-tip next-20210830]
[cannot apply to v5.14]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jani-Nikula/drm-i915-display-debugfs-cleanups/20210830-205450
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: i386-allyesconfig (attached as .config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce (this is a W=1 build):
# https://github.com/0day-ci/linux/commit/3398bb6468f037af818548e7987e8fd062278824
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jani-Nikula/drm-i915-display-debugfs-cleanups/20210830-205450
git checkout 3398bb6468f037af818548e7987e8fd062278824
# save the attached .config to linux build tree
mkdir build_dir
make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/intel_display_debugfs.c:2447:6: error: conflicting types for 'intel_connector_debugfs_add'
2447 | void intel_connector_debugfs_add(struct intel_connector *intel_connector)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/i915/display/intel_display_debugfs.c:10:
drivers/gpu/drm/i915/display/intel_display_debugfs.h:15:6: note: previous declaration of 'intel_connector_debugfs_add' was here
15 | void intel_connector_debugfs_add(struct drm_connector *connector);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
--
drivers/gpu/drm/i915/display/intel_connector.c: In function 'intel_connector_register':
>> drivers/gpu/drm/i915/display/intel_connector.c:127:30: error: passing argument 1 of 'intel_connector_debugfs_add' from incompatible pointer type [-Werror=incompatible-pointer-types]
127 | intel_connector_debugfs_add(intel_connector);
| ^~~~~~~~~~~~~~~
| |
| struct intel_connector *
In file included from drivers/gpu/drm/i915/display/intel_connector.c:36:
drivers/gpu/drm/i915/display/intel_display_debugfs.h:15:56: note: expected 'struct drm_connector *' but argument is of type 'struct intel_connector *'
15 | void intel_connector_debugfs_add(struct drm_connector *connector);
| ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~
cc1: all warnings being treated as errors
vim +/intel_connector_debugfs_add +2447 drivers/gpu/drm/i915/display/intel_display_debugfs.c
2439
2440 /**
2441 * intel_connector_debugfs_add - add i915 specific connector debugfs files
2442 * @connector: pointer to a registered drm_connector
2443 *
2444 * Cleanup will be done by drm_connector_unregister() through a call to
2445 * drm_debugfs_connector_remove().
2446 */
> 2447 void intel_connector_debugfs_add(struct intel_connector *intel_connector)
2448 {
2449 struct drm_connector *connector = &intel_connector->base;
2450 struct dentry *root = connector->debugfs_entry;
2451 struct drm_i915_private *dev_priv = to_i915(connector->dev);
2452
2453 /* The connector must have been registered beforehands. */
2454 if (!root)
2455 return;
2456
2457 if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
2458 debugfs_create_file("i915_panel_timings", S_IRUGO, root,
2459 connector, &i915_panel_fops);
2460 debugfs_create_file("i915_psr_sink_status", S_IRUGO, root,
2461 connector, &i915_psr_sink_status_fops);
2462 }
2463
2464 if (HAS_PSR(dev_priv) &&
2465 connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
2466 debugfs_create_file("i915_psr_status", 0444, root,
2467 connector, &i915_psr_status_fops);
2468 }
2469
2470 if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
2471 connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
2472 connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) {
2473 debugfs_create_file("i915_hdcp_sink_capability", S_IRUGO, root,
2474 connector, &i915_hdcp_sink_capability_fops);
2475 }
2476
2477 if (DISPLAY_VER(dev_priv) >= 11 &&
2478 ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
2479 !to_intel_connector(connector)->mst_port) ||
2480 connector->connector_type == DRM_MODE_CONNECTOR_eDP)) {
2481 debugfs_create_file("i915_dsc_fec_support", 0644, root,
2482 connector, &i915_dsc_fec_support_fops);
2483
2484 debugfs_create_file("i915_dsc_bpp", 0644, root,
2485 connector, &i915_dsc_bpp_fops);
2486 }
2487
2488 if (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
2489 connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
2490 connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
2491 connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
2492 connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
2493 debugfs_create_file("i915_lpsp_capability", 0444, root,
2494 connector, &i915_lpsp_capability_fops);
2495 }
2496
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 65210 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add()
@ 2021-08-30 20:48 ` kernel test robot
0 siblings, 0 replies; 24+ messages in thread
From: kernel test robot @ 2021-08-30 20:48 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 5736 bytes --]
Hi Jani,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on drm-tip/drm-tip next-20210830]
[cannot apply to v5.14]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jani-Nikula/drm-i915-display-debugfs-cleanups/20210830-205450
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: i386-allyesconfig (attached as .config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce (this is a W=1 build):
# https://github.com/0day-ci/linux/commit/3398bb6468f037af818548e7987e8fd062278824
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jani-Nikula/drm-i915-display-debugfs-cleanups/20210830-205450
git checkout 3398bb6468f037af818548e7987e8fd062278824
# save the attached .config to linux build tree
mkdir build_dir
make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/intel_display_debugfs.c:2447:6: error: conflicting types for 'intel_connector_debugfs_add'
2447 | void intel_connector_debugfs_add(struct intel_connector *intel_connector)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/i915/display/intel_display_debugfs.c:10:
drivers/gpu/drm/i915/display/intel_display_debugfs.h:15:6: note: previous declaration of 'intel_connector_debugfs_add' was here
15 | void intel_connector_debugfs_add(struct drm_connector *connector);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
--
drivers/gpu/drm/i915/display/intel_connector.c: In function 'intel_connector_register':
>> drivers/gpu/drm/i915/display/intel_connector.c:127:30: error: passing argument 1 of 'intel_connector_debugfs_add' from incompatible pointer type [-Werror=incompatible-pointer-types]
127 | intel_connector_debugfs_add(intel_connector);
| ^~~~~~~~~~~~~~~
| |
| struct intel_connector *
In file included from drivers/gpu/drm/i915/display/intel_connector.c:36:
drivers/gpu/drm/i915/display/intel_display_debugfs.h:15:56: note: expected 'struct drm_connector *' but argument is of type 'struct intel_connector *'
15 | void intel_connector_debugfs_add(struct drm_connector *connector);
| ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~
cc1: all warnings being treated as errors
vim +/intel_connector_debugfs_add +2447 drivers/gpu/drm/i915/display/intel_display_debugfs.c
2439
2440 /**
2441 * intel_connector_debugfs_add - add i915 specific connector debugfs files
2442 * @connector: pointer to a registered drm_connector
2443 *
2444 * Cleanup will be done by drm_connector_unregister() through a call to
2445 * drm_debugfs_connector_remove().
2446 */
> 2447 void intel_connector_debugfs_add(struct intel_connector *intel_connector)
2448 {
2449 struct drm_connector *connector = &intel_connector->base;
2450 struct dentry *root = connector->debugfs_entry;
2451 struct drm_i915_private *dev_priv = to_i915(connector->dev);
2452
2453 /* The connector must have been registered beforehands. */
2454 if (!root)
2455 return;
2456
2457 if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
2458 debugfs_create_file("i915_panel_timings", S_IRUGO, root,
2459 connector, &i915_panel_fops);
2460 debugfs_create_file("i915_psr_sink_status", S_IRUGO, root,
2461 connector, &i915_psr_sink_status_fops);
2462 }
2463
2464 if (HAS_PSR(dev_priv) &&
2465 connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
2466 debugfs_create_file("i915_psr_status", 0444, root,
2467 connector, &i915_psr_status_fops);
2468 }
2469
2470 if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
2471 connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
2472 connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) {
2473 debugfs_create_file("i915_hdcp_sink_capability", S_IRUGO, root,
2474 connector, &i915_hdcp_sink_capability_fops);
2475 }
2476
2477 if (DISPLAY_VER(dev_priv) >= 11 &&
2478 ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
2479 !to_intel_connector(connector)->mst_port) ||
2480 connector->connector_type == DRM_MODE_CONNECTOR_eDP)) {
2481 debugfs_create_file("i915_dsc_fec_support", 0644, root,
2482 connector, &i915_dsc_fec_support_fops);
2483
2484 debugfs_create_file("i915_dsc_bpp", 0644, root,
2485 connector, &i915_dsc_bpp_fops);
2486 }
2487
2488 if (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
2489 connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
2490 connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
2491 connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
2492 connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
2493 debugfs_create_file("i915_lpsp_capability", 0444, root,
2494 connector, &i915_lpsp_capability_fops);
2495 }
2496
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 65210 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add()
2021-08-30 12:53 ` [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add() Jani Nikula
@ 2021-08-31 16:00 ` kernel test robot
2021-08-30 20:48 ` kernel test robot
` (3 subsequent siblings)
4 siblings, 0 replies; 24+ messages in thread
From: kernel test robot @ 2021-08-31 16:00 UTC (permalink / raw)
To: Jani Nikula, intel-gfx; +Cc: llvm, kbuild-all, jani.nikula
[-- Attachment #1: Type: text/plain, Size: 3336 bytes --]
Hi Jani,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on drm-tip/drm-tip next-20210831]
[cannot apply to v5.14]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jani-Nikula/drm-i915-display-debugfs-cleanups/20210830-205450
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: i386-randconfig-a014-20210831 (attached as .config)
compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project 4b1fde8a2b681dad2ce0c082a5d6422caa06b0bc)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/3398bb6468f037af818548e7987e8fd062278824
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jani-Nikula/drm-i915-display-debugfs-cleanups/20210830-205450
git checkout 3398bb6468f037af818548e7987e8fd062278824
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=i386
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/intel_connector.c:127:30: error: incompatible pointer types passing 'struct intel_connector *' to parameter of type 'struct drm_connector *' [-Werror,-Wincompatible-pointer-types]
intel_connector_debugfs_add(intel_connector);
^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_display_debugfs.h:15:56: note: passing argument to parameter 'connector' here
void intel_connector_debugfs_add(struct drm_connector *connector);
^
1 error generated.
--
>> drivers/gpu/drm/i915/display/intel_display_debugfs.c:2447:6: error: conflicting types for 'intel_connector_debugfs_add'
void intel_connector_debugfs_add(struct intel_connector *intel_connector)
^
drivers/gpu/drm/i915/display/intel_display_debugfs.h:15:6: note: previous declaration is here
void intel_connector_debugfs_add(struct drm_connector *connector);
^
1 error generated.
vim +127 drivers/gpu/drm/i915/display/intel_connector.c
112
113 int intel_connector_register(struct drm_connector *connector)
114 {
115 struct intel_connector *intel_connector = to_intel_connector(connector);
116 int ret;
117
118 ret = intel_backlight_device_register(intel_connector);
119 if (ret)
120 goto err;
121
122 if (i915_inject_probe_failure(to_i915(connector->dev))) {
123 ret = -EFAULT;
124 goto err_backlight;
125 }
126
> 127 intel_connector_debugfs_add(intel_connector);
128
129 return 0;
130
131 err_backlight:
132 intel_backlight_device_unregister(intel_connector);
133 err:
134 return ret;
135 }
136
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 35366 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add()
@ 2021-08-31 16:00 ` kernel test robot
0 siblings, 0 replies; 24+ messages in thread
From: kernel test robot @ 2021-08-31 16:00 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 3416 bytes --]
Hi Jani,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on drm-tip/drm-tip next-20210831]
[cannot apply to v5.14]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jani-Nikula/drm-i915-display-debugfs-cleanups/20210830-205450
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: i386-randconfig-a014-20210831 (attached as .config)
compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project 4b1fde8a2b681dad2ce0c082a5d6422caa06b0bc)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/3398bb6468f037af818548e7987e8fd062278824
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jani-Nikula/drm-i915-display-debugfs-cleanups/20210830-205450
git checkout 3398bb6468f037af818548e7987e8fd062278824
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=i386
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/intel_connector.c:127:30: error: incompatible pointer types passing 'struct intel_connector *' to parameter of type 'struct drm_connector *' [-Werror,-Wincompatible-pointer-types]
intel_connector_debugfs_add(intel_connector);
^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_display_debugfs.h:15:56: note: passing argument to parameter 'connector' here
void intel_connector_debugfs_add(struct drm_connector *connector);
^
1 error generated.
--
>> drivers/gpu/drm/i915/display/intel_display_debugfs.c:2447:6: error: conflicting types for 'intel_connector_debugfs_add'
void intel_connector_debugfs_add(struct intel_connector *intel_connector)
^
drivers/gpu/drm/i915/display/intel_display_debugfs.h:15:6: note: previous declaration is here
void intel_connector_debugfs_add(struct drm_connector *connector);
^
1 error generated.
vim +127 drivers/gpu/drm/i915/display/intel_connector.c
112
113 int intel_connector_register(struct drm_connector *connector)
114 {
115 struct intel_connector *intel_connector = to_intel_connector(connector);
116 int ret;
117
118 ret = intel_backlight_device_register(intel_connector);
119 if (ret)
120 goto err;
121
122 if (i915_inject_probe_failure(to_i915(connector->dev))) {
123 ret = -EFAULT;
124 goto err_backlight;
125 }
126
> 127 intel_connector_debugfs_add(intel_connector);
128
129 return 0;
130
131 err_backlight:
132 intel_backlight_device_unregister(intel_connector);
133 err:
134 return ret;
135 }
136
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 35366 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add()
2021-08-30 12:53 ` [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add() Jani Nikula
` (2 preceding siblings ...)
2021-08-31 16:00 ` kernel test robot
@ 2021-09-01 16:09 ` Rodrigo Vivi
2021-09-01 16:11 ` Rodrigo Vivi
4 siblings, 0 replies; 24+ messages in thread
From: Rodrigo Vivi @ 2021-09-01 16:09 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Mon, Aug 30, 2021 at 03:53:44PM +0300, Jani Nikula wrote:
> Prefer the intel_ types. No functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_connector.c | 2 +-
> drivers/gpu/drm/i915/display/intel_display_debugfs.c | 3 ++-
> drivers/gpu/drm/i915/display/intel_display_debugfs.h | 4 ++--
> 3 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
> index 4f49d782eca2..c65f95a9a1ec 100644
> --- a/drivers/gpu/drm/i915/display/intel_connector.c
> +++ b/drivers/gpu/drm/i915/display/intel_connector.c
> @@ -124,7 +124,7 @@ int intel_connector_register(struct drm_connector *connector)
> goto err_backlight;
> }
>
> - intel_connector_debugfs_add(connector);
> + intel_connector_debugfs_add(intel_connector);
>
> return 0;
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index 845e2dc76f87..82043a71e91f 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -2444,8 +2444,9 @@ static const struct file_operations i915_dsc_bpp_fops = {
> * Cleanup will be done by drm_connector_unregister() through a call to
> * drm_debugfs_connector_remove().
> */
> -void intel_connector_debugfs_add(struct drm_connector *connector)
> +void intel_connector_debugfs_add(struct intel_connector *intel_connector)
> {
> + struct drm_connector *connector = &intel_connector->base;
> struct dentry *root = connector->debugfs_entry;
> struct drm_i915_private *dev_priv = to_i915(connector->dev);
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.h b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
> index c72e35ecba1f..9b89b707ffe6 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
> @@ -6,9 +6,9 @@
> #ifndef __INTEL_DISPLAY_DEBUGFS_H__
> #define __INTEL_DISPLAY_DEBUGFS_H__
>
> -struct drm_connector;
> struct drm_crtc;
> struct drm_i915_private;
> +struct intel_connector;
>
> #ifdef CONFIG_DEBUG_FS
> void intel_display_debugfs_register(struct drm_i915_private *i915);
> @@ -16,7 +16,7 @@ void intel_connector_debugfs_add(struct drm_connector *connector);
> void intel_crtc_debugfs_add(struct drm_crtc *crtc);
> #else
> static inline void intel_display_debugfs_register(struct drm_i915_private *i915) {}
> -static inline void intel_connector_debugfs_add(struct drm_connector *connector) {}
> +static inline void intel_connector_debugfs_add(struct intel_connector *connector) {}
> static inline void intel_crtc_debugfs_add(struct drm_crtc *crtc) {}
> #endif
>
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add()
2021-08-30 12:53 ` [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add() Jani Nikula
` (3 preceding siblings ...)
2021-09-01 16:09 ` Rodrigo Vivi
@ 2021-09-01 16:11 ` Rodrigo Vivi
2021-09-01 17:03 ` Jani Nikula
4 siblings, 1 reply; 24+ messages in thread
From: Rodrigo Vivi @ 2021-09-01 16:11 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Mon, Aug 30, 2021 at 03:53:44PM +0300, Jani Nikula wrote:
> Prefer the intel_ types. No functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_connector.c | 2 +-
> drivers/gpu/drm/i915/display/intel_display_debugfs.c | 3 ++-
> drivers/gpu/drm/i915/display/intel_display_debugfs.h | 4 ++--
> 3 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
> index 4f49d782eca2..c65f95a9a1ec 100644
> --- a/drivers/gpu/drm/i915/display/intel_connector.c
> +++ b/drivers/gpu/drm/i915/display/intel_connector.c
> @@ -124,7 +124,7 @@ int intel_connector_register(struct drm_connector *connector)
oh, actually this is drm_connector
> goto err_backlight;
> }
>
> - intel_connector_debugfs_add(connector);
> + intel_connector_debugfs_add(intel_connector);
so this fails...
>
> return 0;
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index 845e2dc76f87..82043a71e91f 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -2444,8 +2444,9 @@ static const struct file_operations i915_dsc_bpp_fops = {
> * Cleanup will be done by drm_connector_unregister() through a call to
> * drm_debugfs_connector_remove().
> */
> -void intel_connector_debugfs_add(struct drm_connector *connector)
> +void intel_connector_debugfs_add(struct intel_connector *intel_connector)
> {
> + struct drm_connector *connector = &intel_connector->base;
> struct dentry *root = connector->debugfs_entry;
> struct drm_i915_private *dev_priv = to_i915(connector->dev);
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.h b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
> index c72e35ecba1f..9b89b707ffe6 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
> @@ -6,9 +6,9 @@
> #ifndef __INTEL_DISPLAY_DEBUGFS_H__
> #define __INTEL_DISPLAY_DEBUGFS_H__
>
> -struct drm_connector;
> struct drm_crtc;
> struct drm_i915_private;
> +struct intel_connector;
>
> #ifdef CONFIG_DEBUG_FS
> void intel_display_debugfs_register(struct drm_i915_private *i915);
> @@ -16,7 +16,7 @@ void intel_connector_debugfs_add(struct drm_connector *connector);
> void intel_crtc_debugfs_add(struct drm_crtc *crtc);
> #else
> static inline void intel_display_debugfs_register(struct drm_i915_private *i915) {}
> -static inline void intel_connector_debugfs_add(struct drm_connector *connector) {}
> +static inline void intel_connector_debugfs_add(struct intel_connector *connector) {}
> static inline void intel_crtc_debugfs_add(struct drm_crtc *crtc) {}
> #endif
>
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Intel-gfx] [PATCH 1/5] drm/i915/debugfs: clean up LPSP status
2021-08-30 12:53 ` [Intel-gfx] [PATCH 1/5] drm/i915/debugfs: clean up LPSP status Jani Nikula
@ 2021-09-01 16:13 ` Rodrigo Vivi
0 siblings, 0 replies; 24+ messages in thread
From: Rodrigo Vivi @ 2021-09-01 16:13 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Mon, Aug 30, 2021 at 03:53:40PM +0300, Jani Nikula wrote:
> Clean up the LPSP status printout. No functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> .../drm/i915/display/intel_display_debugfs.c | 37 ++++++-------------
> 1 file changed, 11 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index 8fdacb252bb1..d2a14a9c6857 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -1323,9 +1323,6 @@ static int i915_drrs_status(struct seq_file *m, void *unused)
> return 0;
> }
>
> -#define LPSP_STATUS(COND) (COND ? seq_puts(m, "LPSP: enabled\n") : \
> - seq_puts(m, "LPSP: disabled\n"))
> -
> static bool
> intel_lpsp_power_well_enabled(struct drm_i915_private *i915,
> enum i915_power_well_id power_well_id)
> @@ -1344,32 +1341,20 @@ intel_lpsp_power_well_enabled(struct drm_i915_private *i915,
> static int i915_lpsp_status(struct seq_file *m, void *unused)
> {
> struct drm_i915_private *i915 = node_to_i915(m->private);
> -
> - if (DISPLAY_VER(i915) >= 13) {
> - LPSP_STATUS(!intel_lpsp_power_well_enabled(i915,
> - SKL_DISP_PW_2));
> + bool lpsp_enabled = false;
> +
> + if (DISPLAY_VER(i915) >= 13 || IS_DISPLAY_VER(i915, 9, 10)) {
> + lpsp_enabled = !intel_lpsp_power_well_enabled(i915, SKL_DISP_PW_2);
> + } else if (IS_DISPLAY_VER(i915, 11, 12)) {
> + lpsp_enabled = !intel_lpsp_power_well_enabled(i915, ICL_DISP_PW_3);
> + } else if (IS_HASWELL(i915) || IS_BROADWELL(i915)) {
> + lpsp_enabled = !intel_lpsp_power_well_enabled(i915, HSW_DISP_PW_GLOBAL);
> + } else {
> + seq_puts(m, "LPSP: not supported\n");
> return 0;
> }
>
> - switch (DISPLAY_VER(i915)) {
> - case 12:
> - case 11:
> - LPSP_STATUS(!intel_lpsp_power_well_enabled(i915, ICL_DISP_PW_3));
> - break;
> - case 10:
> - case 9:
> - LPSP_STATUS(!intel_lpsp_power_well_enabled(i915, SKL_DISP_PW_2));
> - break;
> - default:
> - /*
> - * Apart from HASWELL/BROADWELL other legacy platform doesn't
> - * support lpsp.
> - */
> - if (IS_HASWELL(i915) || IS_BROADWELL(i915))
> - LPSP_STATUS(!intel_lpsp_power_well_enabled(i915, HSW_DISP_PW_GLOBAL));
> - else
> - seq_puts(m, "LPSP: not supported\n");
> - }
> + seq_printf(m, "LPSP: %s\n", enableddisabled(lpsp_enabled));
>
> return 0;
> }
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Intel-gfx] [PATCH 2/5] drm/i915/debugfs: clean up LPSP capable
2021-08-30 12:53 ` [Intel-gfx] [PATCH 2/5] drm/i915/debugfs: clean up LPSP capable Jani Nikula
@ 2021-09-01 16:14 ` Rodrigo Vivi
2021-09-02 11:14 ` Jani Nikula
0 siblings, 1 reply; 24+ messages in thread
From: Rodrigo Vivi @ 2021-09-01 16:14 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Mon, Aug 30, 2021 at 03:53:41PM +0300, Jani Nikula wrote:
> Clean up the LPSP capability printout. No functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> .../drm/i915/display/intel_display_debugfs.c | 44 +++++++------------
> 1 file changed, 17 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index d2a14a9c6857..a6dcb95cfc1f 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -2225,14 +2225,12 @@ static int i915_psr_status_show(struct seq_file *m, void *data)
> }
> DEFINE_SHOW_ATTRIBUTE(i915_psr_status);
>
> -#define LPSP_CAPABLE(COND) (COND ? seq_puts(m, "LPSP: capable\n") : \
> - seq_puts(m, "LPSP: incapable\n"))
> -
> static int i915_lpsp_capability_show(struct seq_file *m, void *data)
> {
> struct drm_connector *connector = m->private;
> struct drm_i915_private *i915 = to_i915(connector->dev);
> struct intel_encoder *encoder;
> + bool lpsp_capable = false;
>
> encoder = intel_attached_encoder(to_intel_connector(connector));
> if (!encoder)
> @@ -2241,35 +2239,27 @@ static int i915_lpsp_capability_show(struct seq_file *m, void *data)
> if (connector->status != connector_status_connected)
> return -ENODEV;
>
> - if (DISPLAY_VER(i915) >= 13) {
> - LPSP_CAPABLE(encoder->port <= PORT_B);
> - return 0;
> - }
> -
> - switch (DISPLAY_VER(i915)) {
> - case 12:
> + if (DISPLAY_VER(i915) >= 13)
> + lpsp_capable = encoder->port <= PORT_B;
> + else if (DISPLAY_VER(i915) >= 12)
> /*
> * Actually TGL can drive LPSP on port till DDI_C
> * but there is no physical connected DDI_C on TGL sku's,
> * even driver is not initilizing DDI_C port for gen12.
> */
> - LPSP_CAPABLE(encoder->port <= PORT_B);
> - break;
> - case 11:
> - LPSP_CAPABLE(connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
> - connector->connector_type == DRM_MODE_CONNECTOR_eDP);
> - break;
> - case 10:
> - case 9:
> - LPSP_CAPABLE(encoder->port == PORT_A &&
> - (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
> - connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
> - connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort));
> - break;
> - default:
> - if (IS_HASWELL(i915) || IS_BROADWELL(i915))
> - LPSP_CAPABLE(connector->connector_type == DRM_MODE_CONNECTOR_eDP);
> - }
> + lpsp_capable = encoder->port <= PORT_B;
> + else if (DISPLAY_VER(i915) == 11)
> + lpsp_capable = (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
> + connector->connector_type == DRM_MODE_CONNECTOR_eDP);
> + else if (IS_DISPLAY_VER(i915, 9, 10))
> + lpsp_capable = (encoder->port == PORT_A &&
> + (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
> + connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
> + connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort));
> + else if (IS_HASWELL(i915) || IS_BROADWELL(i915))
> + lpsp_capable = connector->connector_type == DRM_MODE_CONNECTOR_eDP;
> +
> + seq_printf(m, "LPSP: %s\n", lpsp_capable ? "capable" : "incapable");
>
> return 0;
> }
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Intel-gfx] [PATCH 3/5] drm/i915/debugfs: register LPSP capability on all platforms
2021-08-30 12:53 ` [Intel-gfx] [PATCH 3/5] drm/i915/debugfs: register LPSP capability on all platforms Jani Nikula
@ 2021-09-01 16:19 ` Rodrigo Vivi
0 siblings, 0 replies; 24+ messages in thread
From: Rodrigo Vivi @ 2021-09-01 16:19 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Mon, Aug 30, 2021 at 03:53:42PM +0300, Jani Nikula wrote:
> The debugfs file shows it's not capable, don't duplicate the info.
okay, but the file is useless if not supported right?!
I believe the goal here was even avoid the file creation...
But either way:
If this is not breaking IGT:
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> .../gpu/drm/i915/display/intel_display_debugfs.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index a6dcb95cfc1f..c1cd5d005e08 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -2486,14 +2486,11 @@ int intel_connector_debugfs_add(struct drm_connector *connector)
> connector, &i915_dsc_bpp_fops);
> }
>
> - /* Legacy panels doesn't lpsp on any platform */
> - if ((DISPLAY_VER(dev_priv) >= 9 || IS_HASWELL(dev_priv) ||
> - IS_BROADWELL(dev_priv)) &&
> - (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
> - connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
> - connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
> - connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
> - connector->connector_type == DRM_MODE_CONNECTOR_HDMIB))
> + if (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
> + connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
> + connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
> + connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
> + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
> debugfs_create_file("i915_lpsp_capability", 0444, root,
> connector, &i915_lpsp_capability_fops);
>
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Intel-gfx] [PATCH 4/5] drm/i915/display: stop returning errors from debugfs registration
2021-08-30 12:53 ` [Intel-gfx] [PATCH 4/5] drm/i915/display: stop returning errors from debugfs registration Jani Nikula
@ 2021-09-01 16:20 ` Rodrigo Vivi
2021-09-01 17:02 ` Jani Nikula
0 siblings, 1 reply; 24+ messages in thread
From: Rodrigo Vivi @ 2021-09-01 16:20 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Mon, Aug 30, 2021 at 03:53:43PM +0300, Jani Nikula wrote:
> Failures to register debugfs should be ignored anyway, so stop
> propagating errors altogether for clarity and simplicity. No functional
> changes.
not even a drm_debug if that fails?
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> .../drm/i915/display/intel_display_debugfs.c | 19 +++++--------------
> .../drm/i915/display/intel_display_debugfs.h | 8 ++++----
> 2 files changed, 9 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index c1cd5d005e08..845e2dc76f87 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -2443,17 +2443,15 @@ static const struct file_operations i915_dsc_bpp_fops = {
> *
> * Cleanup will be done by drm_connector_unregister() through a call to
> * drm_debugfs_connector_remove().
> - *
> - * Returns 0 on success, negative error codes on error.
> */
> -int intel_connector_debugfs_add(struct drm_connector *connector)
> +void intel_connector_debugfs_add(struct drm_connector *connector)
> {
> struct dentry *root = connector->debugfs_entry;
> struct drm_i915_private *dev_priv = to_i915(connector->dev);
>
> /* The connector must have been registered beforehands. */
> if (!root)
> - return -ENODEV;
> + return;
>
> if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
> debugfs_create_file("i915_panel_timings", S_IRUGO, root,
> @@ -2493,23 +2491,16 @@ int intel_connector_debugfs_add(struct drm_connector *connector)
> connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
> debugfs_create_file("i915_lpsp_capability", 0444, root,
> connector, &i915_lpsp_capability_fops);
> -
> - return 0;
> }
>
> /**
> * intel_crtc_debugfs_add - add i915 specific crtc debugfs files
> * @crtc: pointer to a drm_crtc
> *
> - * Returns 0 on success, negative error codes on error.
> - *
> * Failure to add debugfs entries should generally be ignored.
> */
> -int intel_crtc_debugfs_add(struct drm_crtc *crtc)
> +void intel_crtc_debugfs_add(struct drm_crtc *crtc)
> {
> - if (!crtc->debugfs_entry)
> - return -ENODEV;
> -
> - crtc_updates_add(crtc);
> - return 0;
> + if (crtc->debugfs_entry)
> + crtc_updates_add(crtc);
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.h b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
> index 557901f3eb90..c72e35ecba1f 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
> @@ -12,12 +12,12 @@ struct drm_i915_private;
>
> #ifdef CONFIG_DEBUG_FS
> void intel_display_debugfs_register(struct drm_i915_private *i915);
> -int intel_connector_debugfs_add(struct drm_connector *connector);
> -int intel_crtc_debugfs_add(struct drm_crtc *crtc);
> +void intel_connector_debugfs_add(struct drm_connector *connector);
> +void intel_crtc_debugfs_add(struct drm_crtc *crtc);
> #else
> static inline void intel_display_debugfs_register(struct drm_i915_private *i915) {}
> -static inline int intel_connector_debugfs_add(struct drm_connector *connector) { return 0; }
> -static inline int intel_crtc_debugfs_add(struct drm_crtc *crtc) { return 0; }
> +static inline void intel_connector_debugfs_add(struct drm_connector *connector) {}
> +static inline void intel_crtc_debugfs_add(struct drm_crtc *crtc) {}
> #endif
>
> #endif /* __INTEL_DISPLAY_DEBUGFS_H__ */
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Intel-gfx] [PATCH 4/5] drm/i915/display: stop returning errors from debugfs registration
2021-09-01 16:20 ` Rodrigo Vivi
@ 2021-09-01 17:02 ` Jani Nikula
2021-09-02 12:15 ` Vivi, Rodrigo
0 siblings, 1 reply; 24+ messages in thread
From: Jani Nikula @ 2021-09-01 17:02 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Wed, 01 Sep 2021, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> On Mon, Aug 30, 2021 at 03:53:43PM +0300, Jani Nikula wrote:
>> Failures to register debugfs should be ignored anyway, so stop
>> propagating errors altogether for clarity and simplicity. No functional
>> changes.
>
> not even a drm_debug if that fails?
*shrug* the only error we were returning anyway was if debugfs hadn't
been added at the drm level.
BR,
Jani.
>
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> .../drm/i915/display/intel_display_debugfs.c | 19 +++++--------------
>> .../drm/i915/display/intel_display_debugfs.h | 8 ++++----
>> 2 files changed, 9 insertions(+), 18 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> index c1cd5d005e08..845e2dc76f87 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> @@ -2443,17 +2443,15 @@ static const struct file_operations i915_dsc_bpp_fops = {
>> *
>> * Cleanup will be done by drm_connector_unregister() through a call to
>> * drm_debugfs_connector_remove().
>> - *
>> - * Returns 0 on success, negative error codes on error.
>> */
>> -int intel_connector_debugfs_add(struct drm_connector *connector)
>> +void intel_connector_debugfs_add(struct drm_connector *connector)
>> {
>> struct dentry *root = connector->debugfs_entry;
>> struct drm_i915_private *dev_priv = to_i915(connector->dev);
>>
>> /* The connector must have been registered beforehands. */
>> if (!root)
>> - return -ENODEV;
>> + return;
>>
>> if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
>> debugfs_create_file("i915_panel_timings", S_IRUGO, root,
>> @@ -2493,23 +2491,16 @@ int intel_connector_debugfs_add(struct drm_connector *connector)
>> connector->connector_type == DRM_MODE_CONNECTOR_HDMIB)
>> debugfs_create_file("i915_lpsp_capability", 0444, root,
>> connector, &i915_lpsp_capability_fops);
>> -
>> - return 0;
>> }
>>
>> /**
>> * intel_crtc_debugfs_add - add i915 specific crtc debugfs files
>> * @crtc: pointer to a drm_crtc
>> *
>> - * Returns 0 on success, negative error codes on error.
>> - *
>> * Failure to add debugfs entries should generally be ignored.
>> */
>> -int intel_crtc_debugfs_add(struct drm_crtc *crtc)
>> +void intel_crtc_debugfs_add(struct drm_crtc *crtc)
>> {
>> - if (!crtc->debugfs_entry)
>> - return -ENODEV;
>> -
>> - crtc_updates_add(crtc);
>> - return 0;
>> + if (crtc->debugfs_entry)
>> + crtc_updates_add(crtc);
>> }
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.h b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
>> index 557901f3eb90..c72e35ecba1f 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
>> @@ -12,12 +12,12 @@ struct drm_i915_private;
>>
>> #ifdef CONFIG_DEBUG_FS
>> void intel_display_debugfs_register(struct drm_i915_private *i915);
>> -int intel_connector_debugfs_add(struct drm_connector *connector);
>> -int intel_crtc_debugfs_add(struct drm_crtc *crtc);
>> +void intel_connector_debugfs_add(struct drm_connector *connector);
>> +void intel_crtc_debugfs_add(struct drm_crtc *crtc);
>> #else
>> static inline void intel_display_debugfs_register(struct drm_i915_private *i915) {}
>> -static inline int intel_connector_debugfs_add(struct drm_connector *connector) { return 0; }
>> -static inline int intel_crtc_debugfs_add(struct drm_crtc *crtc) { return 0; }
>> +static inline void intel_connector_debugfs_add(struct drm_connector *connector) {}
>> +static inline void intel_crtc_debugfs_add(struct drm_crtc *crtc) {}
>> #endif
>>
>> #endif /* __INTEL_DISPLAY_DEBUGFS_H__ */
>> --
>> 2.20.1
>>
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add()
2021-09-01 16:11 ` Rodrigo Vivi
@ 2021-09-01 17:03 ` Jani Nikula
0 siblings, 0 replies; 24+ messages in thread
From: Jani Nikula @ 2021-09-01 17:03 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Wed, 01 Sep 2021, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> On Mon, Aug 30, 2021 at 03:53:44PM +0300, Jani Nikula wrote:
>> Prefer the intel_ types. No functional changes.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/display/intel_connector.c | 2 +-
>> drivers/gpu/drm/i915/display/intel_display_debugfs.c | 3 ++-
>> drivers/gpu/drm/i915/display/intel_display_debugfs.h | 4 ++--
>> 3 files changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
>> index 4f49d782eca2..c65f95a9a1ec 100644
>> --- a/drivers/gpu/drm/i915/display/intel_connector.c
>> +++ b/drivers/gpu/drm/i915/display/intel_connector.c
>> @@ -124,7 +124,7 @@ int intel_connector_register(struct drm_connector *connector)
>
> oh, actually this is drm_connector
>
>> goto err_backlight;
>> }
>>
>> - intel_connector_debugfs_add(connector);
>> + intel_connector_debugfs_add(intel_connector);
>
> so this fails...
Hence the v2 :)
>
>>
>> return 0;
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> index 845e2dc76f87..82043a71e91f 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> @@ -2444,8 +2444,9 @@ static const struct file_operations i915_dsc_bpp_fops = {
>> * Cleanup will be done by drm_connector_unregister() through a call to
>> * drm_debugfs_connector_remove().
>> */
>> -void intel_connector_debugfs_add(struct drm_connector *connector)
>> +void intel_connector_debugfs_add(struct intel_connector *intel_connector)
>> {
>> + struct drm_connector *connector = &intel_connector->base;
>> struct dentry *root = connector->debugfs_entry;
>> struct drm_i915_private *dev_priv = to_i915(connector->dev);
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.h b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
>> index c72e35ecba1f..9b89b707ffe6 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
>> @@ -6,9 +6,9 @@
>> #ifndef __INTEL_DISPLAY_DEBUGFS_H__
>> #define __INTEL_DISPLAY_DEBUGFS_H__
>>
>> -struct drm_connector;
>> struct drm_crtc;
>> struct drm_i915_private;
>> +struct intel_connector;
>>
>> #ifdef CONFIG_DEBUG_FS
>> void intel_display_debugfs_register(struct drm_i915_private *i915);
>> @@ -16,7 +16,7 @@ void intel_connector_debugfs_add(struct drm_connector *connector);
>> void intel_crtc_debugfs_add(struct drm_crtc *crtc);
>> #else
>> static inline void intel_display_debugfs_register(struct drm_i915_private *i915) {}
>> -static inline void intel_connector_debugfs_add(struct drm_connector *connector) {}
>> +static inline void intel_connector_debugfs_add(struct intel_connector *connector) {}
>> static inline void intel_crtc_debugfs_add(struct drm_crtc *crtc) {}
>> #endif
>>
>> --
>> 2.20.1
>>
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Intel-gfx] [PATCH 2/5] drm/i915/debugfs: clean up LPSP capable
2021-09-01 16:14 ` Rodrigo Vivi
@ 2021-09-02 11:14 ` Jani Nikula
0 siblings, 0 replies; 24+ messages in thread
From: Jani Nikula @ 2021-09-02 11:14 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Wed, 01 Sep 2021, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> On Mon, Aug 30, 2021 at 03:53:41PM +0300, Jani Nikula wrote:
>> Clean up the LPSP capability printout. No functional changes.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Thanks, pushed the first two for starters.
BR,
Jani.
>
>> ---
>> .../drm/i915/display/intel_display_debugfs.c | 44 +++++++------------
>> 1 file changed, 17 insertions(+), 27 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> index d2a14a9c6857..a6dcb95cfc1f 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
>> @@ -2225,14 +2225,12 @@ static int i915_psr_status_show(struct seq_file *m, void *data)
>> }
>> DEFINE_SHOW_ATTRIBUTE(i915_psr_status);
>>
>> -#define LPSP_CAPABLE(COND) (COND ? seq_puts(m, "LPSP: capable\n") : \
>> - seq_puts(m, "LPSP: incapable\n"))
>> -
>> static int i915_lpsp_capability_show(struct seq_file *m, void *data)
>> {
>> struct drm_connector *connector = m->private;
>> struct drm_i915_private *i915 = to_i915(connector->dev);
>> struct intel_encoder *encoder;
>> + bool lpsp_capable = false;
>>
>> encoder = intel_attached_encoder(to_intel_connector(connector));
>> if (!encoder)
>> @@ -2241,35 +2239,27 @@ static int i915_lpsp_capability_show(struct seq_file *m, void *data)
>> if (connector->status != connector_status_connected)
>> return -ENODEV;
>>
>> - if (DISPLAY_VER(i915) >= 13) {
>> - LPSP_CAPABLE(encoder->port <= PORT_B);
>> - return 0;
>> - }
>> -
>> - switch (DISPLAY_VER(i915)) {
>> - case 12:
>> + if (DISPLAY_VER(i915) >= 13)
>> + lpsp_capable = encoder->port <= PORT_B;
>> + else if (DISPLAY_VER(i915) >= 12)
>> /*
>> * Actually TGL can drive LPSP on port till DDI_C
>> * but there is no physical connected DDI_C on TGL sku's,
>> * even driver is not initilizing DDI_C port for gen12.
>> */
>> - LPSP_CAPABLE(encoder->port <= PORT_B);
>> - break;
>> - case 11:
>> - LPSP_CAPABLE(connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
>> - connector->connector_type == DRM_MODE_CONNECTOR_eDP);
>> - break;
>> - case 10:
>> - case 9:
>> - LPSP_CAPABLE(encoder->port == PORT_A &&
>> - (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
>> - connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
>> - connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort));
>> - break;
>> - default:
>> - if (IS_HASWELL(i915) || IS_BROADWELL(i915))
>> - LPSP_CAPABLE(connector->connector_type == DRM_MODE_CONNECTOR_eDP);
>> - }
>> + lpsp_capable = encoder->port <= PORT_B;
>> + else if (DISPLAY_VER(i915) == 11)
>> + lpsp_capable = (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
>> + connector->connector_type == DRM_MODE_CONNECTOR_eDP);
>> + else if (IS_DISPLAY_VER(i915, 9, 10))
>> + lpsp_capable = (encoder->port == PORT_A &&
>> + (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
>> + connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
>> + connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort));
>> + else if (IS_HASWELL(i915) || IS_BROADWELL(i915))
>> + lpsp_capable = connector->connector_type == DRM_MODE_CONNECTOR_eDP;
>> +
>> + seq_printf(m, "LPSP: %s\n", lpsp_capable ? "capable" : "incapable");
>>
>> return 0;
>> }
>> --
>> 2.20.1
>>
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [Intel-gfx] [PATCH 4/5] drm/i915/display: stop returning errors from debugfs registration
2021-09-01 17:02 ` Jani Nikula
@ 2021-09-02 12:15 ` Vivi, Rodrigo
0 siblings, 0 replies; 24+ messages in thread
From: Vivi, Rodrigo @ 2021-09-02 12:15 UTC (permalink / raw)
To: Nikula, Jani; +Cc: intel-gfx
On Wed, 2021-09-01 at 20:02 +0300, Jani Nikula wrote:
> On Wed, 01 Sep 2021, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> > On Mon, Aug 30, 2021 at 03:53:43PM +0300, Jani Nikula wrote:
> > > Failures to register debugfs should be ignored anyway, so stop
> > > propagating errors altogether for clarity and simplicity. No
> > > functional
> > > changes.
> >
> > not even a drm_debug if that fails?
>
> *shrug* the only error we were returning anyway was if debugfs hadn't
> been added at the drm level.
oh, indeed...
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> BR,
> Jani.
>
> >
> > >
> > > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> > > ---
> > > .../drm/i915/display/intel_display_debugfs.c | 19 +++++--------
> > > ------
> > > .../drm/i915/display/intel_display_debugfs.h | 8 ++++----
> > > 2 files changed, 9 insertions(+), 18 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > > b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > > index c1cd5d005e08..845e2dc76f87 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > > @@ -2443,17 +2443,15 @@ static const struct file_operations
> > > i915_dsc_bpp_fops = {
> > > *
> > > * Cleanup will be done by drm_connector_unregister() through a
> > > call to
> > > * drm_debugfs_connector_remove().
> > > - *
> > > - * Returns 0 on success, negative error codes on error.
> > > */
> > > -int intel_connector_debugfs_add(struct drm_connector *connector)
> > > +void intel_connector_debugfs_add(struct drm_connector
> > > *connector)
> > > {
> > > struct dentry *root = connector->debugfs_entry;
> > > struct drm_i915_private *dev_priv = to_i915(connector-
> > > >dev);
> > >
> > > /* The connector must have been registered beforehands.
> > > */
> > > if (!root)
> > > - return -ENODEV;
> > > + return;
> > >
> > > if (connector->connector_type == DRM_MODE_CONNECTOR_eDP)
> > > {
> > > debugfs_create_file("i915_panel_timings",
> > > S_IRUGO, root,
> > > @@ -2493,23 +2491,16 @@ int intel_connector_debugfs_add(struct
> > > drm_connector *connector)
> > > connector->connector_type ==
> > > DRM_MODE_CONNECTOR_HDMIB)
> > > debugfs_create_file("i915_lpsp_capability", 0444,
> > > root,
> > > connector,
> > > &i915_lpsp_capability_fops);
> > > -
> > > - return 0;
> > > }
> > >
> > > /**
> > > * intel_crtc_debugfs_add - add i915 specific crtc debugfs files
> > > * @crtc: pointer to a drm_crtc
> > > *
> > > - * Returns 0 on success, negative error codes on error.
> > > - *
> > > * Failure to add debugfs entries should generally be ignored.
> > > */
> > > -int intel_crtc_debugfs_add(struct drm_crtc *crtc)
> > > +void intel_crtc_debugfs_add(struct drm_crtc *crtc)
> > > {
> > > - if (!crtc->debugfs_entry)
> > > - return -ENODEV;
> > > -
> > > - crtc_updates_add(crtc);
> > > - return 0;
> > > + if (crtc->debugfs_entry)
> > > + crtc_updates_add(crtc);
> > > }
> > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.h
> > > b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
> > > index 557901f3eb90..c72e35ecba1f 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.h
> > > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.h
> > > @@ -12,12 +12,12 @@ struct drm_i915_private;
> > >
> > > #ifdef CONFIG_DEBUG_FS
> > > void intel_display_debugfs_register(struct drm_i915_private
> > > *i915);
> > > -int intel_connector_debugfs_add(struct drm_connector
> > > *connector);
> > > -int intel_crtc_debugfs_add(struct drm_crtc *crtc);
> > > +void intel_connector_debugfs_add(struct drm_connector
> > > *connector);
> > > +void intel_crtc_debugfs_add(struct drm_crtc *crtc);
> > > #else
> > > static inline void intel_display_debugfs_register(struct
> > > drm_i915_private *i915) {}
> > > -static inline int intel_connector_debugfs_add(struct
> > > drm_connector *connector) { return 0; }
> > > -static inline int intel_crtc_debugfs_add(struct drm_crtc *crtc)
> > > { return 0; }
> > > +static inline void intel_connector_debugfs_add(struct
> > > drm_connector *connector) {}
> > > +static inline void intel_crtc_debugfs_add(struct drm_crtc *crtc)
> > > {}
> > > #endif
> > >
> > > #endif /* __INTEL_DISPLAY_DEBUGFS_H__ */
> > > --
> > > 2.20.1
> > >
>
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2021-09-02 12:15 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-30 12:53 [Intel-gfx] [PATCH 0/5] drm/i915/display: debugfs cleanups Jani Nikula
2021-08-30 12:53 ` [Intel-gfx] [PATCH 1/5] drm/i915/debugfs: clean up LPSP status Jani Nikula
2021-09-01 16:13 ` Rodrigo Vivi
2021-08-30 12:53 ` [Intel-gfx] [PATCH 2/5] drm/i915/debugfs: clean up LPSP capable Jani Nikula
2021-09-01 16:14 ` Rodrigo Vivi
2021-09-02 11:14 ` Jani Nikula
2021-08-30 12:53 ` [Intel-gfx] [PATCH 3/5] drm/i915/debugfs: register LPSP capability on all platforms Jani Nikula
2021-09-01 16:19 ` Rodrigo Vivi
2021-08-30 12:53 ` [Intel-gfx] [PATCH 4/5] drm/i915/display: stop returning errors from debugfs registration Jani Nikula
2021-09-01 16:20 ` Rodrigo Vivi
2021-09-01 17:02 ` Jani Nikula
2021-09-02 12:15 ` Vivi, Rodrigo
2021-08-30 12:53 ` [Intel-gfx] [PATCH 5/5] drm/i915/debugfs: pass intel_connector to intel_connector_debugfs_add() Jani Nikula
2021-08-30 14:02 ` [Intel-gfx] [PATCH v2] " Jani Nikula
2021-08-30 20:48 ` [Intel-gfx] [PATCH 5/5] " kernel test robot
2021-08-30 20:48 ` kernel test robot
2021-08-31 16:00 ` kernel test robot
2021-08-31 16:00 ` kernel test robot
2021-09-01 16:09 ` Rodrigo Vivi
2021-09-01 16:11 ` Rodrigo Vivi
2021-09-01 17:03 ` Jani Nikula
2021-08-30 13:31 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/display: debugfs cleanups Patchwork
2021-08-30 14:43 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: debugfs cleanups (rev2) Patchwork
2021-08-30 16:59 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.