* [Intel-gfx] [PATCH 1/4] drm/i915/hti: abstract hti handling
@ 2022-11-09 14:42 Jani Nikula
2022-11-09 14:42 ` [Intel-gfx] [PATCH 2/4] drm/i915/display: move hti under display sub-struct Jani Nikula
` (7 more replies)
0 siblings, 8 replies; 10+ messages in thread
From: Jani Nikula @ 2022-11-09 14:42 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
The HTI or HDPORT handling is sprinkled around. Centralize to one place.
Add a note about how subtle the mapping from HDPORT_STATE register to
dpll mask actually is.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/display/intel_ddi.c | 9 +----
drivers/gpu/drm/i915/display/intel_display.c | 8 +---
drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 11 +-----
drivers/gpu/drm/i915/display/intel_hti.c | 39 +++++++++++++++++++
drivers/gpu/drm/i915/display/intel_hti.h | 18 +++++++++
drivers/gpu/drm/i915/display/intel_hti_regs.h | 16 ++++++++
drivers/gpu/drm/i915/i915_reg.h | 5 ---
8 files changed, 80 insertions(+), 27 deletions(-)
create mode 100644 drivers/gpu/drm/i915/display/intel_hti.c
create mode 100644 drivers/gpu/drm/i915/display/intel_hti.h
create mode 100644 drivers/gpu/drm/i915/display/intel_hti_regs.h
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 51704b54317c..cb8232bd315b 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -247,6 +247,7 @@ i915-y += \
display/intel_global_state.o \
display/intel_hdcp.o \
display/intel_hotplug.o \
+ display/intel_hti.o \
display/intel_lpe_audio.o \
display/intel_modeset_verify.o \
display/intel_modeset_setup.o \
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index e95bde5cf060..5be9573bf65c 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -56,6 +56,7 @@
#include "intel_hdcp.h"
#include "intel_hdmi.h"
#include "intel_hotplug.h"
+#include "intel_hti.h"
#include "intel_lspcon.h"
#include "intel_mg_phy_regs.h"
#include "intel_pps.h"
@@ -4113,12 +4114,6 @@ intel_ddi_max_lanes(struct intel_digital_port *dig_port)
return max_lanes;
}
-static bool hti_uses_phy(struct drm_i915_private *i915, enum phy phy)
-{
- return i915->hti_state & HDPORT_ENABLED &&
- i915->hti_state & HDPORT_DDI_USED(phy);
-}
-
static enum hpd_pin xelpd_hpd_pin(struct drm_i915_private *dev_priv,
enum port port)
{
@@ -4247,7 +4242,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
* driver. In that case we should skip initializing the corresponding
* outputs.
*/
- if (hti_uses_phy(dev_priv, phy)) {
+ if (intel_hti_uses_phy(dev_priv, phy)) {
drm_dbg_kms(&dev_priv->drm, "PORT %c / PHY %c reserved by HTI\n",
port_name(port), phy_name(phy));
return;
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 0d3353c403af..90219e7abc7c 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -100,6 +100,7 @@
#include "intel_frontbuffer.h"
#include "intel_hdcp.h"
#include "intel_hotplug.h"
+#include "intel_hti.h"
#include "intel_modeset_verify.h"
#include "intel_modeset_setup.h"
#include "intel_overlay.h"
@@ -8735,12 +8736,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915)
if (i915->display.cdclk.max_cdclk_freq == 0)
intel_update_max_cdclk(i915);
- /*
- * If the platform has HTI, we need to find out whether it has reserved
- * any display resources before we create our display outputs.
- */
- if (INTEL_INFO(i915)->display.has_hti)
- i915->hti_state = intel_de_read(i915, HDPORT_STATE);
+ intel_hti_init(i915);
/* Just disable it once at startup */
intel_vga_disable(i915);
diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index 7c6c094a0a01..28f7dcb170c7 100644
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
@@ -30,6 +30,7 @@
#include "intel_dpio_phy.h"
#include "intel_dpll.h"
#include "intel_dpll_mgr.h"
+#include "intel_hti.h"
#include "intel_mg_phy_regs.h"
#include "intel_pch_refclk.h"
#include "intel_tc.h"
@@ -3163,14 +3164,6 @@ static void icl_update_active_dpll(struct intel_atomic_state *state,
icl_set_active_port_dpll(crtc_state, port_dpll_id);
}
-static u32 intel_get_hti_plls(struct drm_i915_private *i915)
-{
- if (!(i915->hti_state & HDPORT_ENABLED))
- return 0;
-
- return REG_FIELD_GET(HDPORT_DPLL_USED_MASK, i915->hti_state);
-}
-
static int icl_compute_combo_phy_dpll(struct intel_atomic_state *state,
struct intel_crtc *crtc)
{
@@ -3245,7 +3238,7 @@ static int icl_get_combo_phy_dpll(struct intel_atomic_state *state,
}
/* Eliminate DPLLs from consideration if reserved by HTI */
- dpll_mask &= ~intel_get_hti_plls(dev_priv);
+ dpll_mask &= ~intel_hti_dpll_mask(dev_priv);
port_dpll->pll = intel_find_shared_dpll(state, crtc,
&port_dpll->hw_state,
diff --git a/drivers/gpu/drm/i915/display/intel_hti.c b/drivers/gpu/drm/i915/display/intel_hti.c
new file mode 100644
index 000000000000..e2b09e96f9a9
--- /dev/null
+++ b/drivers/gpu/drm/i915/display/intel_hti.c
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#include "i915_drv.h"
+#include "intel_de.h"
+#include "intel_display.h"
+#include "intel_hti.h"
+#include "intel_hti_regs.h"
+
+void intel_hti_init(struct drm_i915_private *i915)
+{
+ /*
+ * If the platform has HTI, we need to find out whether it has reserved
+ * any display resources before we create our display outputs.
+ */
+ if (INTEL_INFO(i915)->display.has_hti)
+ i915->hti_state = intel_de_read(i915, HDPORT_STATE);
+}
+
+bool intel_hti_uses_phy(struct drm_i915_private *i915, enum phy phy)
+{
+ return i915->hti_state & HDPORT_ENABLED &&
+ i915->hti_state & HDPORT_DDI_USED(phy);
+}
+
+u32 intel_hti_dpll_mask(struct drm_i915_private *i915)
+{
+ if (!(i915->hti_state & HDPORT_ENABLED))
+ return 0;
+
+ /*
+ * Note: This is subtle. The values must coincide with what's defined
+ * for the platform.
+ */
+ return REG_FIELD_GET(HDPORT_DPLL_USED_MASK, i915->hti_state);
+}
+
diff --git a/drivers/gpu/drm/i915/display/intel_hti.h b/drivers/gpu/drm/i915/display/intel_hti.h
new file mode 100644
index 000000000000..2893d6668657
--- /dev/null
+++ b/drivers/gpu/drm/i915/display/intel_hti.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef __INTEL_HTI_H__
+#define __INTEL_HTI_H__
+
+#include <linux/types.h>
+
+struct drm_i915_private;
+enum phy;
+
+void intel_hti_init(struct drm_i915_private *i915);
+bool intel_hti_uses_phy(struct drm_i915_private *i915, enum phy phy);
+u32 intel_hti_dpll_mask(struct drm_i915_private *i915);
+
+#endif /* __INTEL_HTI_H__ */
diff --git a/drivers/gpu/drm/i915/display/intel_hti_regs.h b/drivers/gpu/drm/i915/display/intel_hti_regs.h
new file mode 100644
index 000000000000..e206f2837fc8
--- /dev/null
+++ b/drivers/gpu/drm/i915/display/intel_hti_regs.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef __INTEL_HTI_REGS_H__
+#define __INTEL_HTI_REGS_H__
+
+#include "i915_reg_defs.h"
+
+#define HDPORT_STATE _MMIO(0x45050)
+#define HDPORT_DPLL_USED_MASK REG_GENMASK(15, 12)
+#define HDPORT_DDI_USED(phy) REG_BIT(2 * (phy) + 1)
+#define HDPORT_ENABLED REG_BIT(0)
+
+#endif /* __INTEL_HTI_REGS_H__ */
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index a37ed0c61f20..fd60d335d9cb 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -1148,11 +1148,6 @@
#define MBUS_JOIN_PIPE_SELECT(pipe) REG_FIELD_PREP(MBUS_JOIN_PIPE_SELECT_MASK, pipe)
#define MBUS_JOIN_PIPE_SELECT_NONE MBUS_JOIN_PIPE_SELECT(7)
-#define HDPORT_STATE _MMIO(0x45050)
-#define HDPORT_DPLL_USED_MASK REG_GENMASK(15, 12)
-#define HDPORT_DDI_USED(phy) REG_BIT(2 * (phy) + 1)
-#define HDPORT_ENABLED REG_BIT(0)
-
/* Make render/texture TLB fetches lower priorty than associated data
* fetches. This is not turned on by default
*/
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-gfx] [PATCH 2/4] drm/i915/display: move hti under display sub-struct
2022-11-09 14:42 [Intel-gfx] [PATCH 1/4] drm/i915/hti: abstract hti handling Jani Nikula
@ 2022-11-09 14:42 ` Jani Nikula
2022-11-09 14:42 ` [Intel-gfx] [PATCH 3/4] drm/i915/display: move global_obj_list " Jani Nikula
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Jani Nikula @ 2022-11-09 14:42 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Move display hti/hdport related members under drm_i915_private display
sub-struct.
Prefer adding anonymous sub-structs even for single members that aren't
our own structs.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_display_core.h | 10 ++++++++++
drivers/gpu/drm/i915/display/intel_hti.c | 10 +++++-----
drivers/gpu/drm/i915/i915_drv.h | 8 --------
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 337d8e08ba43..d851d401211f 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -370,6 +370,16 @@ struct intel_display {
struct mutex comp_mutex;
} hdcp;
+ struct {
+ /*
+ * HTI (aka HDPORT) state read during initial hw readout. Most
+ * platforms don't have HTI, so this will just stay 0. Those
+ * that do will use this later to figure out which PLLs and PHYs
+ * are unavailable for driver usage.
+ */
+ u32 state;
+ } hti;
+
struct {
struct i915_power_domains domains;
diff --git a/drivers/gpu/drm/i915/display/intel_hti.c b/drivers/gpu/drm/i915/display/intel_hti.c
index e2b09e96f9a9..7d48f5646274 100644
--- a/drivers/gpu/drm/i915/display/intel_hti.c
+++ b/drivers/gpu/drm/i915/display/intel_hti.c
@@ -16,24 +16,24 @@ void intel_hti_init(struct drm_i915_private *i915)
* any display resources before we create our display outputs.
*/
if (INTEL_INFO(i915)->display.has_hti)
- i915->hti_state = intel_de_read(i915, HDPORT_STATE);
+ i915->display.hti.state = intel_de_read(i915, HDPORT_STATE);
}
bool intel_hti_uses_phy(struct drm_i915_private *i915, enum phy phy)
{
- return i915->hti_state & HDPORT_ENABLED &&
- i915->hti_state & HDPORT_DDI_USED(phy);
+ return i915->display.hti.state & HDPORT_ENABLED &&
+ i915->display.hti.state & HDPORT_DDI_USED(phy);
}
u32 intel_hti_dpll_mask(struct drm_i915_private *i915)
{
- if (!(i915->hti_state & HDPORT_ENABLED))
+ if (!(i915->display.hti.state & HDPORT_ENABLED))
return 0;
/*
* Note: This is subtle. The values must coincide with what's defined
* for the platform.
*/
- return REG_FIELD_GET(HDPORT_DPLL_USED_MASK, i915->hti_state);
+ return REG_FIELD_GET(HDPORT_DPLL_USED_MASK, i915->display.hti.state);
}
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 05b3300cc4ed..bb88aee2af25 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -300,14 +300,6 @@ struct drm_i915_private {
struct intel_l3_parity l3_parity;
- /*
- * HTI (aka HDPORT) state read during initial hw readout. Most
- * platforms don't have HTI, so this will just stay 0. Those that do
- * will use this later to figure out which PLLs and PHYs are unavailable
- * for driver usage.
- */
- u32 hti_state;
-
/*
* edram size in MB.
* Cannot be determined by PCIID. You must always read a register.
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-gfx] [PATCH 3/4] drm/i915/display: move global_obj_list under display sub-struct
2022-11-09 14:42 [Intel-gfx] [PATCH 1/4] drm/i915/hti: abstract hti handling Jani Nikula
2022-11-09 14:42 ` [Intel-gfx] [PATCH 2/4] drm/i915/display: move hti under display sub-struct Jani Nikula
@ 2022-11-09 14:42 ` Jani Nikula
2022-11-09 14:42 ` [Intel-gfx] [PATCH 4/4] drm/i915/display: move restore state and ctx " Jani Nikula
` (5 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Jani Nikula @ 2022-11-09 14:42 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Move display global state member under drm_i915_private display
sub-struct.
Prefer adding anonymous sub-structs even for single members that aren't
our own structs.
Remove a nearby stale comment while at it.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 2 +-
drivers/gpu/drm/i915/display/intel_display_core.h | 4 ++++
drivers/gpu/drm/i915/display/intel_global_state.c | 4 ++--
drivers/gpu/drm/i915/display/intel_global_state.h | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 4 ----
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 90219e7abc7c..63f25d6bf0bf 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -8571,7 +8571,7 @@ static void intel_mode_config_init(struct drm_i915_private *i915)
struct drm_mode_config *mode_config = &i915->drm.mode_config;
drm_mode_config_init(&i915->drm);
- INIT_LIST_HEAD(&i915->global_obj_list);
+ INIT_LIST_HEAD(&i915->display.global.obj_list);
mode_config->min_width = 0;
mode_config->min_height = 0;
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index d851d401211f..7eb705a0fa19 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -344,6 +344,10 @@ struct intel_display {
u32 rx_config;
} fdi;
+ struct {
+ struct list_head obj_list;
+ } global;
+
struct {
/*
* Base address of where the gmbus and gpio blocks are located
diff --git a/drivers/gpu/drm/i915/display/intel_global_state.c b/drivers/gpu/drm/i915/display/intel_global_state.c
index 7a19215ad844..02b593b1e2ea 100644
--- a/drivers/gpu/drm/i915/display/intel_global_state.c
+++ b/drivers/gpu/drm/i915/display/intel_global_state.c
@@ -45,14 +45,14 @@ void intel_atomic_global_obj_init(struct drm_i915_private *dev_priv,
obj->state = state;
obj->funcs = funcs;
- list_add_tail(&obj->head, &dev_priv->global_obj_list);
+ list_add_tail(&obj->head, &dev_priv->display.global.obj_list);
}
void intel_atomic_global_obj_cleanup(struct drm_i915_private *dev_priv)
{
struct intel_global_obj *obj, *next;
- list_for_each_entry_safe(obj, next, &dev_priv->global_obj_list, head) {
+ list_for_each_entry_safe(obj, next, &dev_priv->display.global.obj_list, head) {
list_del(&obj->head);
drm_WARN_ON(&dev_priv->drm, kref_read(&obj->state->ref) != 1);
diff --git a/drivers/gpu/drm/i915/display/intel_global_state.h b/drivers/gpu/drm/i915/display/intel_global_state.h
index 1f16fa3073c9..f01ee0bb3e5a 100644
--- a/drivers/gpu/drm/i915/display/intel_global_state.h
+++ b/drivers/gpu/drm/i915/display/intel_global_state.h
@@ -27,7 +27,7 @@ struct intel_global_obj {
};
#define intel_for_each_global_obj(obj, dev_priv) \
- list_for_each_entry(obj, &(dev_priv)->global_obj_list, head)
+ list_for_each_entry(obj, &(dev_priv)->display.global.obj_list, head)
#define for_each_new_global_obj_in_state(__state, obj, new_obj_state, __i) \
for ((__i) = 0; \
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index bb88aee2af25..fdf330a29ec0 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -292,10 +292,6 @@ struct drm_i915_private {
struct i915_gem_mm mm;
- /* Kernel Modesetting */
-
- struct list_head global_obj_list;
-
bool mchbar_need_disable;
struct intel_l3_parity l3_parity;
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-gfx] [PATCH 4/4] drm/i915/display: move restore state and ctx under display sub-struct
2022-11-09 14:42 [Intel-gfx] [PATCH 1/4] drm/i915/hti: abstract hti handling Jani Nikula
2022-11-09 14:42 ` [Intel-gfx] [PATCH 2/4] drm/i915/display: move hti under display sub-struct Jani Nikula
2022-11-09 14:42 ` [Intel-gfx] [PATCH 3/4] drm/i915/display: move global_obj_list " Jani Nikula
@ 2022-11-09 14:42 ` Jani Nikula
2022-11-10 17:01 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/4] drm/i915/hti: abstract hti handling Patchwork
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Jani Nikula @ 2022-11-09 14:42 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Move display suspend/resume and display reset modeset state and ctx
members under drm_i915_private display sub-struct.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 14 +++++++-------
drivers/gpu/drm/i915/display/intel_display_core.h | 7 +++++++
drivers/gpu/drm/i915/i915_drv.h | 3 ---
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 63f25d6bf0bf..c50bdcdc9081 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -890,7 +890,7 @@ static bool gpu_reset_clobbers_display(struct drm_i915_private *dev_priv)
void intel_display_prepare_reset(struct drm_i915_private *dev_priv)
{
- struct drm_modeset_acquire_ctx *ctx = &dev_priv->reset_ctx;
+ struct drm_modeset_acquire_ctx *ctx = &dev_priv->display.restore.reset_ctx;
struct drm_atomic_state *state;
int ret;
@@ -946,13 +946,13 @@ void intel_display_prepare_reset(struct drm_i915_private *dev_priv)
return;
}
- dev_priv->modeset_restore_state = state;
+ dev_priv->display.restore.modeset_state = state;
state->acquire_ctx = ctx;
}
void intel_display_finish_reset(struct drm_i915_private *i915)
{
- struct drm_modeset_acquire_ctx *ctx = &i915->reset_ctx;
+ struct drm_modeset_acquire_ctx *ctx = &i915->display.restore.reset_ctx;
struct drm_atomic_state *state;
int ret;
@@ -963,7 +963,7 @@ void intel_display_finish_reset(struct drm_i915_private *i915)
if (!test_bit(I915_RESET_MODESET, &to_gt(i915)->reset.flags))
return;
- state = fetch_and_zero(&i915->modeset_restore_state);
+ state = fetch_and_zero(&i915->display.restore.modeset_state);
if (!state)
goto unlock;
@@ -2443,7 +2443,7 @@ int intel_display_suspend(struct drm_device *dev)
drm_err(&dev_priv->drm, "Suspending crtc's failed with %i\n",
ret);
else
- dev_priv->modeset_restore_state = state;
+ dev_priv->display.restore.modeset_state = state;
return ret;
}
@@ -8899,14 +8899,14 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)
void intel_display_resume(struct drm_device *dev)
{
struct drm_i915_private *i915 = to_i915(dev);
- struct drm_atomic_state *state = i915->modeset_restore_state;
+ struct drm_atomic_state *state = i915->display.restore.modeset_state;
struct drm_modeset_acquire_ctx ctx;
int ret;
if (!HAS_DISPLAY(i915))
return;
- i915->modeset_restore_state = NULL;
+ i915->display.restore.modeset_state = NULL;
if (state)
state->acquire_ctx = &ctx;
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 7eb705a0fa19..57ddce3ba02b 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -14,6 +14,7 @@
#include <linux/workqueue.h>
#include <drm/drm_connector.h>
+#include <drm/drm_modeset_lock.h>
#include "intel_cdclk.h"
#include "intel_display.h"
@@ -410,6 +411,12 @@ struct intel_display {
unsigned long mask;
} quirks;
+ struct {
+ /* restore state for suspend/resume and display reset */
+ struct drm_atomic_state *modeset_state;
+ struct drm_modeset_acquire_ctx reset_ctx;
+ } restore;
+
struct {
enum {
I915_SAGV_UNKNOWN = 0,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index fdf330a29ec0..2f074d7e0d31 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -287,9 +287,6 @@ struct drm_i915_private {
unsigned long gem_quirks;
- struct drm_atomic_state *modeset_restore_state;
- struct drm_modeset_acquire_ctx reset_ctx;
-
struct i915_gem_mm mm;
bool mchbar_need_disable;
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/4] drm/i915/hti: abstract hti handling
2022-11-09 14:42 [Intel-gfx] [PATCH 1/4] drm/i915/hti: abstract hti handling Jani Nikula
` (2 preceding siblings ...)
2022-11-09 14:42 ` [Intel-gfx] [PATCH 4/4] drm/i915/display: move restore state and ctx " Jani Nikula
@ 2022-11-10 17:01 ` Patchwork
2022-11-10 17:01 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
` (3 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2022-11-10 17:01 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/4] drm/i915/hti: abstract hti handling
URL : https://patchwork.freedesktop.org/series/110712/
State : warning
== Summary ==
Error: dim checkpatch failed
47ca7795e29c drm/i915/hti: abstract hti handling
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
-:122: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#122:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 167 lines checked
5c512661e04a drm/i915/display: move hti under display sub-struct
640c83eb9b84 drm/i915/display: move global_obj_list under display sub-struct
d180e669cd58 drm/i915/display: move restore state and ctx under display sub-struct
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✗ Fi.CI.DOCS: warning for series starting with [1/4] drm/i915/hti: abstract hti handling
2022-11-09 14:42 [Intel-gfx] [PATCH 1/4] drm/i915/hti: abstract hti handling Jani Nikula
` (3 preceding siblings ...)
2022-11-10 17:01 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/4] drm/i915/hti: abstract hti handling Patchwork
@ 2022-11-10 17:01 ` Patchwork
2022-11-10 17:28 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2022-11-10 17:01 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/4] drm/i915/hti: abstract hti handling
URL : https://patchwork.freedesktop.org/series/110712/
State : warning
== Summary ==
Error: make htmldocs had i915 warnings
./drivers/gpu/drm/i915/i915_perf_types.h:319: warning: Function parameter or member 'lock' not described in 'i915_perf_stream'
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/4] drm/i915/hti: abstract hti handling
2022-11-09 14:42 [Intel-gfx] [PATCH 1/4] drm/i915/hti: abstract hti handling Jani Nikula
` (4 preceding siblings ...)
2022-11-10 17:01 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
@ 2022-11-10 17:28 ` Patchwork
2022-11-10 20:14 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-11-17 13:18 ` [Intel-gfx] [PATCH 1/4] " Ville Syrjälä
7 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2022-11-10 17:28 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 6831 bytes --]
== Series Details ==
Series: series starting with [1/4] drm/i915/hti: abstract hti handling
URL : https://patchwork.freedesktop.org/series/110712/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12365 -> Patchwork_110712v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/index.html
Participating hosts (41 -> 39)
------------------------------
Additional (1): fi-tgl-dsi
Missing (3): fi-ctg-p8600 fi-bdw-samus fi-pnv-d510
Known issues
------------
Here are the changes found in Patchwork_110712v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_lmem_swapping@basic:
- fi-apl-guc: NOTRUN -> [SKIP][1] ([fdo#109271] / [i915#4613]) +3 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/fi-apl-guc/igt@gem_lmem_swapping@basic.html
* igt@i915_selftest@live@gt_heartbeat:
- fi-bxt-dsi: [PASS][2] -> [DMESG-FAIL][3] ([i915#5334] / [i915#7433])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/fi-bxt-dsi/igt@i915_selftest@live@gt_heartbeat.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/fi-bxt-dsi/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [PASS][4] -> [INCOMPLETE][5] ([i915#4785])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/fi-hsw-4770/igt@i915_selftest@live@hangcheck.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/fi-hsw-4770/igt@i915_selftest@live@hangcheck.html
* igt@i915_selftest@live@migrate:
- bat-adlp-4: [PASS][6] -> [INCOMPLETE][7] ([i915#7308] / [i915#7348])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/bat-adlp-4/igt@i915_selftest@live@migrate.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/bat-adlp-4/igt@i915_selftest@live@migrate.html
* igt@kms_chamelium@hdmi-crc-fast:
- fi-apl-guc: NOTRUN -> [SKIP][8] ([fdo#109271] / [fdo#111827]) +8 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/fi-apl-guc/igt@kms_chamelium@hdmi-crc-fast.html
* igt@kms_psr@sprite_plane_onoff:
- fi-apl-guc: NOTRUN -> [SKIP][9] ([fdo#109271]) +11 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/fi-apl-guc/igt@kms_psr@sprite_plane_onoff.html
* igt@runner@aborted:
- bat-adlp-4: NOTRUN -> [FAIL][10] ([i915#4312])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/bat-adlp-4/igt@runner@aborted.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0@smem:
- {bat-rplp-1}: [DMESG-WARN][11] ([i915#2867]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/bat-rplp-1/igt@gem_exec_suspend@basic-s0@smem.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/bat-rplp-1/igt@gem_exec_suspend@basic-s0@smem.html
* igt@gem_render_tiled_blits@basic:
- fi-apl-guc: [INCOMPLETE][13] ([i915#7056]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/fi-apl-guc/igt@gem_render_tiled_blits@basic.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/fi-apl-guc/igt@gem_render_tiled_blits@basic.html
* igt@i915_pm_rpm@module-reload:
- {bat-rpls-2}: [DMESG-WARN][15] ([i915#6434]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/bat-rpls-2/igt@i915_pm_rpm@module-reload.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/bat-rpls-2/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live@gt_heartbeat:
- fi-skl-guc: [DMESG-FAIL][17] ([i915#5334]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/fi-skl-guc/igt@i915_selftest@live@gt_heartbeat.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/fi-skl-guc/igt@i915_selftest@live@gt_heartbeat.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#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1759]: https://gitlab.freedesktop.org/drm/intel/issues/1759
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#6434]: https://gitlab.freedesktop.org/drm/intel/issues/6434
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#6949]: https://gitlab.freedesktop.org/drm/intel/issues/6949
[i915#7056]: https://gitlab.freedesktop.org/drm/intel/issues/7056
[i915#7058]: https://gitlab.freedesktop.org/drm/intel/issues/7058
[i915#7308]: https://gitlab.freedesktop.org/drm/intel/issues/7308
[i915#7348]: https://gitlab.freedesktop.org/drm/intel/issues/7348
[i915#7433]: https://gitlab.freedesktop.org/drm/intel/issues/7433
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
Build changes
-------------
* Linux: CI_DRM_12365 -> Patchwork_110712v1
CI-20190529: 20190529
CI_DRM_12365: 1bda5b0abc8a0d9d53d9fec1a390dc93e2b0ba57 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7050: 42839a7c2bab78bc6cda8c949d8545606f377735 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_110712v1: 1bda5b0abc8a0d9d53d9fec1a390dc93e2b0ba57 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
bdcd82be5ae1 drm/i915/display: move restore state and ctx under display sub-struct
62173f8ebebf drm/i915/display: move global_obj_list under display sub-struct
a82b537f9ea9 drm/i915/display: move hti under display sub-struct
b75e7c103db6 drm/i915/hti: abstract hti handling
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/index.html
[-- Attachment #2: Type: text/html, Size: 6979 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for series starting with [1/4] drm/i915/hti: abstract hti handling
2022-11-09 14:42 [Intel-gfx] [PATCH 1/4] drm/i915/hti: abstract hti handling Jani Nikula
` (5 preceding siblings ...)
2022-11-10 17:28 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2022-11-10 20:14 ` Patchwork
2022-11-17 13:18 ` [Intel-gfx] [PATCH 1/4] " Ville Syrjälä
7 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2022-11-10 20:14 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 36893 bytes --]
== Series Details ==
Series: series starting with [1/4] drm/i915/hti: abstract hti handling
URL : https://patchwork.freedesktop.org/series/110712/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12365_full -> Patchwork_110712v1_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_110712v1_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_110712v1_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_110712v1_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_vblank@pipe-d-wait-idle-hang:
- shard-tglb: [PASS][1] -> [INCOMPLETE][2] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-tglb8/igt@kms_vblank@pipe-d-wait-idle-hang.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-tglb6/igt@kms_vblank@pipe-d-wait-idle-hang.html
#### Warnings ####
* igt@kms_plane_alpha_blend@alpha-basic@pipe-c-dp-1:
- shard-apl: [FAIL][3] ([i915#4573]) -> [DMESG-FAIL][4] +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-apl1/igt@kms_plane_alpha_blend@alpha-basic@pipe-c-dp-1.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-apl2/igt@kms_plane_alpha_blend@alpha-basic@pipe-c-dp-1.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@gem_exec_gttfill@engines@bcs0:
- {shard-rkl}: [PASS][5] -> [INCOMPLETE][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-2/igt@gem_exec_gttfill@engines@bcs0.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-3/igt@gem_exec_gttfill@engines@bcs0.html
Known issues
------------
Here are the changes found in Patchwork_110712v1_full that come from known issues:
### CI changes ###
#### Issues hit ####
* boot:
- shard-glk: ([PASS][7], [PASS][8], [PASS][9], [PASS][10], [PASS][11], [PASS][12], [PASS][13], [PASS][14], [PASS][15], [PASS][16], [PASS][17], [PASS][18], [PASS][19], [PASS][20], [PASS][21], [PASS][22], [PASS][23], [PASS][24], [PASS][25], [PASS][26], [PASS][27], [PASS][28], [PASS][29], [PASS][30], [PASS][31]) -> ([PASS][32], [PASS][33], [PASS][34], [PASS][35], [PASS][36], [PASS][37], [FAIL][38], [PASS][39], [PASS][40], [PASS][41], [PASS][42], [PASS][43], [PASS][44], [PASS][45], [PASS][46], [FAIL][47], [PASS][48], [PASS][49], [PASS][50], [PASS][51], [PASS][52], [PASS][53], [PASS][54], [PASS][55], [PASS][56]) ([i915#4392])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk7/boot.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk9/boot.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk5/boot.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk9/boot.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk9/boot.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk8/boot.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk6/boot.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk8/boot.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk6/boot.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk6/boot.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk8/boot.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk7/boot.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk7/boot.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk6/boot.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk1/boot.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk1/boot.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk1/boot.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk2/boot.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk2/boot.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk2/boot.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk3/boot.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk3/boot.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk3/boot.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk5/boot.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk5/boot.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk7/boot.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk7/boot.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk7/boot.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk8/boot.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk8/boot.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk8/boot.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk9/boot.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk9/boot.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk9/boot.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk9/boot.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk1/boot.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk1/boot.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk2/boot.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk2/boot.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk2/boot.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk3/boot.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk3/boot.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk3/boot.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk3/boot.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk5/boot.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk5/boot.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk5/boot.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk6/boot.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk6/boot.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk6/boot.html
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_balancer@parallel-out-fence:
- shard-iclb: [PASS][57] -> [SKIP][58] ([i915#4525])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-iclb2/igt@gem_exec_balancer@parallel-out-fence.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-iclb5/igt@gem_exec_balancer@parallel-out-fence.html
* igt@gem_exec_capture@pi@bcs0:
- shard-skl: [PASS][59] -> [INCOMPLETE][60] ([i915#3371])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-skl9/igt@gem_exec_capture@pi@bcs0.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl4/igt@gem_exec_capture@pi@bcs0.html
* igt@gem_exec_fair@basic-none@vcs0:
- shard-glk: [PASS][61] -> [FAIL][62] ([i915#2842])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk8/igt@gem_exec_fair@basic-none@vcs0.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk3/igt@gem_exec_fair@basic-none@vcs0.html
* igt@gem_exec_fair@basic-none@vcs1:
- shard-iclb: NOTRUN -> [FAIL][63] ([i915#2842])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-iclb1/igt@gem_exec_fair@basic-none@vcs1.html
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [PASS][64] -> [SKIP][65] ([i915#2190])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-tglb2/igt@gem_huc_copy@huc-copy.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-tglb7/igt@gem_huc_copy@huc-copy.html
* igt@gem_lmem_swapping@heavy-verify-random:
- shard-apl: NOTRUN -> [SKIP][66] ([fdo#109271] / [i915#4613])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-apl3/igt@gem_lmem_swapping@heavy-verify-random.html
* igt@i915_selftest@live@gt_heartbeat:
- shard-skl: [PASS][67] -> [DMESG-FAIL][68] ([i915#5334])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-skl10/igt@i915_selftest@live@gt_heartbeat.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl10/igt@i915_selftest@live@gt_heartbeat.html
* igt@kms_big_fb@4-tiled-32bpp-rotate-90:
- shard-apl: NOTRUN -> [SKIP][69] ([fdo#109271]) +17 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-apl3/igt@kms_big_fb@4-tiled-32bpp-rotate-90.html
* igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][70] ([fdo#109271] / [i915#3886]) +3 similar issues
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-apl3/igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_rc_ccs_cc:
- shard-skl: NOTRUN -> [SKIP][71] ([fdo#109271] / [i915#3886]) +2 similar issues
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl1/igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_chamelium@dp-hpd-with-enabled-mode:
- shard-apl: NOTRUN -> [SKIP][72] ([fdo#109271] / [fdo#111827])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-apl3/igt@kms_chamelium@dp-hpd-with-enabled-mode.html
* igt@kms_chamelium@hdmi-audio-edid:
- shard-skl: NOTRUN -> [SKIP][73] ([fdo#109271] / [fdo#111827]) +3 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl1/igt@kms_chamelium@hdmi-audio-edid.html
* igt@kms_flip@flip-vs-expired-vblank@b-edp1:
- shard-skl: [PASS][74] -> [FAIL][75] ([i915#79])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-skl9/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl4/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html
* igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-16bpp-4tile-upscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][76] ([i915#2672]) +4 similar issues
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-iclb3/igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-16bpp-4tile-upscaling@pipe-a-default-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-linear-to-32bpp-linear-downscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][77] ([i915#3555]) +1 similar issue
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-linear-to-32bpp-linear-downscaling@pipe-a-default-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-yftile-to-16bpp-yftile-upscaling@pipe-a-valid-mode:
- shard-iclb: NOTRUN -> [SKIP][78] ([i915#2587] / [i915#2672]) +3 similar issues
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-iclb5/igt@kms_flip_scaled_crc@flip-64bpp-yftile-to-16bpp-yftile-upscaling@pipe-a-valid-mode.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-mmap-cpu:
- shard-skl: NOTRUN -> [SKIP][79] ([fdo#109271]) +55 similar issues
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl4/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-mmap-cpu.html
* igt@kms_pipe_crc_basic@suspend-read-crc@pipe-a-edp-1:
- shard-skl: [PASS][80] -> [INCOMPLETE][81] ([i915#7266])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-skl1/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-a-edp-1.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl6/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-a-edp-1.html
* igt@kms_plane_scaling@invalid-num-scalers@pipe-a-edp-1-invalid-num-scalers:
- shard-skl: NOTRUN -> [SKIP][82] ([fdo#109271] / [i915#5776]) +2 similar issues
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl1/igt@kms_plane_scaling@invalid-num-scalers@pipe-a-edp-1-invalid-num-scalers.html
* igt@kms_plane_scaling@planes-unity-scaling-downscale-factor-0-5@pipe-c-edp-1:
- shard-iclb: [PASS][83] -> [SKIP][84] ([i915#5235]) +2 similar issues
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-iclb1/igt@kms_plane_scaling@planes-unity-scaling-downscale-factor-0-5@pipe-c-edp-1.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-iclb2/igt@kms_plane_scaling@planes-unity-scaling-downscale-factor-0-5@pipe-c-edp-1.html
* igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-fully-sf:
- shard-skl: NOTRUN -> [SKIP][85] ([fdo#109271] / [i915#658]) +1 similar issue
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl1/igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-fully-sf.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][86] -> [SKIP][87] ([fdo#109441]) +2 similar issues
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-iclb5/igt@kms_psr@psr2_sprite_plane_move.html
* igt@perf@polling-small-buf:
- shard-skl: NOTRUN -> [FAIL][88] ([i915#1722])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl1/igt@perf@polling-small-buf.html
* igt@sysfs_clients@fair-1:
- shard-apl: NOTRUN -> [SKIP][89] ([fdo#109271] / [i915#2994])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-apl3/igt@sysfs_clients@fair-1.html
#### Possible fixes ####
* igt@fbdev@unaligned-read:
- shard-skl: [DMESG-WARN][90] ([i915#1982]) -> [PASS][91]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-skl4/igt@fbdev@unaligned-read.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl6/igt@fbdev@unaligned-read.html
* igt@gem_ctx_exec@basic-nohangcheck:
- shard-tglb: [FAIL][92] ([i915#6268]) -> [PASS][93]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-tglb2/igt@gem_ctx_exec@basic-nohangcheck.html
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-tglb1/igt@gem_ctx_exec@basic-nohangcheck.html
* igt@gem_ctx_persistence@smoketest:
- shard-iclb: [FAIL][94] ([i915#5099]) -> [PASS][95]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-iclb2/igt@gem_ctx_persistence@smoketest.html
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-iclb5/igt@gem_ctx_persistence@smoketest.html
* igt@gem_exec_fair@basic-none-rrul@rcs0:
- shard-glk: [FAIL][96] ([i915#2842]) -> [PASS][97] +1 similar issue
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk2/igt@gem_exec_fair@basic-none-rrul@rcs0.html
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk5/igt@gem_exec_fair@basic-none-rrul@rcs0.html
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [FAIL][98] ([i915#2842]) -> [PASS][99]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-apl7/igt@gem_exec_fair@basic-none-solo@rcs0.html
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-apl3/igt@gem_exec_fair@basic-none-solo@rcs0.html
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-tglb: [FAIL][100] ([i915#2842]) -> [PASS][101] +1 similar issue
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-tglb3/igt@gem_exec_fair@basic-throttle@rcs0.html
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-tglb1/igt@gem_exec_fair@basic-throttle@rcs0.html
* igt@gem_exec_reloc@basic-gtt-read-noreloc:
- {shard-rkl}: [SKIP][102] ([i915#3281]) -> [PASS][103] +9 similar issues
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-1/igt@gem_exec_reloc@basic-gtt-read-noreloc.html
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-5/igt@gem_exec_reloc@basic-gtt-read-noreloc.html
* igt@gem_userptr_blits@forbidden-operations:
- {shard-rkl}: [SKIP][104] ([i915#3282]) -> [PASS][105] +3 similar issues
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-1/igt@gem_userptr_blits@forbidden-operations.html
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-5/igt@gem_userptr_blits@forbidden-operations.html
* igt@gen9_exec_parse@unaligned-access:
- {shard-rkl}: [SKIP][106] ([i915#2527]) -> [PASS][107] +2 similar issues
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-1/igt@gen9_exec_parse@unaligned-access.html
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-5/igt@gen9_exec_parse@unaligned-access.html
* igt@i915_hangman@engine-engine-error@bcs0:
- {shard-rkl}: [SKIP][108] ([i915#6258]) -> [PASS][109]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-5/igt@i915_hangman@engine-engine-error@bcs0.html
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-6/igt@i915_hangman@engine-engine-error@bcs0.html
* igt@i915_pipe_stress@stress-xrgb8888-untiled:
- {shard-rkl}: [SKIP][110] ([i915#4098]) -> [PASS][111]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-2/igt@i915_pipe_stress@stress-xrgb8888-untiled.html
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-6/igt@i915_pipe_stress@stress-xrgb8888-untiled.html
* igt@i915_pm_rc6_residency@rc6-idle@vcs0:
- {shard-rkl}: [WARN][112] ([i915#2681]) -> [PASS][113]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-5/igt@i915_pm_rc6_residency@rc6-idle@vcs0.html
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-4/igt@i915_pm_rc6_residency@rc6-idle@vcs0.html
* igt@i915_pm_rpm@system-suspend-modeset:
- {shard-rkl}: [SKIP][114] ([fdo#109308]) -> [PASS][115]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-5/igt@i915_pm_rpm@system-suspend-modeset.html
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-6/igt@i915_pm_rpm@system-suspend-modeset.html
* igt@i915_pm_rps@engine-order:
- {shard-rkl}: [FAIL][116] -> [PASS][117]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-5/igt@i915_pm_rps@engine-order.html
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-5/igt@i915_pm_rps@engine-order.html
* igt@kms_async_flips@alternate-sync-async-flip@pipe-a-edp-1:
- shard-skl: [FAIL][118] ([i915#2521]) -> [PASS][119] +1 similar issue
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-skl4/igt@kms_async_flips@alternate-sync-async-flip@pipe-a-edp-1.html
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl6/igt@kms_async_flips@alternate-sync-async-flip@pipe-a-edp-1.html
* igt@kms_async_flips@async-flip-with-page-flip-events@pipe-a-edp-1:
- shard-skl: [FAIL][120] ([i915#7230]) -> [PASS][121]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-skl1/igt@kms_async_flips@async-flip-with-page-flip-events@pipe-a-edp-1.html
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl4/igt@kms_async_flips@async-flip-with-page-flip-events@pipe-a-edp-1.html
* igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_rc_ccs:
- {shard-rkl}: [SKIP][122] ([i915#1845] / [i915#4098]) -> [PASS][123] +25 similar issues
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-2/igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_rc_ccs.html
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-6/igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_rc_ccs.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1:
- shard-skl: [FAIL][124] ([i915#79]) -> [PASS][125] +1 similar issue
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-skl10/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl10/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html
* igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a1:
- shard-glk: [FAIL][126] ([i915#79]) -> [PASS][127]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk1/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a1.html
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-glk3/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a1.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
- {shard-rkl}: [SKIP][128] ([i915#1849] / [i915#4098]) -> [PASS][129] +22 similar issues
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt.html
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-apl: [DMESG-WARN][130] ([i915#180]) -> [PASS][131]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-apl3/igt@kms_frontbuffer_tracking@fbc-suspend.html
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-apl3/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_plane@plane-position-hole@pipe-b-planes:
- {shard-rkl}: [SKIP][132] ([i915#1849] / [i915#3558]) -> [PASS][133] +1 similar issue
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-2/igt@kms_plane@plane-position-hole@pipe-b-planes.html
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-6/igt@kms_plane@plane-position-hole@pipe-b-planes.html
* igt@kms_properties@plane-properties-legacy:
- {shard-rkl}: [SKIP][134] ([i915#1849]) -> [PASS][135] +2 similar issues
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-2/igt@kms_properties@plane-properties-legacy.html
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-6/igt@kms_properties@plane-properties-legacy.html
* igt@kms_psr@primary_render:
- {shard-rkl}: [SKIP][136] ([i915#1072]) -> [PASS][137] +1 similar issue
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-2/igt@kms_psr@primary_render.html
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-6/igt@kms_psr@primary_render.html
* igt@kms_psr@psr2_dpms:
- shard-iclb: [SKIP][138] ([fdo#109441]) -> [PASS][139] +1 similar issue
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-iclb1/igt@kms_psr@psr2_dpms.html
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-iclb2/igt@kms_psr@psr2_dpms.html
* igt@kms_psr_stress_test@invalidate-primary-flip-overlay:
- shard-iclb: [SKIP][140] ([i915#5519]) -> [PASS][141]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-iclb7/igt@kms_psr_stress_test@invalidate-primary-flip-overlay.html
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-iclb8/igt@kms_psr_stress_test@invalidate-primary-flip-overlay.html
* igt@kms_universal_plane@cursor-fb-leak-pipe-a:
- {shard-rkl}: [SKIP][142] ([i915#1845] / [i915#4070] / [i915#4098]) -> [PASS][143]
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-2/igt@kms_universal_plane@cursor-fb-leak-pipe-a.html
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-6/igt@kms_universal_plane@cursor-fb-leak-pipe-a.html
* igt@perf@gen12-mi-rpc:
- {shard-rkl}: [SKIP][144] ([fdo#109289]) -> [PASS][145]
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-rkl-5/igt@perf@gen12-mi-rpc.html
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-rkl-6/igt@perf@gen12-mi-rpc.html
#### Warnings ####
* igt@dmabuf@all@dma_fence_chain:
- shard-skl: [TIMEOUT][146] -> [INCOMPLETE][147] ([i915#1982] / [i915#6949])
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-skl4/igt@dmabuf@all@dma_fence_chain.html
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl6/igt@dmabuf@all@dma_fence_chain.html
* igt@gem_exec_balancer@parallel-ordering:
- shard-iclb: [FAIL][148] ([i915#6117]) -> [SKIP][149] ([i915#4525])
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-iclb1/igt@gem_exec_balancer@parallel-ordering.html
[149]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-iclb3/igt@gem_exec_balancer@parallel-ordering.html
* igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-sf:
- shard-iclb: [SKIP][150] ([i915#2920]) -> [SKIP][151] ([i915#658]) +1 similar issue
[150]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-iclb2/igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-sf.html
[151]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-iclb5/igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-sf.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area:
- shard-iclb: [SKIP][152] ([i915#2920]) -> [SKIP][153] ([fdo#111068] / [i915#658])
[152]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area.html
[153]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-iclb5/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area.html
* igt@runner@aborted:
- shard-apl: ([FAIL][154], [FAIL][155], [FAIL][156]) ([fdo#109271] / [i915#3002] / [i915#4312]) -> ([FAIL][157], [FAIL][158]) ([i915#3002] / [i915#4312])
[154]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-apl2/igt@runner@aborted.html
[155]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-apl6/igt@runner@aborted.html
[156]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-apl3/igt@runner@aborted.html
[157]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-apl1/igt@runner@aborted.html
[158]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-apl6/igt@runner@aborted.html
- shard-skl: [FAIL][159] ([i915#3002] / [i915#4312]) -> ([FAIL][160], [FAIL][161], [FAIL][162]) ([i915#3002] / [i915#4312] / [i915#6949])
[159]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-skl6/igt@runner@aborted.html
[160]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl7/igt@runner@aborted.html
[161]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl6/igt@runner@aborted.html
[162]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110712v1/shard-skl4/igt@runner@aborted.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#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1722]: https://gitlab.freedesktop.org/drm/intel/issues/1722
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2436]: https://gitlab.freedesktop.org/drm/intel/issues/2436
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
[i915#3371]: https://gitlab.freedesktop.org/drm/intel/issues/3371
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3536]: https://gitlab.freedesktop.org/drm/intel/issues/3536
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3743]: https://gitlab.freedesktop.org/drm/intel/issues/3743
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#433]: https://gitlab.freedesktop.org/drm/intel/issues/433
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4392]: https://gitlab.freedesktop.org/drm/intel/issues/4392
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4573]: https://gitlab.freedesktop.org/drm/intel/issues/4573
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4854]: https://gitlab.freedesktop.org/drm/intel/issues/4854
[i915#4881]: https://gitlab.freedesktop.org/drm/intel/issues/4881
[i915#5099]: https://gitlab.freedesktop.org/drm/intel/issues/5099
[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#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5327]: https://gitlab.freedesktop.org/drm/intel/issues/5327
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5519]: https://gitlab.freedesktop.org/drm/intel/issues/5519
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#5776]: https://gitlab.freedesktop.org/drm/intel/issues/5776
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117
[i915#6247]: https://gitlab.freedesktop.org/drm/intel/issues/6247
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6252]: https://gitlab.freedesktop.org/drm/intel/issues/6252
[i915#6258]: https://gitlab.freedesktop.org/drm/intel/issues/6258
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#6949]: https://gitlab.freedesktop.org/drm/intel/issues/6949
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7230]: https://gitlab.freedesktop.org/drm/intel/issues/7230
[i915#7266]: https://gitlab.freedesktop.org/drm/intel/issues/7266
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
Build changes
-------------
* Linux: CI_DRM_12365 -> Patchwork_110712v1
CI-20190529: 20190529
CI_DRM_12365: 1bda5b0abc8a0d9d53d9fec1a390dc93e2b0ba57 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7050: 42839a7c2bab78bc6cda8c949d8545606f377735 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_110712v1: 1bda5b0abc8a0d9d53d9fec1a390dc93e2b0ba57 @ 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_110712v1/index.html
[-- Attachment #2: Type: text/html, Size: 37405 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH 1/4] drm/i915/hti: abstract hti handling
2022-11-09 14:42 [Intel-gfx] [PATCH 1/4] drm/i915/hti: abstract hti handling Jani Nikula
` (6 preceding siblings ...)
2022-11-10 20:14 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
@ 2022-11-17 13:18 ` Ville Syrjälä
2022-11-17 14:30 ` Jani Nikula
7 siblings, 1 reply; 10+ messages in thread
From: Ville Syrjälä @ 2022-11-17 13:18 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Wed, Nov 09, 2022 at 04:42:06PM +0200, Jani Nikula wrote:
> The HTI or HDPORT handling is sprinkled around. Centralize to one place.
>
> Add a note about how subtle the mapping from HDPORT_STATE register to
> dpll mask actually is.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/Makefile | 1 +
> drivers/gpu/drm/i915/display/intel_ddi.c | 9 +----
> drivers/gpu/drm/i915/display/intel_display.c | 8 +---
> drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 11 +-----
> drivers/gpu/drm/i915/display/intel_hti.c | 39 +++++++++++++++++++
> drivers/gpu/drm/i915/display/intel_hti.h | 18 +++++++++
> drivers/gpu/drm/i915/display/intel_hti_regs.h | 16 ++++++++
> drivers/gpu/drm/i915/i915_reg.h | 5 ---
> 8 files changed, 80 insertions(+), 27 deletions(-)
> create mode 100644 drivers/gpu/drm/i915/display/intel_hti.c
> create mode 100644 drivers/gpu/drm/i915/display/intel_hti.h
> create mode 100644 drivers/gpu/drm/i915/display/intel_hti_regs.h
>
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 51704b54317c..cb8232bd315b 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -247,6 +247,7 @@ i915-y += \
> display/intel_global_state.o \
> display/intel_hdcp.o \
> display/intel_hotplug.o \
> + display/intel_hti.o \
> display/intel_lpe_audio.o \
> display/intel_modeset_verify.o \
> display/intel_modeset_setup.o \
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index e95bde5cf060..5be9573bf65c 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -56,6 +56,7 @@
> #include "intel_hdcp.h"
> #include "intel_hdmi.h"
> #include "intel_hotplug.h"
> +#include "intel_hti.h"
> #include "intel_lspcon.h"
> #include "intel_mg_phy_regs.h"
> #include "intel_pps.h"
> @@ -4113,12 +4114,6 @@ intel_ddi_max_lanes(struct intel_digital_port *dig_port)
> return max_lanes;
> }
>
> -static bool hti_uses_phy(struct drm_i915_private *i915, enum phy phy)
> -{
> - return i915->hti_state & HDPORT_ENABLED &&
> - i915->hti_state & HDPORT_DDI_USED(phy);
> -}
> -
> static enum hpd_pin xelpd_hpd_pin(struct drm_i915_private *dev_priv,
> enum port port)
> {
> @@ -4247,7 +4242,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
> * driver. In that case we should skip initializing the corresponding
> * outputs.
> */
> - if (hti_uses_phy(dev_priv, phy)) {
> + if (intel_hti_uses_phy(dev_priv, phy)) {
> drm_dbg_kms(&dev_priv->drm, "PORT %c / PHY %c reserved by HTI\n",
> port_name(port), phy_name(phy));
> return;
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 0d3353c403af..90219e7abc7c 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -100,6 +100,7 @@
> #include "intel_frontbuffer.h"
> #include "intel_hdcp.h"
> #include "intel_hotplug.h"
> +#include "intel_hti.h"
> #include "intel_modeset_verify.h"
> #include "intel_modeset_setup.h"
> #include "intel_overlay.h"
> @@ -8735,12 +8736,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915)
> if (i915->display.cdclk.max_cdclk_freq == 0)
> intel_update_max_cdclk(i915);
>
> - /*
> - * If the platform has HTI, we need to find out whether it has reserved
> - * any display resources before we create our display outputs.
> - */
> - if (INTEL_INFO(i915)->display.has_hti)
> - i915->hti_state = intel_de_read(i915, HDPORT_STATE);
> + intel_hti_init(i915);
>
> /* Just disable it once at startup */
> intel_vga_disable(i915);
> diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> index 7c6c094a0a01..28f7dcb170c7 100644
> --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> @@ -30,6 +30,7 @@
> #include "intel_dpio_phy.h"
> #include "intel_dpll.h"
> #include "intel_dpll_mgr.h"
> +#include "intel_hti.h"
> #include "intel_mg_phy_regs.h"
> #include "intel_pch_refclk.h"
> #include "intel_tc.h"
> @@ -3163,14 +3164,6 @@ static void icl_update_active_dpll(struct intel_atomic_state *state,
> icl_set_active_port_dpll(crtc_state, port_dpll_id);
> }
>
> -static u32 intel_get_hti_plls(struct drm_i915_private *i915)
> -{
> - if (!(i915->hti_state & HDPORT_ENABLED))
> - return 0;
> -
> - return REG_FIELD_GET(HDPORT_DPLL_USED_MASK, i915->hti_state);
> -}
> -
> static int icl_compute_combo_phy_dpll(struct intel_atomic_state *state,
> struct intel_crtc *crtc)
> {
> @@ -3245,7 +3238,7 @@ static int icl_get_combo_phy_dpll(struct intel_atomic_state *state,
> }
>
> /* Eliminate DPLLs from consideration if reserved by HTI */
> - dpll_mask &= ~intel_get_hti_plls(dev_priv);
> + dpll_mask &= ~intel_hti_dpll_mask(dev_priv);
>
> port_dpll->pll = intel_find_shared_dpll(state, crtc,
> &port_dpll->hw_state,
> diff --git a/drivers/gpu/drm/i915/display/intel_hti.c b/drivers/gpu/drm/i915/display/intel_hti.c
> new file mode 100644
> index 000000000000..e2b09e96f9a9
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/display/intel_hti.c
> @@ -0,0 +1,39 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright © 2022 Intel Corporation
> + */
> +
> +#include "i915_drv.h"
> +#include "intel_de.h"
> +#include "intel_display.h"
> +#include "intel_hti.h"
> +#include "intel_hti_regs.h"
> +
> +void intel_hti_init(struct drm_i915_private *i915)
> +{
> + /*
> + * If the platform has HTI, we need to find out whether it has reserved
> + * any display resources before we create our display outputs.
> + */
> + if (INTEL_INFO(i915)->display.has_hti)
> + i915->hti_state = intel_de_read(i915, HDPORT_STATE);
> +}
> +
> +bool intel_hti_uses_phy(struct drm_i915_private *i915, enum phy phy)
> +{
> + return i915->hti_state & HDPORT_ENABLED &&
> + i915->hti_state & HDPORT_DDI_USED(phy);
> +}
> +
> +u32 intel_hti_dpll_mask(struct drm_i915_private *i915)
> +{
> + if (!(i915->hti_state & HDPORT_ENABLED))
> + return 0;
> +
> + /*
> + * Note: This is subtle. The values must coincide with what's defined
> + * for the platform.
> + */
> + return REG_FIELD_GET(HDPORT_DPLL_USED_MASK, i915->hti_state);
o_O
> +}
> +
stray newline?
For the series
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> diff --git a/drivers/gpu/drm/i915/display/intel_hti.h b/drivers/gpu/drm/i915/display/intel_hti.h
> new file mode 100644
> index 000000000000..2893d6668657
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/display/intel_hti.h
> @@ -0,0 +1,18 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2022 Intel Corporation
> + */
> +
> +#ifndef __INTEL_HTI_H__
> +#define __INTEL_HTI_H__
> +
> +#include <linux/types.h>
> +
> +struct drm_i915_private;
> +enum phy;
> +
> +void intel_hti_init(struct drm_i915_private *i915);
> +bool intel_hti_uses_phy(struct drm_i915_private *i915, enum phy phy);
> +u32 intel_hti_dpll_mask(struct drm_i915_private *i915);
> +
> +#endif /* __INTEL_HTI_H__ */
> diff --git a/drivers/gpu/drm/i915/display/intel_hti_regs.h b/drivers/gpu/drm/i915/display/intel_hti_regs.h
> new file mode 100644
> index 000000000000..e206f2837fc8
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/display/intel_hti_regs.h
> @@ -0,0 +1,16 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2022 Intel Corporation
> + */
> +
> +#ifndef __INTEL_HTI_REGS_H__
> +#define __INTEL_HTI_REGS_H__
> +
> +#include "i915_reg_defs.h"
> +
> +#define HDPORT_STATE _MMIO(0x45050)
> +#define HDPORT_DPLL_USED_MASK REG_GENMASK(15, 12)
> +#define HDPORT_DDI_USED(phy) REG_BIT(2 * (phy) + 1)
> +#define HDPORT_ENABLED REG_BIT(0)
> +
> +#endif /* __INTEL_HTI_REGS_H__ */
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index a37ed0c61f20..fd60d335d9cb 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -1148,11 +1148,6 @@
> #define MBUS_JOIN_PIPE_SELECT(pipe) REG_FIELD_PREP(MBUS_JOIN_PIPE_SELECT_MASK, pipe)
> #define MBUS_JOIN_PIPE_SELECT_NONE MBUS_JOIN_PIPE_SELECT(7)
>
> -#define HDPORT_STATE _MMIO(0x45050)
> -#define HDPORT_DPLL_USED_MASK REG_GENMASK(15, 12)
> -#define HDPORT_DDI_USED(phy) REG_BIT(2 * (phy) + 1)
> -#define HDPORT_ENABLED REG_BIT(0)
> -
> /* Make render/texture TLB fetches lower priorty than associated data
> * fetches. This is not turned on by default
> */
> --
> 2.34.1
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH 1/4] drm/i915/hti: abstract hti handling
2022-11-17 13:18 ` [Intel-gfx] [PATCH 1/4] " Ville Syrjälä
@ 2022-11-17 14:30 ` Jani Nikula
0 siblings, 0 replies; 10+ messages in thread
From: Jani Nikula @ 2022-11-17 14:30 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
On Thu, 17 Nov 2022, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Wed, Nov 09, 2022 at 04:42:06PM +0200, Jani Nikula wrote:
>> The HTI or HDPORT handling is sprinkled around. Centralize to one place.
>>
>> Add a note about how subtle the mapping from HDPORT_STATE register to
>> dpll mask actually is.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/Makefile | 1 +
>> drivers/gpu/drm/i915/display/intel_ddi.c | 9 +----
>> drivers/gpu/drm/i915/display/intel_display.c | 8 +---
>> drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 11 +-----
>> drivers/gpu/drm/i915/display/intel_hti.c | 39 +++++++++++++++++++
>> drivers/gpu/drm/i915/display/intel_hti.h | 18 +++++++++
>> drivers/gpu/drm/i915/display/intel_hti_regs.h | 16 ++++++++
>> drivers/gpu/drm/i915/i915_reg.h | 5 ---
>> 8 files changed, 80 insertions(+), 27 deletions(-)
>> create mode 100644 drivers/gpu/drm/i915/display/intel_hti.c
>> create mode 100644 drivers/gpu/drm/i915/display/intel_hti.h
>> create mode 100644 drivers/gpu/drm/i915/display/intel_hti_regs.h
>>
>> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
>> index 51704b54317c..cb8232bd315b 100644
>> --- a/drivers/gpu/drm/i915/Makefile
>> +++ b/drivers/gpu/drm/i915/Makefile
>> @@ -247,6 +247,7 @@ i915-y += \
>> display/intel_global_state.o \
>> display/intel_hdcp.o \
>> display/intel_hotplug.o \
>> + display/intel_hti.o \
>> display/intel_lpe_audio.o \
>> display/intel_modeset_verify.o \
>> display/intel_modeset_setup.o \
>> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
>> index e95bde5cf060..5be9573bf65c 100644
>> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
>> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
>> @@ -56,6 +56,7 @@
>> #include "intel_hdcp.h"
>> #include "intel_hdmi.h"
>> #include "intel_hotplug.h"
>> +#include "intel_hti.h"
>> #include "intel_lspcon.h"
>> #include "intel_mg_phy_regs.h"
>> #include "intel_pps.h"
>> @@ -4113,12 +4114,6 @@ intel_ddi_max_lanes(struct intel_digital_port *dig_port)
>> return max_lanes;
>> }
>>
>> -static bool hti_uses_phy(struct drm_i915_private *i915, enum phy phy)
>> -{
>> - return i915->hti_state & HDPORT_ENABLED &&
>> - i915->hti_state & HDPORT_DDI_USED(phy);
>> -}
>> -
>> static enum hpd_pin xelpd_hpd_pin(struct drm_i915_private *dev_priv,
>> enum port port)
>> {
>> @@ -4247,7 +4242,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
>> * driver. In that case we should skip initializing the corresponding
>> * outputs.
>> */
>> - if (hti_uses_phy(dev_priv, phy)) {
>> + if (intel_hti_uses_phy(dev_priv, phy)) {
>> drm_dbg_kms(&dev_priv->drm, "PORT %c / PHY %c reserved by HTI\n",
>> port_name(port), phy_name(phy));
>> return;
>> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>> index 0d3353c403af..90219e7abc7c 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display.c
>> @@ -100,6 +100,7 @@
>> #include "intel_frontbuffer.h"
>> #include "intel_hdcp.h"
>> #include "intel_hotplug.h"
>> +#include "intel_hti.h"
>> #include "intel_modeset_verify.h"
>> #include "intel_modeset_setup.h"
>> #include "intel_overlay.h"
>> @@ -8735,12 +8736,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915)
>> if (i915->display.cdclk.max_cdclk_freq == 0)
>> intel_update_max_cdclk(i915);
>>
>> - /*
>> - * If the platform has HTI, we need to find out whether it has reserved
>> - * any display resources before we create our display outputs.
>> - */
>> - if (INTEL_INFO(i915)->display.has_hti)
>> - i915->hti_state = intel_de_read(i915, HDPORT_STATE);
>> + intel_hti_init(i915);
>>
>> /* Just disable it once at startup */
>> intel_vga_disable(i915);
>> diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
>> index 7c6c094a0a01..28f7dcb170c7 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
>> +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
>> @@ -30,6 +30,7 @@
>> #include "intel_dpio_phy.h"
>> #include "intel_dpll.h"
>> #include "intel_dpll_mgr.h"
>> +#include "intel_hti.h"
>> #include "intel_mg_phy_regs.h"
>> #include "intel_pch_refclk.h"
>> #include "intel_tc.h"
>> @@ -3163,14 +3164,6 @@ static void icl_update_active_dpll(struct intel_atomic_state *state,
>> icl_set_active_port_dpll(crtc_state, port_dpll_id);
>> }
>>
>> -static u32 intel_get_hti_plls(struct drm_i915_private *i915)
>> -{
>> - if (!(i915->hti_state & HDPORT_ENABLED))
>> - return 0;
>> -
>> - return REG_FIELD_GET(HDPORT_DPLL_USED_MASK, i915->hti_state);
>> -}
>> -
>> static int icl_compute_combo_phy_dpll(struct intel_atomic_state *state,
>> struct intel_crtc *crtc)
>> {
>> @@ -3245,7 +3238,7 @@ static int icl_get_combo_phy_dpll(struct intel_atomic_state *state,
>> }
>>
>> /* Eliminate DPLLs from consideration if reserved by HTI */
>> - dpll_mask &= ~intel_get_hti_plls(dev_priv);
>> + dpll_mask &= ~intel_hti_dpll_mask(dev_priv);
>>
>> port_dpll->pll = intel_find_shared_dpll(state, crtc,
>> &port_dpll->hw_state,
>> diff --git a/drivers/gpu/drm/i915/display/intel_hti.c b/drivers/gpu/drm/i915/display/intel_hti.c
>> new file mode 100644
>> index 000000000000..e2b09e96f9a9
>> --- /dev/null
>> +++ b/drivers/gpu/drm/i915/display/intel_hti.c
>> @@ -0,0 +1,39 @@
>> +// SPDX-License-Identifier: MIT
>> +/*
>> + * Copyright © 2022 Intel Corporation
>> + */
>> +
>> +#include "i915_drv.h"
>> +#include "intel_de.h"
>> +#include "intel_display.h"
>> +#include "intel_hti.h"
>> +#include "intel_hti_regs.h"
>> +
>> +void intel_hti_init(struct drm_i915_private *i915)
>> +{
>> + /*
>> + * If the platform has HTI, we need to find out whether it has reserved
>> + * any display resources before we create our display outputs.
>> + */
>> + if (INTEL_INFO(i915)->display.has_hti)
>> + i915->hti_state = intel_de_read(i915, HDPORT_STATE);
>> +}
>> +
>> +bool intel_hti_uses_phy(struct drm_i915_private *i915, enum phy phy)
>> +{
>> + return i915->hti_state & HDPORT_ENABLED &&
>> + i915->hti_state & HDPORT_DDI_USED(phy);
>> +}
>> +
>> +u32 intel_hti_dpll_mask(struct drm_i915_private *i915)
>> +{
>> + if (!(i915->hti_state & HDPORT_ENABLED))
>> + return 0;
>> +
>> + /*
>> + * Note: This is subtle. The values must coincide with what's defined
>> + * for the platform.
>> + */
>> + return REG_FIELD_GET(HDPORT_DPLL_USED_MASK, i915->hti_state);
>
> o_O
>
>> +}
>> +
>
> stray newline?
>
> For the series
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Thanks for the review, pushed to drm-intel-next, and axed the newline
while pushing.
BR,
Jani.
>
>> diff --git a/drivers/gpu/drm/i915/display/intel_hti.h b/drivers/gpu/drm/i915/display/intel_hti.h
>> new file mode 100644
>> index 000000000000..2893d6668657
>> --- /dev/null
>> +++ b/drivers/gpu/drm/i915/display/intel_hti.h
>> @@ -0,0 +1,18 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Copyright © 2022 Intel Corporation
>> + */
>> +
>> +#ifndef __INTEL_HTI_H__
>> +#define __INTEL_HTI_H__
>> +
>> +#include <linux/types.h>
>> +
>> +struct drm_i915_private;
>> +enum phy;
>> +
>> +void intel_hti_init(struct drm_i915_private *i915);
>> +bool intel_hti_uses_phy(struct drm_i915_private *i915, enum phy phy);
>> +u32 intel_hti_dpll_mask(struct drm_i915_private *i915);
>> +
>> +#endif /* __INTEL_HTI_H__ */
>> diff --git a/drivers/gpu/drm/i915/display/intel_hti_regs.h b/drivers/gpu/drm/i915/display/intel_hti_regs.h
>> new file mode 100644
>> index 000000000000..e206f2837fc8
>> --- /dev/null
>> +++ b/drivers/gpu/drm/i915/display/intel_hti_regs.h
>> @@ -0,0 +1,16 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Copyright © 2022 Intel Corporation
>> + */
>> +
>> +#ifndef __INTEL_HTI_REGS_H__
>> +#define __INTEL_HTI_REGS_H__
>> +
>> +#include "i915_reg_defs.h"
>> +
>> +#define HDPORT_STATE _MMIO(0x45050)
>> +#define HDPORT_DPLL_USED_MASK REG_GENMASK(15, 12)
>> +#define HDPORT_DDI_USED(phy) REG_BIT(2 * (phy) + 1)
>> +#define HDPORT_ENABLED REG_BIT(0)
>> +
>> +#endif /* __INTEL_HTI_REGS_H__ */
>> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
>> index a37ed0c61f20..fd60d335d9cb 100644
>> --- a/drivers/gpu/drm/i915/i915_reg.h
>> +++ b/drivers/gpu/drm/i915/i915_reg.h
>> @@ -1148,11 +1148,6 @@
>> #define MBUS_JOIN_PIPE_SELECT(pipe) REG_FIELD_PREP(MBUS_JOIN_PIPE_SELECT_MASK, pipe)
>> #define MBUS_JOIN_PIPE_SELECT_NONE MBUS_JOIN_PIPE_SELECT(7)
>>
>> -#define HDPORT_STATE _MMIO(0x45050)
>> -#define HDPORT_DPLL_USED_MASK REG_GENMASK(15, 12)
>> -#define HDPORT_DDI_USED(phy) REG_BIT(2 * (phy) + 1)
>> -#define HDPORT_ENABLED REG_BIT(0)
>> -
>> /* Make render/texture TLB fetches lower priorty than associated data
>> * fetches. This is not turned on by default
>> */
>> --
>> 2.34.1
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-11-17 14:30 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-09 14:42 [Intel-gfx] [PATCH 1/4] drm/i915/hti: abstract hti handling Jani Nikula
2022-11-09 14:42 ` [Intel-gfx] [PATCH 2/4] drm/i915/display: move hti under display sub-struct Jani Nikula
2022-11-09 14:42 ` [Intel-gfx] [PATCH 3/4] drm/i915/display: move global_obj_list " Jani Nikula
2022-11-09 14:42 ` [Intel-gfx] [PATCH 4/4] drm/i915/display: move restore state and ctx " Jani Nikula
2022-11-10 17:01 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/4] drm/i915/hti: abstract hti handling Patchwork
2022-11-10 17:01 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2022-11-10 17:28 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-11-10 20:14 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-11-17 13:18 ` [Intel-gfx] [PATCH 1/4] " Ville Syrjälä
2022-11-17 14:30 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox