* [Intel-gfx] [PATCH 0/4] drm/i915: further device info cleanups
@ 2023-06-08 15:09 Jani Nikula
2023-06-08 15:09 ` [Intel-gfx] [PATCH 1/4] drm/i915: separate display info printing from the rest Jani Nikula
` (7 more replies)
0 siblings, 8 replies; 13+ messages in thread
From: Jani Nikula @ 2023-06-08 15:09 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Lucas De Marchi, Matt Roper
Building on Matt's display info separation, we can finally trivially
make device info a const pointer to rodata.
BR,
Jani.
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Jani Nikula (4):
drm/i915: separate display info printing from the rest
drm/i915: fix display info usage
drm/i915: move display device and runtime info to struct intel_display
drm/i915: make device info a const pointer to rodata
drivers/gpu/drm/i915/display/intel_display.h | 2 +-
.../gpu/drm/i915/display/intel_display_core.h | 9 ++++
.../drm/i915/display/intel_display_device.c | 21 ++++++++++
.../drm/i915/display/intel_display_device.h | 5 +++
drivers/gpu/drm/i915/i915_debugfs.c | 1 +
drivers/gpu/drm/i915/i915_driver.c | 2 +
drivers/gpu/drm/i915/i915_drv.h | 9 ++--
drivers/gpu/drm/i915/i915_gpu_error.c | 6 +++
drivers/gpu/drm/i915/i915_gpu_error.h | 3 ++
drivers/gpu/drm/i915/intel_device_info.c | 42 +++----------------
drivers/gpu/drm/i915/intel_device_info.h | 4 --
11 files changed, 58 insertions(+), 46 deletions(-)
--
2.39.2
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Intel-gfx] [PATCH 1/4] drm/i915: separate display info printing from the rest
2023-06-08 15:09 [Intel-gfx] [PATCH 0/4] drm/i915: further device info cleanups Jani Nikula
@ 2023-06-08 15:09 ` Jani Nikula
2023-06-08 21:52 ` Matt Roper
2023-06-08 15:09 ` [Intel-gfx] [PATCH 2/4] drm/i915: fix display info usage Jani Nikula
` (6 subsequent siblings)
7 siblings, 1 reply; 13+ messages in thread
From: Jani Nikula @ 2023-06-08 15:09 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Lucas De Marchi, Matt Roper
Add new function intel_display_device_info_print() and print the display
device info there instead of intel_device_info_print(). This also fixes
the display runtime info printing to use the actual runtime info instead
of the static defaults.
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../drm/i915/display/intel_display_device.c | 21 +++++++++++++++++++
.../drm/i915/display/intel_display_device.h | 5 +++++
drivers/gpu/drm/i915/i915_debugfs.c | 1 +
drivers/gpu/drm/i915/i915_driver.c | 2 ++
drivers/gpu/drm/i915/i915_gpu_error.c | 6 ++++++
drivers/gpu/drm/i915/i915_gpu_error.h | 3 +++
drivers/gpu/drm/i915/intel_device_info.c | 20 ------------------
7 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
index 3fd30e7f0062..60cfe52c0bb7 100644
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -915,3 +915,24 @@ void intel_display_device_info_runtime_init(struct drm_i915_private *i915)
display_fused_off:
memset(display_runtime, 0, sizeof(*display_runtime));
}
+
+void intel_display_device_info_print(const struct intel_display_device_info *info,
+ const struct intel_display_runtime_info *runtime,
+ struct drm_printer *p)
+{
+ if (runtime->ip.rel)
+ drm_printf(p, "display version: %u.%02u\n",
+ runtime->ip.ver,
+ runtime->ip.rel);
+ else
+ drm_printf(p, "display version: %u\n",
+ runtime->ip.ver);
+
+#define PRINT_FLAG(name) drm_printf(p, "%s: %s\n", #name, str_yes_no(info->name))
+ DEV_INFO_DISPLAY_FOR_EACH_FLAG(PRINT_FLAG);
+#undef PRINT_FLAG
+
+ drm_printf(p, "has_hdcp: %s\n", str_yes_no(runtime->has_hdcp));
+ drm_printf(p, "has_dmc: %s\n", str_yes_no(runtime->has_dmc));
+ drm_printf(p, "has_dsc: %s\n", str_yes_no(runtime->has_dsc));
+}
diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h
index 706ff2aa1f55..d137e62666e0 100644
--- a/drivers/gpu/drm/i915/display/intel_display_device.h
+++ b/drivers/gpu/drm/i915/display/intel_display_device.h
@@ -11,6 +11,7 @@
#include "intel_display_limits.h"
struct drm_i915_private;
+struct drm_printer;
#define DEV_INFO_DISPLAY_FOR_EACH_FLAG(func) \
/* Keep in alphabetical order */ \
@@ -126,4 +127,8 @@ intel_display_device_probe(struct drm_i915_private *i915, bool has_gmdid,
u16 *ver, u16 *rel, u16 *step);
void intel_display_device_info_runtime_init(struct drm_i915_private *i915);
+void intel_display_device_info_print(const struct intel_display_device_info *info,
+ const struct intel_display_runtime_info *runtime,
+ struct drm_printer *p);
+
#endif
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 76ccd4e03e31..4de44cf1026d 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -67,6 +67,7 @@ static int i915_capabilities(struct seq_file *m, void *data)
seq_printf(m, "pch: %d\n", INTEL_PCH_TYPE(i915));
intel_device_info_print(INTEL_INFO(i915), RUNTIME_INFO(i915), &p);
+ intel_display_device_info_print(DISPLAY_INFO(i915), DISPLAY_RUNTIME_INFO(i915), &p);
i915_print_iommu_status(i915, &p);
intel_gt_info_print(&to_gt(i915)->info, &p);
intel_driver_caps_print(&i915->caps, &p);
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index ace8534b6cc5..51a1fc2a6f58 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -698,6 +698,8 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv)
intel_device_info_print(INTEL_INFO(dev_priv),
RUNTIME_INFO(dev_priv), &p);
+ intel_display_device_info_print(DISPLAY_INFO(dev_priv),
+ DISPLAY_RUNTIME_INFO(dev_priv), &p);
i915_print_iommu_status(dev_priv, &p);
for_each_gt(gt, dev_priv, i)
intel_gt_info_print(>->info, &p);
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index ec368e700235..f109656cb1cc 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -649,6 +649,8 @@ static void err_print_capabilities(struct drm_i915_error_state_buf *m,
struct drm_printer p = i915_error_printer(m);
intel_device_info_print(&error->device_info, &error->runtime_info, &p);
+ intel_display_device_info_print(&error->display_device_info,
+ &error->display_runtime_info, &p);
intel_driver_caps_print(&error->driver_caps, &p);
}
@@ -1983,6 +1985,10 @@ static void capture_gen(struct i915_gpu_coredump *error)
memcpy(&error->runtime_info,
RUNTIME_INFO(i915),
sizeof(error->runtime_info));
+ memcpy(&error->display_device_info, DISPLAY_INFO(i915),
+ sizeof(error->display_device_info));
+ memcpy(&error->display_runtime_info, DISPLAY_RUNTIME_INFO(i915),
+ sizeof(error->display_runtime_info));
error->driver_caps = i915->caps;
}
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h
index a78c061ce26f..9f5971f5e980 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.h
+++ b/drivers/gpu/drm/i915/i915_gpu_error.h
@@ -14,6 +14,7 @@
#include <drm/drm_mm.h>
+#include "display/intel_display_device.h"
#include "gt/intel_engine.h"
#include "gt/intel_gt_types.h"
#include "gt/uc/intel_uc_fw.h"
@@ -209,6 +210,8 @@ struct i915_gpu_coredump {
struct intel_device_info device_info;
struct intel_runtime_info runtime_info;
+ struct intel_display_device_info display_device_info;
+ struct intel_display_runtime_info display_runtime_info;
struct intel_driver_caps driver_caps;
struct i915_params params;
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 6e49caf241a5..53d316804071 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -93,9 +93,6 @@ void intel_device_info_print(const struct intel_device_info *info,
const struct intel_runtime_info *runtime,
struct drm_printer *p)
{
- const struct intel_display_runtime_info *display_runtime =
- &info->display->__runtime_defaults;
-
if (runtime->graphics.ip.rel)
drm_printf(p, "graphics version: %u.%02u\n",
runtime->graphics.ip.ver,
@@ -112,14 +109,6 @@ void intel_device_info_print(const struct intel_device_info *info,
drm_printf(p, "media version: %u\n",
runtime->media.ip.ver);
- if (display_runtime->ip.rel)
- drm_printf(p, "display version: %u.%02u\n",
- display_runtime->ip.ver,
- display_runtime->ip.rel);
- else
- drm_printf(p, "display version: %u\n",
- display_runtime->ip.ver);
-
drm_printf(p, "graphics stepping: %s\n", intel_step_name(runtime->step.graphics_step));
drm_printf(p, "media stepping: %s\n", intel_step_name(runtime->step.media_step));
drm_printf(p, "display stepping: %s\n", intel_step_name(runtime->step.display_step));
@@ -138,15 +127,6 @@ void intel_device_info_print(const struct intel_device_info *info,
#undef PRINT_FLAG
drm_printf(p, "has_pooled_eu: %s\n", str_yes_no(runtime->has_pooled_eu));
-
-#define PRINT_FLAG(name) drm_printf(p, "%s: %s\n", #name, str_yes_no(info->display->name))
- DEV_INFO_DISPLAY_FOR_EACH_FLAG(PRINT_FLAG);
-#undef PRINT_FLAG
-
- drm_printf(p, "has_hdcp: %s\n", str_yes_no(display_runtime->has_hdcp));
- drm_printf(p, "has_dmc: %s\n", str_yes_no(display_runtime->has_dmc));
- drm_printf(p, "has_dsc: %s\n", str_yes_no(display_runtime->has_dsc));
-
drm_printf(p, "rawclk rate: %u kHz\n", runtime->rawclk_freq);
}
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Intel-gfx] [PATCH 2/4] drm/i915: fix display info usage
2023-06-08 15:09 [Intel-gfx] [PATCH 0/4] drm/i915: further device info cleanups Jani Nikula
2023-06-08 15:09 ` [Intel-gfx] [PATCH 1/4] drm/i915: separate display info printing from the rest Jani Nikula
@ 2023-06-08 15:09 ` Jani Nikula
2023-06-08 21:53 ` Matt Roper
2023-06-08 15:09 ` [Intel-gfx] [PATCH 3/4] drm/i915: move display device and runtime info to struct intel_display Jani Nikula
` (5 subsequent siblings)
7 siblings, 1 reply; 13+ messages in thread
From: Jani Nikula @ 2023-06-08 15:09 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Lucas De Marchi, Matt Roper
Prefer DISPLAY_INFO() over INTEL_INFO()->display.
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_display.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index c744c021af23..1a987dc45c70 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -113,7 +113,7 @@ enum i9xx_plane_id {
#define for_each_dbuf_slice(__dev_priv, __slice) \
for ((__slice) = DBUF_S1; (__slice) < I915_MAX_DBUF_SLICES; (__slice)++) \
- for_each_if(INTEL_INFO(__dev_priv)->display->dbuf.slice_mask & BIT(__slice))
+ for_each_if(DISPLAY_INFO(__dev_priv)->dbuf.slice_mask & BIT(__slice))
#define for_each_dbuf_slice_in_mask(__dev_priv, __slice, __mask) \
for_each_dbuf_slice((__dev_priv), (__slice)) \
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Intel-gfx] [PATCH 3/4] drm/i915: move display device and runtime info to struct intel_display
2023-06-08 15:09 [Intel-gfx] [PATCH 0/4] drm/i915: further device info cleanups Jani Nikula
2023-06-08 15:09 ` [Intel-gfx] [PATCH 1/4] drm/i915: separate display info printing from the rest Jani Nikula
2023-06-08 15:09 ` [Intel-gfx] [PATCH 2/4] drm/i915: fix display info usage Jani Nikula
@ 2023-06-08 15:09 ` Jani Nikula
2023-06-08 22:04 ` Matt Roper
2023-06-08 15:09 ` [Intel-gfx] [PATCH 4/4] drm/i915: make device info a const pointer to rodata Jani Nikula
` (4 subsequent siblings)
7 siblings, 1 reply; 13+ messages in thread
From: Jani Nikula @ 2023-06-08 15:09 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Lucas De Marchi, Matt Roper
Continue moving all things display further into display files and
structures.
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_display_core.h | 9 +++++++++
drivers/gpu/drm/i915/i915_drv.h | 5 ++---
drivers/gpu/drm/i915/intel_device_info.c | 7 +++----
drivers/gpu/drm/i915/intel_device_info.h | 4 ----
4 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 8d2243c71dd8..a65ed8a52ce4 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -19,6 +19,7 @@
#include "intel_cdclk.h"
#include "intel_display_limits.h"
#include "intel_display_power.h"
+#include "intel_display_device.h"
#include "intel_dpll_mgr.h"
#include "intel_fbc.h"
#include "intel_global_state.h"
@@ -429,6 +430,14 @@ struct intel_display {
u32 state;
} hti;
+ struct {
+ /* Access with DISPLAY_INFO() */
+ const struct intel_display_device_info *__device_info;
+
+ /* Access with DISPLAY_RUNTIME_INFO() */
+ struct intel_display_runtime_info __runtime_info;
+ } info;
+
struct {
bool false_color;
} ips;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index b457a37e67c4..2d8331d435f1 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -205,7 +205,6 @@ struct drm_i915_private {
const struct intel_device_info __info; /* Use INTEL_INFO() to access. */
struct intel_runtime_info __runtime; /* Use RUNTIME_INFO() to access. */
- struct intel_display_runtime_info __display_runtime; /* Access with DISPLAY_RUNTIME_INFO() */
struct intel_driver_caps caps;
struct i915_dsm dsm;
@@ -407,9 +406,9 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915)
(engine__) = rb_to_uabi_engine(rb_next(&(engine__)->uabi_node)))
#define INTEL_INFO(i915) (&(i915)->__info)
-#define DISPLAY_INFO(i915) (INTEL_INFO(i915)->display)
#define RUNTIME_INFO(i915) (&(i915)->__runtime)
-#define DISPLAY_RUNTIME_INFO(i915) (&(i915)->__display_runtime)
+#define DISPLAY_INFO(i915) ((i915)->display.info.__device_info)
+#define DISPLAY_RUNTIME_INFO(i915) (&(i915)->display.info.__runtime_info)
#define DRIVER_CAPS(i915) (&(i915)->caps)
#define INTEL_DEVID(i915) (RUNTIME_INFO(i915)->device_id)
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 53d316804071..d51bbdbe53ab 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -387,7 +387,6 @@ static const struct intel_display_device_info no_display = {};
*/
void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
{
- struct intel_device_info *info = mkwrite_device_info(dev_priv);
struct intel_runtime_info *runtime = RUNTIME_INFO(dev_priv);
if (HAS_DISPLAY(dev_priv))
@@ -397,7 +396,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
if (!HAS_DISPLAY(dev_priv)) {
dev_priv->drm.driver_features &= ~(DRIVER_MODESET |
DRIVER_ATOMIC);
- info->display = &no_display;
+ dev_priv->display.info.__device_info = &no_display;
}
/* Disable nuclear pageflip by default on pre-g4x */
@@ -440,8 +439,8 @@ void intel_device_info_driver_create(struct drm_i915_private *i915,
memcpy(runtime, &INTEL_INFO(i915)->__runtime, sizeof(*runtime));
/* Probe display support */
- info->display = intel_display_device_probe(i915, info->has_gmd_id,
- &ver, &rel, &step);
+ i915->display.info.__device_info = intel_display_device_probe(i915, info->has_gmd_id,
+ &ver, &rel, &step);
memcpy(DISPLAY_RUNTIME_INFO(i915),
&DISPLAY_INFO(i915)->__runtime_defaults,
sizeof(*DISPLAY_RUNTIME_INFO(i915)));
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 069291b3bd37..c8b4bee5e592 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -29,8 +29,6 @@
#include "intel_step.h"
-#include "display/intel_display_device.h"
-
#include "gt/intel_engine_types.h"
#include "gt/intel_context_types.h"
#include "gt/intel_sseu.h"
@@ -241,8 +239,6 @@ struct intel_device_info {
DEV_INFO_FOR_EACH_FLAG(DEFINE_FLAG);
#undef DEFINE_FLAG
- const struct intel_display_device_info *display;
-
/*
* Initial runtime info. Do not access outside of i915_driver_create().
*/
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Intel-gfx] [PATCH 4/4] drm/i915: make device info a const pointer to rodata
2023-06-08 15:09 [Intel-gfx] [PATCH 0/4] drm/i915: further device info cleanups Jani Nikula
` (2 preceding siblings ...)
2023-06-08 15:09 ` [Intel-gfx] [PATCH 3/4] drm/i915: move display device and runtime info to struct intel_display Jani Nikula
@ 2023-06-08 15:09 ` Jani Nikula
2023-06-08 22:09 ` Matt Roper
2023-06-08 19:11 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: further device info cleanups Patchwork
` (3 subsequent siblings)
7 siblings, 1 reply; 13+ messages in thread
From: Jani Nikula @ 2023-06-08 15:09 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Lucas De Marchi, Matt Roper
Finally we can get rid of the pseudo-const write-once device info, and
convert it into a const pointer to device info in rodata.
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 4 ++--
drivers/gpu/drm/i915/intel_device_info.c | 17 ++++-------------
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 2d8331d435f1..788438b19e65 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -203,7 +203,7 @@ struct drm_i915_private {
/* i915 device parameters */
struct i915_params params;
- const struct intel_device_info __info; /* Use INTEL_INFO() to access. */
+ const struct intel_device_info *__info; /* Use INTEL_INFO() to access. */
struct intel_runtime_info __runtime; /* Use RUNTIME_INFO() to access. */
struct intel_driver_caps caps;
@@ -405,7 +405,7 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915)
(engine__) && (engine__)->uabi_class == (class__); \
(engine__) = rb_to_uabi_engine(rb_next(&(engine__)->uabi_node)))
-#define INTEL_INFO(i915) (&(i915)->__info)
+#define INTEL_INFO(i915) ((i915)->__info)
#define RUNTIME_INFO(i915) (&(i915)->__runtime)
#define DISPLAY_INFO(i915) ((i915)->display.info.__device_info)
#define DISPLAY_RUNTIME_INFO(i915) (&(i915)->display.info.__runtime_info)
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index d51bbdbe53ab..0ef001d22ab2 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -360,13 +360,6 @@ void intel_device_info_runtime_init_early(struct drm_i915_private *i915)
intel_device_info_subplatform_init(i915);
}
-/* FIXME: Remove this, and make device info a const pointer to rodata. */
-static struct intel_device_info *
-mkwrite_device_info(struct drm_i915_private *i915)
-{
- return (struct intel_device_info *)INTEL_INFO(i915);
-}
-
static const struct intel_display_device_info no_display = {};
/**
@@ -426,26 +419,24 @@ void intel_device_info_driver_create(struct drm_i915_private *i915,
u16 device_id,
const struct intel_device_info *match_info)
{
- struct intel_device_info *info;
struct intel_runtime_info *runtime;
u16 ver, rel, step;
- /* Setup the write-once "constant" device info */
- info = mkwrite_device_info(i915);
- memcpy(info, match_info, sizeof(*info));
+ /* Setup INTEL_INFO() */
+ i915->__info = match_info;
/* Initialize initial runtime info from static const data and pdev. */
runtime = RUNTIME_INFO(i915);
memcpy(runtime, &INTEL_INFO(i915)->__runtime, sizeof(*runtime));
/* Probe display support */
- i915->display.info.__device_info = intel_display_device_probe(i915, info->has_gmd_id,
+ i915->display.info.__device_info = intel_display_device_probe(i915, HAS_GMD_ID(i915),
&ver, &rel, &step);
memcpy(DISPLAY_RUNTIME_INFO(i915),
&DISPLAY_INFO(i915)->__runtime_defaults,
sizeof(*DISPLAY_RUNTIME_INFO(i915)));
- if (info->has_gmd_id) {
+ if (HAS_GMD_ID(i915)) {
DISPLAY_RUNTIME_INFO(i915)->ip.ver = ver;
DISPLAY_RUNTIME_INFO(i915)->ip.rel = rel;
DISPLAY_RUNTIME_INFO(i915)->ip.step = step;
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: further device info cleanups
2023-06-08 15:09 [Intel-gfx] [PATCH 0/4] drm/i915: further device info cleanups Jani Nikula
` (3 preceding siblings ...)
2023-06-08 15:09 ` [Intel-gfx] [PATCH 4/4] drm/i915: make device info a const pointer to rodata Jani Nikula
@ 2023-06-08 19:11 ` Patchwork
2023-06-08 19:11 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
` (2 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2023-06-08 19:11 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: further device info cleanups
URL : https://patchwork.freedesktop.org/series/119086/
State : warning
== Summary ==
Error: dim checkpatch failed
4151efbd9a55 drm/i915: separate display info printing from the rest
-:36: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'name' may be better as '(name)' to avoid precedence issues
#36: FILE: drivers/gpu/drm/i915/display/intel_display_device.c:931:
+#define PRINT_FLAG(name) drm_printf(p, "%s: %s\n", #name, str_yes_no(info->name))
total: 0 errors, 0 warnings, 1 checks, 125 lines checked
b99c5a5fff3c drm/i915: fix display info usage
175ec5f1d82b drm/i915: move display device and runtime info to struct intel_display
b5b33d394a67 drm/i915: make device info a const pointer to rodata
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: further device info cleanups
2023-06-08 15:09 [Intel-gfx] [PATCH 0/4] drm/i915: further device info cleanups Jani Nikula
` (4 preceding siblings ...)
2023-06-08 19:11 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: further device info cleanups Patchwork
@ 2023-06-08 19:11 ` Patchwork
2023-06-08 19:14 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-06-10 2:35 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
7 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2023-06-08 19:11 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: further device info cleanups
URL : https://patchwork.freedesktop.org/series/119086/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: further device info cleanups
2023-06-08 15:09 [Intel-gfx] [PATCH 0/4] drm/i915: further device info cleanups Jani Nikula
` (5 preceding siblings ...)
2023-06-08 19:11 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
@ 2023-06-08 19:14 ` Patchwork
2023-06-10 2:35 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
7 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2023-06-08 19:14 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 5340 bytes --]
== Series Details ==
Series: drm/i915: further device info cleanups
URL : https://patchwork.freedesktop.org/series/119086/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13253 -> Patchwork_119086v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/index.html
Participating hosts (35 -> 34)
------------------------------
Missing (1): fi-kbl-soraka
Known issues
------------
Here are the changes found in Patchwork_119086v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@reset:
- bat-rpls-2: NOTRUN -> [ABORT][1] ([i915#4983] / [i915#7461] / [i915#7913] / [i915#8347])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/bat-rpls-2/igt@i915_selftest@live@reset.html
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- fi-glk-j4005: NOTRUN -> [SKIP][2] ([fdo#109271])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/fi-glk-j4005/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
* igt@kms_pipe_crc_basic@nonblocking-crc@pipe-d-dp-1:
- bat-dg2-8: [PASS][3] -> [FAIL][4] ([i915#7932]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc@pipe-d-dp-1.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc@pipe-d-dp-1.html
#### Possible fixes ####
* igt@i915_selftest@live@gt_heartbeat:
- fi-apl-guc: [DMESG-FAIL][5] ([i915#5334]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@late_gt_pm:
- fi-glk-j4005: [ABORT][7] ([i915#6217]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/fi-glk-j4005/igt@i915_selftest@live@late_gt_pm.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/fi-glk-j4005/igt@i915_selftest@live@late_gt_pm.html
* igt@i915_selftest@live@mman:
- bat-rpls-2: [TIMEOUT][9] ([i915#6794] / [i915#7392]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/bat-rpls-2/igt@i915_selftest@live@mman.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/bat-rpls-2/igt@i915_selftest@live@mman.html
* {igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12@pipe-b-dp-6}:
- {bat-adlp-11}: [ABORT][11] ([i915#4423]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/bat-adlp-11/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12@pipe-b-dp-6.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/bat-adlp-11/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12@pipe-b-dp-6.html
* {igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12@pipe-c-dp-5}:
- {bat-adlp-11}: [DMESG-WARN][13] ([i915#4309] / [i915#4423]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/bat-adlp-11/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12@pipe-c-dp-5.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/bat-adlp-11/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12@pipe-c-dp-5.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
[i915#4309]: https://gitlab.freedesktop.org/drm/intel/issues/4309
[i915#4423]: https://gitlab.freedesktop.org/drm/intel/issues/4423
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#6217]: https://gitlab.freedesktop.org/drm/intel/issues/6217
[i915#6794]: https://gitlab.freedesktop.org/drm/intel/issues/6794
[i915#6868]: https://gitlab.freedesktop.org/drm/intel/issues/6868
[i915#7392]: https://gitlab.freedesktop.org/drm/intel/issues/7392
[i915#7461]: https://gitlab.freedesktop.org/drm/intel/issues/7461
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932
[i915#8347]: https://gitlab.freedesktop.org/drm/intel/issues/8347
Build changes
-------------
* Linux: CI_DRM_13253 -> Patchwork_119086v1
CI-20190529: 20190529
CI_DRM_13253: b5faf562ea160e9dcd7f95b737753ce44134b266 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7322: 2dd77d6d827a308caae49ce3eba759c2bab394ed @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_119086v1: b5faf562ea160e9dcd7f95b737753ce44134b266 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
871c4e10f705 drm/i915: make device info a const pointer to rodata
c4ec2fa6b628 drm/i915: move display device and runtime info to struct intel_display
a77ead28e1eb drm/i915: fix display info usage
2f04d344b415 drm/i915: separate display info printing from the rest
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/index.html
[-- Attachment #2: Type: text/html, Size: 6153 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] [PATCH 1/4] drm/i915: separate display info printing from the rest
2023-06-08 15:09 ` [Intel-gfx] [PATCH 1/4] drm/i915: separate display info printing from the rest Jani Nikula
@ 2023-06-08 21:52 ` Matt Roper
0 siblings, 0 replies; 13+ messages in thread
From: Matt Roper @ 2023-06-08 21:52 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Lucas De Marchi
On Thu, Jun 08, 2023 at 06:09:02PM +0300, Jani Nikula wrote:
> Add new function intel_display_device_info_print() and print the display
> device info there instead of intel_device_info_print(). This also fixes
> the display runtime info printing to use the actual runtime info instead
> of the static defaults.
>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> ---
> .../drm/i915/display/intel_display_device.c | 21 +++++++++++++++++++
> .../drm/i915/display/intel_display_device.h | 5 +++++
> drivers/gpu/drm/i915/i915_debugfs.c | 1 +
> drivers/gpu/drm/i915/i915_driver.c | 2 ++
> drivers/gpu/drm/i915/i915_gpu_error.c | 6 ++++++
> drivers/gpu/drm/i915/i915_gpu_error.h | 3 +++
> drivers/gpu/drm/i915/intel_device_info.c | 20 ------------------
> 7 files changed, 38 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
> index 3fd30e7f0062..60cfe52c0bb7 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.c
> @@ -915,3 +915,24 @@ void intel_display_device_info_runtime_init(struct drm_i915_private *i915)
> display_fused_off:
> memset(display_runtime, 0, sizeof(*display_runtime));
> }
> +
> +void intel_display_device_info_print(const struct intel_display_device_info *info,
> + const struct intel_display_runtime_info *runtime,
> + struct drm_printer *p)
> +{
> + if (runtime->ip.rel)
> + drm_printf(p, "display version: %u.%02u\n",
> + runtime->ip.ver,
> + runtime->ip.rel);
> + else
> + drm_printf(p, "display version: %u\n",
> + runtime->ip.ver);
> +
> +#define PRINT_FLAG(name) drm_printf(p, "%s: %s\n", #name, str_yes_no(info->name))
> + DEV_INFO_DISPLAY_FOR_EACH_FLAG(PRINT_FLAG);
> +#undef PRINT_FLAG
> +
> + drm_printf(p, "has_hdcp: %s\n", str_yes_no(runtime->has_hdcp));
> + drm_printf(p, "has_dmc: %s\n", str_yes_no(runtime->has_dmc));
> + drm_printf(p, "has_dsc: %s\n", str_yes_no(runtime->has_dsc));
> +}
> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h
> index 706ff2aa1f55..d137e62666e0 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.h
> @@ -11,6 +11,7 @@
> #include "intel_display_limits.h"
>
> struct drm_i915_private;
> +struct drm_printer;
>
> #define DEV_INFO_DISPLAY_FOR_EACH_FLAG(func) \
> /* Keep in alphabetical order */ \
> @@ -126,4 +127,8 @@ intel_display_device_probe(struct drm_i915_private *i915, bool has_gmdid,
> u16 *ver, u16 *rel, u16 *step);
> void intel_display_device_info_runtime_init(struct drm_i915_private *i915);
>
> +void intel_display_device_info_print(const struct intel_display_device_info *info,
> + const struct intel_display_runtime_info *runtime,
> + struct drm_printer *p);
> +
> #endif
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 76ccd4e03e31..4de44cf1026d 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -67,6 +67,7 @@ static int i915_capabilities(struct seq_file *m, void *data)
> seq_printf(m, "pch: %d\n", INTEL_PCH_TYPE(i915));
>
> intel_device_info_print(INTEL_INFO(i915), RUNTIME_INFO(i915), &p);
> + intel_display_device_info_print(DISPLAY_INFO(i915), DISPLAY_RUNTIME_INFO(i915), &p);
> i915_print_iommu_status(i915, &p);
> intel_gt_info_print(&to_gt(i915)->info, &p);
> intel_driver_caps_print(&i915->caps, &p);
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index ace8534b6cc5..51a1fc2a6f58 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -698,6 +698,8 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv)
>
> intel_device_info_print(INTEL_INFO(dev_priv),
> RUNTIME_INFO(dev_priv), &p);
> + intel_display_device_info_print(DISPLAY_INFO(dev_priv),
> + DISPLAY_RUNTIME_INFO(dev_priv), &p);
> i915_print_iommu_status(dev_priv, &p);
> for_each_gt(gt, dev_priv, i)
> intel_gt_info_print(>->info, &p);
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index ec368e700235..f109656cb1cc 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -649,6 +649,8 @@ static void err_print_capabilities(struct drm_i915_error_state_buf *m,
> struct drm_printer p = i915_error_printer(m);
>
> intel_device_info_print(&error->device_info, &error->runtime_info, &p);
> + intel_display_device_info_print(&error->display_device_info,
> + &error->display_runtime_info, &p);
> intel_driver_caps_print(&error->driver_caps, &p);
> }
>
> @@ -1983,6 +1985,10 @@ static void capture_gen(struct i915_gpu_coredump *error)
> memcpy(&error->runtime_info,
> RUNTIME_INFO(i915),
> sizeof(error->runtime_info));
> + memcpy(&error->display_device_info, DISPLAY_INFO(i915),
> + sizeof(error->display_device_info));
> + memcpy(&error->display_runtime_info, DISPLAY_RUNTIME_INFO(i915),
> + sizeof(error->display_runtime_info));
> error->driver_caps = i915->caps;
> }
>
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h
> index a78c061ce26f..9f5971f5e980 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.h
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.h
> @@ -14,6 +14,7 @@
>
> #include <drm/drm_mm.h>
>
> +#include "display/intel_display_device.h"
> #include "gt/intel_engine.h"
> #include "gt/intel_gt_types.h"
> #include "gt/uc/intel_uc_fw.h"
> @@ -209,6 +210,8 @@ struct i915_gpu_coredump {
>
> struct intel_device_info device_info;
> struct intel_runtime_info runtime_info;
> + struct intel_display_device_info display_device_info;
> + struct intel_display_runtime_info display_runtime_info;
> struct intel_driver_caps driver_caps;
> struct i915_params params;
>
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index 6e49caf241a5..53d316804071 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -93,9 +93,6 @@ void intel_device_info_print(const struct intel_device_info *info,
> const struct intel_runtime_info *runtime,
> struct drm_printer *p)
> {
> - const struct intel_display_runtime_info *display_runtime =
> - &info->display->__runtime_defaults;
> -
> if (runtime->graphics.ip.rel)
> drm_printf(p, "graphics version: %u.%02u\n",
> runtime->graphics.ip.ver,
> @@ -112,14 +109,6 @@ void intel_device_info_print(const struct intel_device_info *info,
> drm_printf(p, "media version: %u\n",
> runtime->media.ip.ver);
>
> - if (display_runtime->ip.rel)
> - drm_printf(p, "display version: %u.%02u\n",
> - display_runtime->ip.ver,
> - display_runtime->ip.rel);
> - else
> - drm_printf(p, "display version: %u\n",
> - display_runtime->ip.ver);
> -
> drm_printf(p, "graphics stepping: %s\n", intel_step_name(runtime->step.graphics_step));
> drm_printf(p, "media stepping: %s\n", intel_step_name(runtime->step.media_step));
> drm_printf(p, "display stepping: %s\n", intel_step_name(runtime->step.display_step));
> @@ -138,15 +127,6 @@ void intel_device_info_print(const struct intel_device_info *info,
> #undef PRINT_FLAG
>
> drm_printf(p, "has_pooled_eu: %s\n", str_yes_no(runtime->has_pooled_eu));
> -
> -#define PRINT_FLAG(name) drm_printf(p, "%s: %s\n", #name, str_yes_no(info->display->name))
> - DEV_INFO_DISPLAY_FOR_EACH_FLAG(PRINT_FLAG);
> -#undef PRINT_FLAG
> -
> - drm_printf(p, "has_hdcp: %s\n", str_yes_no(display_runtime->has_hdcp));
> - drm_printf(p, "has_dmc: %s\n", str_yes_no(display_runtime->has_dmc));
> - drm_printf(p, "has_dsc: %s\n", str_yes_no(display_runtime->has_dsc));
> -
> drm_printf(p, "rawclk rate: %u kHz\n", runtime->rawclk_freq);
> }
>
> --
> 2.39.2
>
--
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] [PATCH 2/4] drm/i915: fix display info usage
2023-06-08 15:09 ` [Intel-gfx] [PATCH 2/4] drm/i915: fix display info usage Jani Nikula
@ 2023-06-08 21:53 ` Matt Roper
0 siblings, 0 replies; 13+ messages in thread
From: Matt Roper @ 2023-06-08 21:53 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Lucas De Marchi
On Thu, Jun 08, 2023 at 06:09:03PM +0300, Jani Nikula wrote:
> Prefer DISPLAY_INFO() over INTEL_INFO()->display.
>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index c744c021af23..1a987dc45c70 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -113,7 +113,7 @@ enum i9xx_plane_id {
>
> #define for_each_dbuf_slice(__dev_priv, __slice) \
> for ((__slice) = DBUF_S1; (__slice) < I915_MAX_DBUF_SLICES; (__slice)++) \
> - for_each_if(INTEL_INFO(__dev_priv)->display->dbuf.slice_mask & BIT(__slice))
> + for_each_if(DISPLAY_INFO(__dev_priv)->dbuf.slice_mask & BIT(__slice))
>
> #define for_each_dbuf_slice_in_mask(__dev_priv, __slice, __mask) \
> for_each_dbuf_slice((__dev_priv), (__slice)) \
> --
> 2.39.2
>
--
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] [PATCH 3/4] drm/i915: move display device and runtime info to struct intel_display
2023-06-08 15:09 ` [Intel-gfx] [PATCH 3/4] drm/i915: move display device and runtime info to struct intel_display Jani Nikula
@ 2023-06-08 22:04 ` Matt Roper
0 siblings, 0 replies; 13+ messages in thread
From: Matt Roper @ 2023-06-08 22:04 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Lucas De Marchi
On Thu, Jun 08, 2023 at 06:09:04PM +0300, Jani Nikula wrote:
> Continue moving all things display further into display files and
> structures.
>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display_core.h | 9 +++++++++
> drivers/gpu/drm/i915/i915_drv.h | 5 ++---
> drivers/gpu/drm/i915/intel_device_info.c | 7 +++----
> drivers/gpu/drm/i915/intel_device_info.h | 4 ----
> 4 files changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
> index 8d2243c71dd8..a65ed8a52ce4 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_core.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_core.h
> @@ -19,6 +19,7 @@
> #include "intel_cdclk.h"
> #include "intel_display_limits.h"
> #include "intel_display_power.h"
> +#include "intel_display_device.h"
Minor nitpick: the includes aren't sorted here.
Otherwise,
Acked-by: Matt Roper <matthew.d.roper@intel.com>
> #include "intel_dpll_mgr.h"
> #include "intel_fbc.h"
> #include "intel_global_state.h"
> @@ -429,6 +430,14 @@ struct intel_display {
> u32 state;
> } hti;
>
> + struct {
> + /* Access with DISPLAY_INFO() */
> + const struct intel_display_device_info *__device_info;
> +
> + /* Access with DISPLAY_RUNTIME_INFO() */
> + struct intel_display_runtime_info __runtime_info;
> + } info;
> +
> struct {
> bool false_color;
> } ips;
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index b457a37e67c4..2d8331d435f1 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -205,7 +205,6 @@ struct drm_i915_private {
>
> const struct intel_device_info __info; /* Use INTEL_INFO() to access. */
> struct intel_runtime_info __runtime; /* Use RUNTIME_INFO() to access. */
> - struct intel_display_runtime_info __display_runtime; /* Access with DISPLAY_RUNTIME_INFO() */
> struct intel_driver_caps caps;
>
> struct i915_dsm dsm;
> @@ -407,9 +406,9 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915)
> (engine__) = rb_to_uabi_engine(rb_next(&(engine__)->uabi_node)))
>
> #define INTEL_INFO(i915) (&(i915)->__info)
> -#define DISPLAY_INFO(i915) (INTEL_INFO(i915)->display)
> #define RUNTIME_INFO(i915) (&(i915)->__runtime)
> -#define DISPLAY_RUNTIME_INFO(i915) (&(i915)->__display_runtime)
> +#define DISPLAY_INFO(i915) ((i915)->display.info.__device_info)
> +#define DISPLAY_RUNTIME_INFO(i915) (&(i915)->display.info.__runtime_info)
> #define DRIVER_CAPS(i915) (&(i915)->caps)
>
> #define INTEL_DEVID(i915) (RUNTIME_INFO(i915)->device_id)
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index 53d316804071..d51bbdbe53ab 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -387,7 +387,6 @@ static const struct intel_display_device_info no_display = {};
> */
> void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
> {
> - struct intel_device_info *info = mkwrite_device_info(dev_priv);
> struct intel_runtime_info *runtime = RUNTIME_INFO(dev_priv);
>
> if (HAS_DISPLAY(dev_priv))
> @@ -397,7 +396,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
> if (!HAS_DISPLAY(dev_priv)) {
> dev_priv->drm.driver_features &= ~(DRIVER_MODESET |
> DRIVER_ATOMIC);
> - info->display = &no_display;
> + dev_priv->display.info.__device_info = &no_display;
> }
>
> /* Disable nuclear pageflip by default on pre-g4x */
> @@ -440,8 +439,8 @@ void intel_device_info_driver_create(struct drm_i915_private *i915,
> memcpy(runtime, &INTEL_INFO(i915)->__runtime, sizeof(*runtime));
>
> /* Probe display support */
> - info->display = intel_display_device_probe(i915, info->has_gmd_id,
> - &ver, &rel, &step);
> + i915->display.info.__device_info = intel_display_device_probe(i915, info->has_gmd_id,
> + &ver, &rel, &step);
> memcpy(DISPLAY_RUNTIME_INFO(i915),
> &DISPLAY_INFO(i915)->__runtime_defaults,
> sizeof(*DISPLAY_RUNTIME_INFO(i915)));
> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
> index 069291b3bd37..c8b4bee5e592 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.h
> +++ b/drivers/gpu/drm/i915/intel_device_info.h
> @@ -29,8 +29,6 @@
>
> #include "intel_step.h"
>
> -#include "display/intel_display_device.h"
> -
> #include "gt/intel_engine_types.h"
> #include "gt/intel_context_types.h"
> #include "gt/intel_sseu.h"
> @@ -241,8 +239,6 @@ struct intel_device_info {
> DEV_INFO_FOR_EACH_FLAG(DEFINE_FLAG);
> #undef DEFINE_FLAG
>
> - const struct intel_display_device_info *display;
> -
> /*
> * Initial runtime info. Do not access outside of i915_driver_create().
> */
> --
> 2.39.2
>
--
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] [PATCH 4/4] drm/i915: make device info a const pointer to rodata
2023-06-08 15:09 ` [Intel-gfx] [PATCH 4/4] drm/i915: make device info a const pointer to rodata Jani Nikula
@ 2023-06-08 22:09 ` Matt Roper
0 siblings, 0 replies; 13+ messages in thread
From: Matt Roper @ 2023-06-08 22:09 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Lucas De Marchi
On Thu, Jun 08, 2023 at 06:09:05PM +0300, Jani Nikula wrote:
> Finally we can get rid of the pseudo-const write-once device info, and
> convert it into a const pointer to device info in rodata.
>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 4 ++--
> drivers/gpu/drm/i915/intel_device_info.c | 17 ++++-------------
> 2 files changed, 6 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 2d8331d435f1..788438b19e65 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -203,7 +203,7 @@ struct drm_i915_private {
> /* i915 device parameters */
> struct i915_params params;
>
> - const struct intel_device_info __info; /* Use INTEL_INFO() to access. */
> + const struct intel_device_info *__info; /* Use INTEL_INFO() to access. */
> struct intel_runtime_info __runtime; /* Use RUNTIME_INFO() to access. */
> struct intel_driver_caps caps;
>
> @@ -405,7 +405,7 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915)
> (engine__) && (engine__)->uabi_class == (class__); \
> (engine__) = rb_to_uabi_engine(rb_next(&(engine__)->uabi_node)))
>
> -#define INTEL_INFO(i915) (&(i915)->__info)
> +#define INTEL_INFO(i915) ((i915)->__info)
> #define RUNTIME_INFO(i915) (&(i915)->__runtime)
> #define DISPLAY_INFO(i915) ((i915)->display.info.__device_info)
> #define DISPLAY_RUNTIME_INFO(i915) (&(i915)->display.info.__runtime_info)
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index d51bbdbe53ab..0ef001d22ab2 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -360,13 +360,6 @@ void intel_device_info_runtime_init_early(struct drm_i915_private *i915)
> intel_device_info_subplatform_init(i915);
> }
>
> -/* FIXME: Remove this, and make device info a const pointer to rodata. */
> -static struct intel_device_info *
> -mkwrite_device_info(struct drm_i915_private *i915)
> -{
> - return (struct intel_device_info *)INTEL_INFO(i915);
> -}
> -
> static const struct intel_display_device_info no_display = {};
>
> /**
> @@ -426,26 +419,24 @@ void intel_device_info_driver_create(struct drm_i915_private *i915,
> u16 device_id,
> const struct intel_device_info *match_info)
> {
> - struct intel_device_info *info;
> struct intel_runtime_info *runtime;
> u16 ver, rel, step;
>
> - /* Setup the write-once "constant" device info */
> - info = mkwrite_device_info(i915);
> - memcpy(info, match_info, sizeof(*info));
> + /* Setup INTEL_INFO() */
> + i915->__info = match_info;
>
> /* Initialize initial runtime info from static const data and pdev. */
> runtime = RUNTIME_INFO(i915);
> memcpy(runtime, &INTEL_INFO(i915)->__runtime, sizeof(*runtime));
>
> /* Probe display support */
> - i915->display.info.__device_info = intel_display_device_probe(i915, info->has_gmd_id,
> + i915->display.info.__device_info = intel_display_device_probe(i915, HAS_GMD_ID(i915),
> &ver, &rel, &step);
> memcpy(DISPLAY_RUNTIME_INFO(i915),
> &DISPLAY_INFO(i915)->__runtime_defaults,
> sizeof(*DISPLAY_RUNTIME_INFO(i915)));
>
> - if (info->has_gmd_id) {
> + if (HAS_GMD_ID(i915)) {
> DISPLAY_RUNTIME_INFO(i915)->ip.ver = ver;
> DISPLAY_RUNTIME_INFO(i915)->ip.rel = rel;
> DISPLAY_RUNTIME_INFO(i915)->ip.step = step;
> --
> 2.39.2
>
--
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915: further device info cleanups
2023-06-08 15:09 [Intel-gfx] [PATCH 0/4] drm/i915: further device info cleanups Jani Nikula
` (6 preceding siblings ...)
2023-06-08 19:14 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2023-06-10 2:35 ` Patchwork
7 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2023-06-10 2:35 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 14077 bytes --]
== Series Details ==
Series: drm/i915: further device info cleanups
URL : https://patchwork.freedesktop.org/series/119086/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_13253_full -> Patchwork_119086v1_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_119086v1_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_119086v1_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Participating hosts (7 -> 7)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_119086v1_full:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@mock@timelines:
- shard-apl: [PASS][1] -> [ABORT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-apl2/igt@i915_selftest@mock@timelines.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-apl2/igt@i915_selftest@mock@timelines.html
- shard-snb: [PASS][3] -> [ABORT][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-snb4/igt@i915_selftest@mock@timelines.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-snb4/igt@i915_selftest@mock@timelines.html
- shard-glk: [PASS][5] -> [ABORT][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-glk4/igt@i915_selftest@mock@timelines.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-glk2/igt@i915_selftest@mock@timelines.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@i915_selftest@mock@timelines:
- {shard-rkl}: [PASS][7] -> [ABORT][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-rkl-1/igt@i915_selftest@mock@timelines.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-rkl-4/igt@i915_selftest@mock@timelines.html
- {shard-dg1}: [PASS][9] -> [ABORT][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-dg1-15/igt@i915_selftest@mock@timelines.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-dg1-19/igt@i915_selftest@mock@timelines.html
- {shard-tglu}: [PASS][11] -> [ABORT][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-tglu-7/igt@i915_selftest@mock@timelines.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-tglu-10/igt@i915_selftest@mock@timelines.html
Known issues
------------
Here are the changes found in Patchwork_119086v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_lmem_swapping@heavy-multi:
- shard-apl: NOTRUN -> [SKIP][13] ([fdo#109271] / [i915#4613])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-apl6/igt@gem_lmem_swapping@heavy-multi.html
* igt@gen9_exec_parse@allowed-single:
- shard-glk: [PASS][14] -> [ABORT][15] ([i915#5566])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-glk1/igt@gen9_exec_parse@allowed-single.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-glk9/igt@gen9_exec_parse@allowed-single.html
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp:
- shard-apl: NOTRUN -> [SKIP][16] ([fdo#109271] / [i915#1937] / [i915#4579])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-apl6/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-glk: [PASS][17] -> [FAIL][18] ([i915#2346])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-glk5/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-glk7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
* igt@kms_flip_scaled_crc@flip-32bpp-xtile-to-64bpp-xtile-downscaling@pipe-a-valid-mode:
- shard-apl: NOTRUN -> [SKIP][19] ([fdo#109271] / [i915#4579]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-apl6/igt@kms_flip_scaled_crc@flip-32bpp-xtile-to-64bpp-xtile-downscaling@pipe-a-valid-mode.html
* igt@kms_frontbuffer_tracking@psr-2p-scndscrn-pri-shrfb-draw-mmap-cpu:
- shard-apl: NOTRUN -> [SKIP][20] ([fdo#109271]) +17 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-apl6/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-pri-shrfb-draw-mmap-cpu.html
* igt@kms_plane@pixel-format-source-clamping@pipe-a-planes:
- shard-glk: [PASS][21] -> [DMESG-FAIL][22] ([i915#118])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-glk4/igt@kms_plane@pixel-format-source-clamping@pipe-a-planes.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-glk1/igt@kms_plane@pixel-format-source-clamping@pipe-a-planes.html
* igt@kms_plane_scaling@plane-downscale-with-pixel-format-factor-0-5@pipe-b-hdmi-a-1:
- shard-snb: NOTRUN -> [SKIP][23] ([fdo#109271] / [i915#4579]) +9 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-snb1/igt@kms_plane_scaling@plane-downscale-with-pixel-format-factor-0-5@pipe-b-hdmi-a-1.html
* igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-rotation@pipe-a-vga-1:
- shard-snb: NOTRUN -> [SKIP][24] ([fdo#109271]) +16 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-snb6/igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-rotation@pipe-a-vga-1.html
* igt@kms_setmode@basic@pipe-a-hdmi-a-1:
- shard-snb: NOTRUN -> [FAIL][25] ([i915#5465]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-snb1/igt@kms_setmode@basic@pipe-a-hdmi-a-1.html
#### Possible fixes ####
* igt@gem_ctx_exec@basic-nohangcheck:
- {shard-rkl}: [FAIL][26] ([i915#6268]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-rkl-7/igt@gem_ctx_exec@basic-nohangcheck.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-rkl-7/igt@gem_ctx_exec@basic-nohangcheck.html
* igt@gem_exec_fair@basic-none@vecs0:
- {shard-rkl}: [FAIL][28] ([i915#2842]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-rkl-6/igt@gem_exec_fair@basic-none@vecs0.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-rkl-7/igt@gem_exec_fair@basic-none@vecs0.html
* igt@gem_spin_batch@spin-each:
- shard-apl: [FAIL][30] ([i915#2898]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-apl2/igt@gem_spin_batch@spin-each.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-apl6/igt@gem_spin_batch@spin-each.html
* igt@i915_suspend@basic-s3-without-i915:
- {shard-rkl}: [FAIL][32] ([fdo#103375]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-rkl-3/igt@i915_suspend@basic-s3-without-i915.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-rkl-7/igt@i915_suspend@basic-s3-without-i915.html
* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip:
- {shard-tglu}: [FAIL][34] ([i915#3743]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-tglu-9/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-tglu-3/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip.html
* igt@kms_cursor_crc@cursor-suspend@pipe-c-dp-1:
- shard-apl: [ABORT][36] ([i915#180]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-apl6/igt@kms_cursor_crc@cursor-suspend@pipe-c-dp-1.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-apl6/igt@kms_cursor_crc@cursor-suspend@pipe-c-dp-1.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-apl: [FAIL][38] ([i915#2346]) -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-apl1/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-apl2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
* igt@kms_cursor_legacy@forked-bo@pipe-b:
- {shard-rkl}: [INCOMPLETE][40] ([i915#8011]) -> [PASS][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-rkl-7/igt@kms_cursor_legacy@forked-bo@pipe-b.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-rkl-2/igt@kms_cursor_legacy@forked-bo@pipe-b.html
* igt@kms_fbcon_fbt@fbc-suspend:
- {shard-tglu}: [FAIL][42] ([i915#4767]) -> [PASS][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-tglu-10/igt@kms_fbcon_fbt@fbc-suspend.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-tglu-5/igt@kms_fbcon_fbt@fbc-suspend.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1:
- shard-apl: [FAIL][44] ([i915#79]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-apl1/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-apl3/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1.html
#### Warnings ####
* igt@kms_vrr@flip-suspend:
- shard-snb: [SKIP][46] ([fdo#109271] / [i915#4579]) -> [SKIP][47] ([fdo#109271])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13253/shard-snb5/igt@kms_vrr@flip-suspend.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/shard-snb5/igt@kms_vrr@flip-suspend.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109300]: https://bugs.freedesktop.org/show_bug.cgi?id=109300
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2876]: https://gitlab.freedesktop.org/drm/intel/issues/2876
[i915#2898]: https://gitlab.freedesktop.org/drm/intel/issues/2898
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3743]: https://gitlab.freedesktop.org/drm/intel/issues/3743
[i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767
[i915#4816]: https://gitlab.freedesktop.org/drm/intel/issues/4816
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5465]: https://gitlab.freedesktop.org/drm/intel/issues/5465
[i915#5493]: https://gitlab.freedesktop.org/drm/intel/issues/5493
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#7975]: https://gitlab.freedesktop.org/drm/intel/issues/7975
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8213]: https://gitlab.freedesktop.org/drm/intel/issues/8213
[i915#8247]: https://gitlab.freedesktop.org/drm/intel/issues/8247
[i915#8292]: https://gitlab.freedesktop.org/drm/intel/issues/8292
[i915#8502]: https://gitlab.freedesktop.org/drm/intel/issues/8502
Build changes
-------------
* Linux: CI_DRM_13253 -> Patchwork_119086v1
CI-20190529: 20190529
CI_DRM_13253: b5faf562ea160e9dcd7f95b737753ce44134b266 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7322: 2dd77d6d827a308caae49ce3eba759c2bab394ed @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_119086v1: b5faf562ea160e9dcd7f95b737753ce44134b266 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119086v1/index.html
[-- Attachment #2: Type: text/html, Size: 14250 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2023-06-10 2:35 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-08 15:09 [Intel-gfx] [PATCH 0/4] drm/i915: further device info cleanups Jani Nikula
2023-06-08 15:09 ` [Intel-gfx] [PATCH 1/4] drm/i915: separate display info printing from the rest Jani Nikula
2023-06-08 21:52 ` Matt Roper
2023-06-08 15:09 ` [Intel-gfx] [PATCH 2/4] drm/i915: fix display info usage Jani Nikula
2023-06-08 21:53 ` Matt Roper
2023-06-08 15:09 ` [Intel-gfx] [PATCH 3/4] drm/i915: move display device and runtime info to struct intel_display Jani Nikula
2023-06-08 22:04 ` Matt Roper
2023-06-08 15:09 ` [Intel-gfx] [PATCH 4/4] drm/i915: make device info a const pointer to rodata Jani Nikula
2023-06-08 22:09 ` Matt Roper
2023-06-08 19:11 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: further device info cleanups Patchwork
2023-06-08 19:11 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-06-08 19:14 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-06-10 2:35 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox