* [PATCH 1/9] drm/i915/color: prefer display->platform.<platform> checks
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
@ 2025-03-11 18:00 ` Jani Nikula
2025-03-12 5:01 ` Shankar, Uma
2025-03-11 18:00 ` [PATCH 2/9] drm/i915/connector: convert intel_connector.c to struct intel_display Jani Nikula
` (16 subsequent siblings)
17 siblings, 1 reply; 31+ messages in thread
From: Jani Nikula @ 2025-03-11 18:00 UTC (permalink / raw)
To: intel-gfx, intel-xe; +Cc: jani.nikula
This let's us drop the dependency on i915_drv.h.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_color.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
index cfe14162231d..bbf6df7ebb95 100644
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -22,7 +22,7 @@
*
*/
-#include "i915_drv.h"
+#include "i915_utils.h"
#include "i9xx_plane_regs.h"
#include "intel_color.h"
#include "intel_color_regs.h"
@@ -405,14 +405,13 @@ static void icl_read_csc(struct intel_crtc_state *crtc_state)
static bool ilk_limited_range(const struct intel_crtc_state *crtc_state)
{
struct intel_display *display = to_intel_display(crtc_state);
- struct drm_i915_private *i915 = to_i915(display->drm);
/* icl+ have dedicated output CSC */
if (DISPLAY_VER(display) >= 11)
return false;
/* pre-hsw have TRANSCONF_COLOR_RANGE_SELECT */
- if (DISPLAY_VER(display) < 7 || IS_IVYBRIDGE(i915))
+ if (DISPLAY_VER(display) < 7 || display->platform.ivybridge)
return false;
return crtc_state->limited_color_range;
@@ -516,7 +515,6 @@ static void ilk_csc_convert_ctm(const struct intel_crtc_state *crtc_state,
static void ilk_assign_csc(struct intel_crtc_state *crtc_state)
{
struct intel_display *display = to_intel_display(crtc_state);
- struct drm_i915_private *i915 = to_i915(display->drm);
bool limited_color_range = ilk_csc_limited_range(crtc_state);
if (crtc_state->hw.ctm) {
@@ -538,7 +536,7 @@ static void ilk_assign_csc(struct intel_crtc_state *crtc_state)
* LUT is needed but CSC is not we need to load an
* identity matrix.
*/
- drm_WARN_ON(display->drm, !IS_GEMINILAKE(i915));
+ drm_WARN_ON(display->drm, !display->platform.geminilake);
ilk_csc_copy(display, &crtc_state->csc, &ilk_csc_matrix_identity);
} else {
@@ -3983,12 +3981,10 @@ int intel_color_init(struct intel_display *display)
void intel_color_init_hooks(struct intel_display *display)
{
- struct drm_i915_private *i915 = to_i915(display->drm);
-
if (HAS_GMCH(display)) {
- if (IS_CHERRYVIEW(i915))
+ if (display->platform.cherryview)
display->funcs.color = &chv_color_funcs;
- else if (IS_VALLEYVIEW(i915))
+ else if (display->platform.valleyview)
display->funcs.color = &vlv_color_funcs;
else if (DISPLAY_VER(display) >= 4)
display->funcs.color = &i965_color_funcs;
@@ -4005,7 +4001,7 @@ void intel_color_init_hooks(struct intel_display *display)
display->funcs.color = &skl_color_funcs;
else if (DISPLAY_VER(display) == 8)
display->funcs.color = &bdw_color_funcs;
- else if (IS_HASWELL(i915))
+ else if (display->platform.haswell)
display->funcs.color = &hsw_color_funcs;
else if (DISPLAY_VER(display) == 7)
display->funcs.color = &ivb_color_funcs;
--
2.39.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* RE: [PATCH 1/9] drm/i915/color: prefer display->platform.<platform> checks
2025-03-11 18:00 ` [PATCH 1/9] drm/i915/color: prefer display->platform.<platform> checks Jani Nikula
@ 2025-03-12 5:01 ` Shankar, Uma
0 siblings, 0 replies; 31+ messages in thread
From: Shankar, Uma @ 2025-03-12 5:01 UTC (permalink / raw)
To: Nikula, Jani, intel-gfx@lists.freedesktop.org,
intel-xe@lists.freedesktop.org
Cc: Nikula, Jani
> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jani
> Nikula
> Sent: Tuesday, March 11, 2025 11:31 PM
> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nikula@intel.com>
> Subject: [PATCH 1/9] drm/i915/color: prefer display->platform.<platform> checks
>
> This let's us drop the dependency on i915_drv.h.
Looks Good to me.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_color.c | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_color.c
> b/drivers/gpu/drm/i915/display/intel_color.c
> index cfe14162231d..bbf6df7ebb95 100644
> --- a/drivers/gpu/drm/i915/display/intel_color.c
> +++ b/drivers/gpu/drm/i915/display/intel_color.c
> @@ -22,7 +22,7 @@
> *
> */
>
> -#include "i915_drv.h"
> +#include "i915_utils.h"
> #include "i9xx_plane_regs.h"
> #include "intel_color.h"
> #include "intel_color_regs.h"
> @@ -405,14 +405,13 @@ static void icl_read_csc(struct intel_crtc_state
> *crtc_state) static bool ilk_limited_range(const struct intel_crtc_state
> *crtc_state) {
> struct intel_display *display = to_intel_display(crtc_state);
> - struct drm_i915_private *i915 = to_i915(display->drm);
>
> /* icl+ have dedicated output CSC */
> if (DISPLAY_VER(display) >= 11)
> return false;
>
> /* pre-hsw have TRANSCONF_COLOR_RANGE_SELECT */
> - if (DISPLAY_VER(display) < 7 || IS_IVYBRIDGE(i915))
> + if (DISPLAY_VER(display) < 7 || display->platform.ivybridge)
> return false;
>
> return crtc_state->limited_color_range; @@ -516,7 +515,6 @@ static
> void ilk_csc_convert_ctm(const struct intel_crtc_state *crtc_state, static void
> ilk_assign_csc(struct intel_crtc_state *crtc_state) {
> struct intel_display *display = to_intel_display(crtc_state);
> - struct drm_i915_private *i915 = to_i915(display->drm);
> bool limited_color_range = ilk_csc_limited_range(crtc_state);
>
> if (crtc_state->hw.ctm) {
> @@ -538,7 +536,7 @@ static void ilk_assign_csc(struct intel_crtc_state
> *crtc_state)
> * LUT is needed but CSC is not we need to load an
> * identity matrix.
> */
> - drm_WARN_ON(display->drm, !IS_GEMINILAKE(i915));
> + drm_WARN_ON(display->drm, !display->platform.geminilake);
>
> ilk_csc_copy(display, &crtc_state->csc,
> &ilk_csc_matrix_identity);
> } else {
> @@ -3983,12 +3981,10 @@ int intel_color_init(struct intel_display *display)
>
> void intel_color_init_hooks(struct intel_display *display) {
> - struct drm_i915_private *i915 = to_i915(display->drm);
> -
> if (HAS_GMCH(display)) {
> - if (IS_CHERRYVIEW(i915))
> + if (display->platform.cherryview)
> display->funcs.color = &chv_color_funcs;
> - else if (IS_VALLEYVIEW(i915))
> + else if (display->platform.valleyview)
> display->funcs.color = &vlv_color_funcs;
> else if (DISPLAY_VER(display) >= 4)
> display->funcs.color = &i965_color_funcs; @@ -4005,7
> +4001,7 @@ void intel_color_init_hooks(struct intel_display *display)
> display->funcs.color = &skl_color_funcs;
> else if (DISPLAY_VER(display) == 8)
> display->funcs.color = &bdw_color_funcs;
> - else if (IS_HASWELL(i915))
> + else if (display->platform.haswell)
> display->funcs.color = &hsw_color_funcs;
> else if (DISPLAY_VER(display) == 7)
> display->funcs.color = &ivb_color_funcs;
> --
> 2.39.5
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 2/9] drm/i915/connector: convert intel_connector.c to struct intel_display
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
2025-03-11 18:00 ` [PATCH 1/9] drm/i915/color: prefer display->platform.<platform> checks Jani Nikula
@ 2025-03-11 18:00 ` Jani Nikula
2025-03-12 5:06 ` Shankar, Uma
2025-03-11 18:00 ` [PATCH 3/9] drm/i915/hotplug: convert intel_hotplug.[ch] " Jani Nikula
` (15 subsequent siblings)
17 siblings, 1 reply; 31+ messages in thread
From: Jani Nikula @ 2025-03-11 18:00 UTC (permalink / raw)
To: intel-gfx, intel-xe; +Cc: jani.nikula
Going forward, struct intel_display is the main display device data
pointer. Convert as much as possible of intel_connector.c to struct
intel_display. i915_inject_probe_failure() remains the only call that
requires i915 pointer.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../gpu/drm/i915/display/intel_connector.c | 45 ++++++++++---------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
index e42357bd9e80..6c81c9f2fd09 100644
--- a/drivers/gpu/drm/i915/display/intel_connector.c
+++ b/drivers/gpu/drm/i915/display/intel_connector.c
@@ -31,8 +31,10 @@
#include <drm/drm_probe_helper.h>
#include "i915_drv.h"
+#include "i915_utils.h"
#include "intel_backlight.h"
#include "intel_connector.h"
+#include "intel_display_core.h"
#include "intel_display_debugfs.h"
#include "intel_display_types.h"
#include "intel_hdcp.h"
@@ -154,13 +156,14 @@ void intel_connector_destroy(struct drm_connector *connector)
int intel_connector_register(struct drm_connector *connector)
{
struct intel_connector *intel_connector = to_intel_connector(connector);
+ struct drm_i915_private *i915 = to_i915(connector->dev);
int ret;
ret = intel_backlight_device_register(intel_connector);
if (ret)
goto err;
- if (i915_inject_probe_failure(to_i915(connector->dev))) {
+ if (i915_inject_probe_failure(i915)) {
ret = -EFAULT;
goto err_backlight;
}
@@ -204,10 +207,10 @@ bool intel_connector_get_hw_state(struct intel_connector *connector)
enum pipe intel_connector_get_pipe(struct intel_connector *connector)
{
- struct drm_device *dev = connector->base.dev;
+ struct intel_display *display = to_intel_display(connector);
- drm_WARN_ON(dev,
- !drm_modeset_is_locked(&dev->mode_config.connection_mutex));
+ drm_WARN_ON(display->drm,
+ !drm_modeset_is_locked(&display->drm->mode_config.connection_mutex));
if (!connector->base.state->crtc)
return INVALID_PIPE;
@@ -264,20 +267,19 @@ static const struct drm_prop_enum_list force_audio_names[] = {
void
intel_attach_force_audio_property(struct drm_connector *connector)
{
- struct drm_device *dev = connector->dev;
- struct drm_i915_private *dev_priv = to_i915(dev);
+ struct intel_display *display = to_intel_display(connector->dev);
struct drm_property *prop;
- prop = dev_priv->display.properties.force_audio;
+ prop = display->properties.force_audio;
if (prop == NULL) {
- prop = drm_property_create_enum(dev, 0,
- "audio",
- force_audio_names,
- ARRAY_SIZE(force_audio_names));
+ prop = drm_property_create_enum(display->drm, 0,
+ "audio",
+ force_audio_names,
+ ARRAY_SIZE(force_audio_names));
if (prop == NULL)
return;
- dev_priv->display.properties.force_audio = prop;
+ display->properties.force_audio = prop;
}
drm_object_attach_property(&connector->base, prop, 0);
}
@@ -291,20 +293,19 @@ static const struct drm_prop_enum_list broadcast_rgb_names[] = {
void
intel_attach_broadcast_rgb_property(struct drm_connector *connector)
{
- struct drm_device *dev = connector->dev;
- struct drm_i915_private *dev_priv = to_i915(dev);
+ struct intel_display *display = to_intel_display(connector->dev);
struct drm_property *prop;
- prop = dev_priv->display.properties.broadcast_rgb;
+ prop = display->properties.broadcast_rgb;
if (prop == NULL) {
- prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,
- "Broadcast RGB",
- broadcast_rgb_names,
- ARRAY_SIZE(broadcast_rgb_names));
+ prop = drm_property_create_enum(display->drm, DRM_MODE_PROP_ENUM,
+ "Broadcast RGB",
+ broadcast_rgb_names,
+ ARRAY_SIZE(broadcast_rgb_names));
if (prop == NULL)
return;
- dev_priv->display.properties.broadcast_rgb = prop;
+ display->properties.broadcast_rgb = prop;
}
drm_object_attach_property(&connector->base, prop, 0);
@@ -336,14 +337,14 @@ intel_attach_dp_colorspace_property(struct drm_connector *connector)
void
intel_attach_scaling_mode_property(struct drm_connector *connector)
{
- struct drm_i915_private *i915 = to_i915(connector->dev);
+ struct intel_display *display = to_intel_display(connector->dev);
u32 scaling_modes;
scaling_modes = BIT(DRM_MODE_SCALE_ASPECT) |
BIT(DRM_MODE_SCALE_FULLSCREEN);
/* On GMCH platforms borders are only possible on the LVDS port */
- if (!HAS_GMCH(i915) || connector->connector_type == DRM_MODE_CONNECTOR_LVDS)
+ if (!HAS_GMCH(display) || connector->connector_type == DRM_MODE_CONNECTOR_LVDS)
scaling_modes |= BIT(DRM_MODE_SCALE_CENTER);
drm_connector_attach_scaling_mode_property(connector, scaling_modes);
--
2.39.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* RE: [PATCH 2/9] drm/i915/connector: convert intel_connector.c to struct intel_display
2025-03-11 18:00 ` [PATCH 2/9] drm/i915/connector: convert intel_connector.c to struct intel_display Jani Nikula
@ 2025-03-12 5:06 ` Shankar, Uma
0 siblings, 0 replies; 31+ messages in thread
From: Shankar, Uma @ 2025-03-12 5:06 UTC (permalink / raw)
To: Nikula, Jani, intel-gfx@lists.freedesktop.org,
intel-xe@lists.freedesktop.org
Cc: Nikula, Jani
> -----Original Message-----
> From: Intel-xe <intel-xe-bounces@lists.freedesktop.org> On Behalf Of Jani Nikula
> Sent: Tuesday, March 11, 2025 11:31 PM
> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nikula@intel.com>
> Subject: [PATCH 2/9] drm/i915/connector: convert intel_connector.c to struct
> intel_display
>
> Going forward, struct intel_display is the main display device data pointer.
> Convert as much as possible of intel_connector.c to struct intel_display.
> i915_inject_probe_failure() remains the only call that requires i915 pointer.
Looks Good to me.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> .../gpu/drm/i915/display/intel_connector.c | 45 ++++++++++---------
> 1 file changed, 23 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_connector.c
> b/drivers/gpu/drm/i915/display/intel_connector.c
> index e42357bd9e80..6c81c9f2fd09 100644
> --- a/drivers/gpu/drm/i915/display/intel_connector.c
> +++ b/drivers/gpu/drm/i915/display/intel_connector.c
> @@ -31,8 +31,10 @@
> #include <drm/drm_probe_helper.h>
>
> #include "i915_drv.h"
> +#include "i915_utils.h"
> #include "intel_backlight.h"
> #include "intel_connector.h"
> +#include "intel_display_core.h"
> #include "intel_display_debugfs.h"
> #include "intel_display_types.h"
> #include "intel_hdcp.h"
> @@ -154,13 +156,14 @@ void intel_connector_destroy(struct drm_connector
> *connector) int intel_connector_register(struct drm_connector *connector) {
> struct intel_connector *intel_connector = to_intel_connector(connector);
> + struct drm_i915_private *i915 = to_i915(connector->dev);
> int ret;
>
> ret = intel_backlight_device_register(intel_connector);
> if (ret)
> goto err;
>
> - if (i915_inject_probe_failure(to_i915(connector->dev))) {
> + if (i915_inject_probe_failure(i915)) {
> ret = -EFAULT;
> goto err_backlight;
> }
> @@ -204,10 +207,10 @@ bool intel_connector_get_hw_state(struct
> intel_connector *connector)
>
> enum pipe intel_connector_get_pipe(struct intel_connector *connector) {
> - struct drm_device *dev = connector->base.dev;
> + struct intel_display *display = to_intel_display(connector);
>
> - drm_WARN_ON(dev,
> - !drm_modeset_is_locked(&dev-
> >mode_config.connection_mutex));
> + drm_WARN_ON(display->drm,
> +
> +!drm_modeset_is_locked(&display->drm->mode_config.connection_mutex));
>
> if (!connector->base.state->crtc)
> return INVALID_PIPE;
> @@ -264,20 +267,19 @@ static const struct drm_prop_enum_list
> force_audio_names[] = { void intel_attach_force_audio_property(struct
> drm_connector *connector) {
> - struct drm_device *dev = connector->dev;
> - struct drm_i915_private *dev_priv = to_i915(dev);
> + struct intel_display *display = to_intel_display(connector->dev);
> struct drm_property *prop;
>
> - prop = dev_priv->display.properties.force_audio;
> + prop = display->properties.force_audio;
> if (prop == NULL) {
> - prop = drm_property_create_enum(dev, 0,
> - "audio",
> - force_audio_names,
> - ARRAY_SIZE(force_audio_names));
> + prop = drm_property_create_enum(display->drm, 0,
> + "audio",
> + force_audio_names,
> +
> ARRAY_SIZE(force_audio_names));
> if (prop == NULL)
> return;
>
> - dev_priv->display.properties.force_audio = prop;
> + display->properties.force_audio = prop;
> }
> drm_object_attach_property(&connector->base, prop, 0); } @@ -291,20
> +293,19 @@ static const struct drm_prop_enum_list broadcast_rgb_names[] = {
> void intel_attach_broadcast_rgb_property(struct drm_connector *connector) {
> - struct drm_device *dev = connector->dev;
> - struct drm_i915_private *dev_priv = to_i915(dev);
> + struct intel_display *display = to_intel_display(connector->dev);
> struct drm_property *prop;
>
> - prop = dev_priv->display.properties.broadcast_rgb;
> + prop = display->properties.broadcast_rgb;
> if (prop == NULL) {
> - prop = drm_property_create_enum(dev,
> DRM_MODE_PROP_ENUM,
> - "Broadcast RGB",
> - broadcast_rgb_names,
> - ARRAY_SIZE(broadcast_rgb_names));
> + prop = drm_property_create_enum(display->drm,
> DRM_MODE_PROP_ENUM,
> + "Broadcast RGB",
> + broadcast_rgb_names,
> +
> ARRAY_SIZE(broadcast_rgb_names));
> if (prop == NULL)
> return;
>
> - dev_priv->display.properties.broadcast_rgb = prop;
> + display->properties.broadcast_rgb = prop;
> }
>
> drm_object_attach_property(&connector->base, prop, 0); @@ -336,14
> +337,14 @@ intel_attach_dp_colorspace_property(struct drm_connector
> *connector) void intel_attach_scaling_mode_property(struct drm_connector
> *connector) {
> - struct drm_i915_private *i915 = to_i915(connector->dev);
> + struct intel_display *display = to_intel_display(connector->dev);
> u32 scaling_modes;
>
> scaling_modes = BIT(DRM_MODE_SCALE_ASPECT) |
> BIT(DRM_MODE_SCALE_FULLSCREEN);
>
> /* On GMCH platforms borders are only possible on the LVDS port */
> - if (!HAS_GMCH(i915) || connector->connector_type ==
> DRM_MODE_CONNECTOR_LVDS)
> + if (!HAS_GMCH(display) || connector->connector_type ==
> +DRM_MODE_CONNECTOR_LVDS)
> scaling_modes |= BIT(DRM_MODE_SCALE_CENTER);
>
> drm_connector_attach_scaling_mode_property(connector,
> scaling_modes);
> --
> 2.39.5
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 3/9] drm/i915/hotplug: convert intel_hotplug.[ch] to struct intel_display
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
2025-03-11 18:00 ` [PATCH 1/9] drm/i915/color: prefer display->platform.<platform> checks Jani Nikula
2025-03-11 18:00 ` [PATCH 2/9] drm/i915/connector: convert intel_connector.c to struct intel_display Jani Nikula
@ 2025-03-11 18:00 ` Jani Nikula
2025-03-12 5:13 ` Shankar, Uma
2025-03-11 18:00 ` [PATCH 4/9] drm/i915/hotplug: convert hotplug debugfs " Jani Nikula
` (14 subsequent siblings)
17 siblings, 1 reply; 31+ messages in thread
From: Jani Nikula @ 2025-03-11 18:00 UTC (permalink / raw)
To: intel-gfx, intel-xe; +Cc: jani.nikula
Going forward, struct intel_display is the main display device data
pointer. Convert as much as possible of intel_hotplug.[ch] to struct
intel_display.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../drm/i915/display/intel_display_debugfs.c | 2 +-
.../drm/i915/display/intel_display_driver.c | 14 +-
.../i915/display/intel_display_power_well.c | 6 +-
.../drm/i915/display/intel_display_reset.c | 4 +-
drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
drivers/gpu/drm/i915/display/intel_hotplug.c | 332 ++++++++++--------
drivers/gpu/drm/i915/display/intel_hotplug.h | 26 +-
.../gpu/drm/i915/display/intel_hotplug_irq.c | 24 +-
drivers/gpu/drm/i915/i915_driver.c | 14 +-
drivers/gpu/drm/i915/i915_irq.c | 3 +-
drivers/gpu/drm/xe/display/xe_display.c | 26 +-
11 files changed, 240 insertions(+), 213 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index fdedf65bee53..f42b5a69eed5 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -844,7 +844,7 @@ void intel_display_debugfs_register(struct intel_display *display)
intel_dmc_debugfs_register(display);
intel_dp_test_debugfs_register(display);
intel_fbc_debugfs_register(display);
- intel_hpd_debugfs_register(i915);
+ intel_hpd_debugfs_register(display);
intel_opregion_debugfs_register(display);
intel_psr_debugfs_register(display);
intel_wm_debugfs_register(i915);
diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 31740a677dd8..ae60ccb21520 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -315,11 +315,9 @@ static void set_display_access(struct intel_display *display,
*/
void intel_display_driver_enable_user_access(struct intel_display *display)
{
- struct drm_i915_private *i915 = to_i915(display->drm);
-
set_display_access(display, true, NULL);
- intel_hpd_enable_detection_work(i915);
+ intel_hpd_enable_detection_work(display);
}
/**
@@ -341,9 +339,7 @@ void intel_display_driver_enable_user_access(struct intel_display *display)
*/
void intel_display_driver_disable_user_access(struct intel_display *display)
{
- struct drm_i915_private *i915 = to_i915(display->drm);
-
- intel_hpd_disable_detection_work(i915);
+ intel_hpd_disable_detection_work(display);
set_display_access(display, false, current);
}
@@ -524,7 +520,7 @@ int intel_display_driver_probe(struct intel_display *display)
intel_overlay_setup(display);
/* Only enable hotplug handling once the fbdev is fully set up. */
- intel_hpd_init(i915);
+ intel_hpd_init(display);
skl_watermark_ipc_init(i915);
@@ -558,7 +554,7 @@ void intel_display_driver_register(struct intel_display *display)
* fbdev->async_cookie.
*/
drm_kms_helper_poll_init(display->drm);
- intel_hpd_poll_disable(i915);
+ intel_hpd_poll_disable(display);
intel_fbdev_setup(i915);
@@ -600,7 +596,7 @@ void intel_display_driver_remove_noirq(struct intel_display *display)
* Due to the hpd irq storm handling the hotplug work can re-arm the
* poll handlers. Hence disable polling after hpd handling is shut down.
*/
- intel_hpd_poll_fini(i915);
+ intel_hpd_poll_fini(display);
intel_unregister_dsm_handler();
diff --git a/drivers/gpu/drm/i915/display/intel_display_power_well.c b/drivers/gpu/drm/i915/display/intel_display_power_well.c
index 8ec87ffd87d2..daf2a0cbb157 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
@@ -1236,8 +1236,8 @@ static void vlv_display_power_well_init(struct intel_display *display)
if (display->power.domains.initializing)
return;
- intel_hpd_init(dev_priv);
- intel_hpd_poll_disable(dev_priv);
+ intel_hpd_init(display);
+ intel_hpd_poll_disable(display);
/* Re-enable the ADPA, if we have one */
for_each_intel_encoder(display->drm, encoder) {
@@ -1265,7 +1265,7 @@ static void vlv_display_power_well_deinit(struct intel_display *display)
/* Prevent us from re-enabling polling on accident in late suspend */
if (!display->drm->dev->power.is_suspended)
- intel_hpd_poll_enable(dev_priv);
+ intel_hpd_poll_enable(display);
}
static void vlv_display_power_well_enable(struct intel_display *display,
diff --git a/drivers/gpu/drm/i915/display/intel_display_reset.c b/drivers/gpu/drm/i915/display/intel_display_reset.c
index 1f2798404f2c..1dbd3e841df3 100644
--- a/drivers/gpu/drm/i915/display/intel_display_reset.c
+++ b/drivers/gpu/drm/i915/display/intel_display_reset.c
@@ -107,14 +107,14 @@ void intel_display_reset_finish(struct intel_display *display, bool test_only)
intel_display_driver_init_hw(display);
intel_clock_gating_init(i915);
intel_cx0_pll_power_save_wa(display);
- intel_hpd_init(i915);
+ intel_hpd_init(display);
ret = __intel_display_driver_resume(display, state, ctx);
if (ret)
drm_err(display->drm,
"Restoring old state failed with %i\n", ret);
- intel_hpd_poll_disable(i915);
+ intel_hpd_poll_disable(display);
}
drm_atomic_state_put(state);
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index a236b5fc7a3d..7d074770d793 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -6117,7 +6117,7 @@ static void intel_dp_oob_hotplug_event(struct drm_connector *connector,
spin_unlock_irq(&i915->irq_lock);
if (need_work)
- intel_hpd_schedule_detection(i915);
+ intel_hpd_schedule_detection(display);
}
static const struct drm_connector_funcs intel_dp_connector_funcs = {
diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
index c69b1f5fd160..9bde28ce1979 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
@@ -118,7 +118,7 @@ intel_connector_hpd_pin(struct intel_connector *connector)
/**
* intel_hpd_irq_storm_detect - gather stats and detect HPD IRQ storm on a pin
- * @dev_priv: private driver data pointer
+ * @display: display device
* @pin: the pin to gather stats on
* @long_hpd: whether the HPD IRQ was long or short
*
@@ -127,13 +127,13 @@ intel_connector_hpd_pin(struct intel_connector *connector)
* responsible for further action.
*
* The number of IRQs that are allowed within @HPD_STORM_DETECT_PERIOD is
- * stored in @dev_priv->display.hotplug.hpd_storm_threshold which defaults to
+ * stored in @display->hotplug.hpd_storm_threshold which defaults to
* @HPD_STORM_DEFAULT_THRESHOLD. Long IRQs count as +10 to this threshold, and
* short IRQs count as +1. If this threshold is exceeded, it's considered an
* IRQ storm and the IRQ state is set to @HPD_MARK_DISABLED.
*
* By default, most systems will only count long IRQs towards
- * &dev_priv->display.hotplug.hpd_storm_threshold. However, some older systems also
+ * &display->hotplug.hpd_storm_threshold. However, some older systems also
* suffer from short IRQ storms and must also track these. Because short IRQ
* storms are naturally caused by sideband interactions with DP MST devices,
* short IRQ detection is only enabled for systems without DP MST support.
@@ -145,10 +145,10 @@ intel_connector_hpd_pin(struct intel_connector *connector)
*
* Return true if an IRQ storm was detected on @pin.
*/
-static bool intel_hpd_irq_storm_detect(struct drm_i915_private *dev_priv,
+static bool intel_hpd_irq_storm_detect(struct intel_display *display,
enum hpd_pin pin, bool long_hpd)
{
- struct intel_hotplug *hpd = &dev_priv->display.hotplug;
+ struct intel_hotplug *hpd = &display->hotplug;
unsigned long start = hpd->stats[pin].last_jiffies;
unsigned long end = start + msecs_to_jiffies(HPD_STORM_DETECT_PERIOD);
const int increment = long_hpd ? 10 : 1;
@@ -156,7 +156,7 @@ static bool intel_hpd_irq_storm_detect(struct drm_i915_private *dev_priv,
bool storm = false;
if (!threshold ||
- (!long_hpd && !dev_priv->display.hotplug.hpd_short_storm_enabled))
+ (!long_hpd && !display->hotplug.hpd_short_storm_enabled))
return false;
if (!time_in_range(jiffies, start, end)) {
@@ -167,11 +167,11 @@ static bool intel_hpd_irq_storm_detect(struct drm_i915_private *dev_priv,
hpd->stats[pin].count += increment;
if (hpd->stats[pin].count > threshold) {
hpd->stats[pin].state = HPD_MARK_DISABLED;
- drm_dbg_kms(&dev_priv->drm,
+ drm_dbg_kms(display->drm,
"HPD interrupt storm detected on PIN %d\n", pin);
storm = true;
} else {
- drm_dbg_kms(&dev_priv->drm,
+ drm_dbg_kms(display->drm,
"Received HPD interrupt on PIN %d - cnt: %d\n",
pin,
hpd->stats[pin].count);
@@ -180,56 +180,65 @@ static bool intel_hpd_irq_storm_detect(struct drm_i915_private *dev_priv,
return storm;
}
-static bool detection_work_enabled(struct drm_i915_private *i915)
+static bool detection_work_enabled(struct intel_display *display)
{
+ struct drm_i915_private *i915 = to_i915(display->drm);
+
lockdep_assert_held(&i915->irq_lock);
- return i915->display.hotplug.detection_work_enabled;
+ return display->hotplug.detection_work_enabled;
}
static bool
-mod_delayed_detection_work(struct drm_i915_private *i915, struct delayed_work *work, int delay)
+mod_delayed_detection_work(struct intel_display *display, struct delayed_work *work, int delay)
{
+ struct drm_i915_private *i915 = to_i915(display->drm);
+
lockdep_assert_held(&i915->irq_lock);
- if (!detection_work_enabled(i915))
+ if (!detection_work_enabled(display))
return false;
return mod_delayed_work(i915->unordered_wq, work, delay);
}
static bool
-queue_delayed_detection_work(struct drm_i915_private *i915, struct delayed_work *work, int delay)
+queue_delayed_detection_work(struct intel_display *display, struct delayed_work *work, int delay)
{
+ struct drm_i915_private *i915 = to_i915(display->drm);
+
lockdep_assert_held(&i915->irq_lock);
- if (!detection_work_enabled(i915))
+ if (!detection_work_enabled(display))
return false;
return queue_delayed_work(i915->unordered_wq, work, delay);
}
static bool
-queue_detection_work(struct drm_i915_private *i915, struct work_struct *work)
+queue_detection_work(struct intel_display *display, struct work_struct *work)
{
+ struct drm_i915_private *i915 = to_i915(display->drm);
+
lockdep_assert_held(&i915->irq_lock);
- if (!detection_work_enabled(i915))
+ if (!detection_work_enabled(display))
return false;
return queue_work(i915->unordered_wq, work);
}
static void
-intel_hpd_irq_storm_switch_to_polling(struct drm_i915_private *dev_priv)
+intel_hpd_irq_storm_switch_to_polling(struct intel_display *display)
{
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
struct drm_connector_list_iter conn_iter;
struct intel_connector *connector;
bool hpd_disabled = false;
lockdep_assert_held(&dev_priv->irq_lock);
- drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter);
+ drm_connector_list_iter_begin(display->drm, &conn_iter);
for_each_intel_connector_iter(connector, &conn_iter) {
enum hpd_pin pin;
@@ -238,15 +247,15 @@ intel_hpd_irq_storm_switch_to_polling(struct drm_i915_private *dev_priv)
pin = intel_connector_hpd_pin(connector);
if (pin == HPD_NONE ||
- dev_priv->display.hotplug.stats[pin].state != HPD_MARK_DISABLED)
+ display->hotplug.stats[pin].state != HPD_MARK_DISABLED)
continue;
- drm_info(&dev_priv->drm,
+ drm_info(display->drm,
"HPD interrupt storm detected on connector %s: "
"switching from hotplug detection to polling\n",
connector->base.name);
- dev_priv->display.hotplug.stats[pin].state = HPD_DISABLED;
+ display->hotplug.stats[pin].state = HPD_DISABLED;
connector->base.polled = DRM_CONNECTOR_POLL_CONNECT |
DRM_CONNECTOR_POLL_DISCONNECT;
hpd_disabled = true;
@@ -255,18 +264,18 @@ intel_hpd_irq_storm_switch_to_polling(struct drm_i915_private *dev_priv)
/* Enable polling and queue hotplug re-enabling. */
if (hpd_disabled) {
- drm_kms_helper_poll_reschedule(&dev_priv->drm);
- mod_delayed_detection_work(dev_priv,
- &dev_priv->display.hotplug.reenable_work,
+ drm_kms_helper_poll_reschedule(display->drm);
+ mod_delayed_detection_work(display,
+ &display->hotplug.reenable_work,
msecs_to_jiffies(HPD_STORM_REENABLE_DELAY));
}
}
static void intel_hpd_irq_storm_reenable_work(struct work_struct *work)
{
- struct drm_i915_private *dev_priv =
- container_of(work, typeof(*dev_priv),
- display.hotplug.reenable_work.work);
+ struct intel_display *display =
+ container_of(work, typeof(*display), hotplug.reenable_work.work);
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
struct drm_connector_list_iter conn_iter;
struct intel_connector *connector;
intel_wakeref_t wakeref;
@@ -276,15 +285,15 @@ static void intel_hpd_irq_storm_reenable_work(struct work_struct *work)
spin_lock_irq(&dev_priv->irq_lock);
- drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter);
+ drm_connector_list_iter_begin(display->drm, &conn_iter);
for_each_intel_connector_iter(connector, &conn_iter) {
pin = intel_connector_hpd_pin(connector);
if (pin == HPD_NONE ||
- dev_priv->display.hotplug.stats[pin].state != HPD_DISABLED)
+ display->hotplug.stats[pin].state != HPD_DISABLED)
continue;
if (connector->base.polled != connector->polled)
- drm_dbg(&dev_priv->drm,
+ drm_dbg(display->drm,
"Reenabling HPD on connector %s\n",
connector->base.name);
connector->base.polled = connector->polled;
@@ -292,8 +301,8 @@ static void intel_hpd_irq_storm_reenable_work(struct work_struct *work)
drm_connector_list_iter_end(&conn_iter);
for_each_hpd_pin(pin) {
- if (dev_priv->display.hotplug.stats[pin].state == HPD_DISABLED)
- dev_priv->display.hotplug.stats[pin].state = HPD_ENABLED;
+ if (display->hotplug.stats[pin].state == HPD_DISABLED)
+ display->hotplug.stats[pin].state = HPD_ENABLED;
}
intel_hpd_irq_setup(dev_priv);
@@ -407,7 +416,7 @@ static void i915_digport_work_func(struct work_struct *work)
spin_unlock_irq(&dev_priv->irq_lock);
- for_each_intel_encoder(&dev_priv->drm, encoder) {
+ for_each_intel_encoder(display->drm, encoder) {
struct intel_digital_port *dig_port;
enum hpd_pin pin = encoder->hpd_pin;
bool long_hpd, short_hpd;
@@ -433,9 +442,9 @@ static void i915_digport_work_func(struct work_struct *work)
if (old_bits) {
spin_lock_irq(&dev_priv->irq_lock);
- dev_priv->display.hotplug.event_bits |= old_bits;
- queue_delayed_detection_work(dev_priv,
- &dev_priv->display.hotplug.hotplug_work, 0);
+ display->hotplug.event_bits |= old_bits;
+ queue_delayed_detection_work(display,
+ &display->hotplug.hotplug_work, 0);
spin_unlock_irq(&dev_priv->irq_lock);
}
}
@@ -481,8 +490,8 @@ static void i915_hotplug_work_func(struct work_struct *work)
int changed_connectors = 0;
u32 blocked_hpd_pin_mask;
- mutex_lock(&dev_priv->drm.mode_config.mutex);
- drm_dbg_kms(&dev_priv->drm, "running encoder hotplug functions\n");
+ mutex_lock(&display->drm->mode_config.mutex);
+ drm_dbg_kms(display->drm, "running encoder hotplug functions\n");
spin_lock_irq(&dev_priv->irq_lock);
@@ -493,18 +502,18 @@ static void i915_hotplug_work_func(struct work_struct *work)
hotplug->retry_bits &= ~hpd_retry_bits;
/* Enable polling for connectors which had HPD IRQ storms */
- intel_hpd_irq_storm_switch_to_polling(dev_priv);
+ intel_hpd_irq_storm_switch_to_polling(display);
spin_unlock_irq(&dev_priv->irq_lock);
/* Skip calling encode hotplug handlers if ignore long HPD set*/
- if (dev_priv->display.hotplug.ignore_long_hpd) {
- drm_dbg_kms(&dev_priv->drm, "Ignore HPD flag on - skip encoder hotplug handlers\n");
- mutex_unlock(&dev_priv->drm.mode_config.mutex);
+ if (display->hotplug.ignore_long_hpd) {
+ drm_dbg_kms(display->drm, "Ignore HPD flag on - skip encoder hotplug handlers\n");
+ mutex_unlock(&display->drm->mode_config.mutex);
return;
}
- drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter);
+ drm_connector_list_iter_begin(display->drm, &conn_iter);
for_each_intel_connector_iter(connector, &conn_iter) {
enum hpd_pin pin;
u32 hpd_bit;
@@ -523,7 +532,7 @@ static void i915_hotplug_work_func(struct work_struct *work)
else
connector->hotplug_retries++;
- drm_dbg_kms(&dev_priv->drm,
+ drm_dbg_kms(display->drm,
"Connector %s (pin %i) received hotplug event. (retry %d)\n",
connector->base.name, pin,
connector->hotplug_retries);
@@ -546,12 +555,12 @@ static void i915_hotplug_work_func(struct work_struct *work)
}
}
drm_connector_list_iter_end(&conn_iter);
- mutex_unlock(&dev_priv->drm.mode_config.mutex);
+ mutex_unlock(&display->drm->mode_config.mutex);
if (changed_connectors == 1)
drm_kms_helper_connector_hotplug_event(first_changed_connector);
else if (changed_connectors > 0)
- drm_kms_helper_hotplug_event(&dev_priv->drm);
+ drm_kms_helper_hotplug_event(display->drm);
if (first_changed_connector)
drm_connector_put(first_changed_connector);
@@ -560,10 +569,10 @@ static void i915_hotplug_work_func(struct work_struct *work)
retry &= ~changed;
if (retry) {
spin_lock_irq(&dev_priv->irq_lock);
- dev_priv->display.hotplug.retry_bits |= retry;
+ display->hotplug.retry_bits |= retry;
- mod_delayed_detection_work(dev_priv,
- &dev_priv->display.hotplug.hotplug_work,
+ mod_delayed_detection_work(display,
+ &display->hotplug.hotplug_work,
msecs_to_jiffies(HPD_RETRY_DELAY));
spin_unlock_irq(&dev_priv->irq_lock);
}
@@ -572,7 +581,7 @@ static void i915_hotplug_work_func(struct work_struct *work)
/**
* intel_hpd_irq_handler - main hotplug irq handler
- * @dev_priv: drm_i915_private
+ * @display: display device
* @pin_mask: a mask of hpd pins that have triggered the irq
* @long_mask: a mask of hpd pins that may be long hpd pulses
*
@@ -586,10 +595,10 @@ static void i915_hotplug_work_func(struct work_struct *work)
* Here, we do hotplug irq storm detection and mitigation, and pass further
* processing to appropriate bottom halves.
*/
-void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
+void intel_hpd_irq_handler(struct intel_display *display,
u32 pin_mask, u32 long_mask)
{
- struct intel_display *display = to_intel_display(&dev_priv->drm);
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
struct intel_encoder *encoder;
bool storm_detected = false;
bool queue_dig = false, queue_hp = false;
@@ -608,7 +617,7 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
* as each pin may have up to two encoders (HDMI and DP) and
* only the one of them (DP) will have ->hpd_pulse().
*/
- for_each_intel_encoder(&dev_priv->drm, encoder) {
+ for_each_intel_encoder(display->drm, encoder) {
bool long_hpd;
pin = encoder->hpd_pin;
@@ -620,7 +629,7 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
long_hpd = long_mask & BIT(pin);
- drm_dbg(&dev_priv->drm,
+ drm_dbg(display->drm,
"digital hpd on [ENCODER:%d:%s] - %s\n",
encoder->base.base.id, encoder->base.name,
long_hpd ? "long" : "short");
@@ -630,10 +639,10 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
if (long_hpd) {
long_hpd_pulse_mask |= BIT(pin);
- dev_priv->display.hotplug.long_hpd_pin_mask |= BIT(pin);
+ display->hotplug.long_hpd_pin_mask |= BIT(pin);
} else {
short_hpd_pulse_mask |= BIT(pin);
- dev_priv->display.hotplug.short_hpd_pin_mask |= BIT(pin);
+ display->hotplug.short_hpd_pin_mask |= BIT(pin);
}
}
@@ -644,20 +653,20 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
if (!(BIT(pin) & pin_mask))
continue;
- if (dev_priv->display.hotplug.stats[pin].state == HPD_DISABLED) {
+ if (display->hotplug.stats[pin].state == HPD_DISABLED) {
/*
* On GMCH platforms the interrupt mask bits only
* prevent irq generation, not the setting of the
* hotplug bits itself. So only WARN about unexpected
* interrupts on saner platforms.
*/
- drm_WARN_ONCE(&dev_priv->drm, !HAS_GMCH(dev_priv),
+ drm_WARN_ONCE(display->drm, !HAS_GMCH(display),
"Received HPD interrupt on pin %d although disabled\n",
pin);
continue;
}
- if (dev_priv->display.hotplug.stats[pin].state != HPD_ENABLED)
+ if (display->hotplug.stats[pin].state != HPD_ENABLED)
continue;
/*
@@ -668,15 +677,15 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
if (((short_hpd_pulse_mask | long_hpd_pulse_mask) & BIT(pin))) {
long_hpd = long_hpd_pulse_mask & BIT(pin);
} else {
- dev_priv->display.hotplug.event_bits |= BIT(pin);
+ display->hotplug.event_bits |= BIT(pin);
long_hpd = true;
if (!hpd_pin_is_blocked(display, pin))
queue_hp = true;
}
- if (intel_hpd_irq_storm_detect(dev_priv, pin, long_hpd)) {
- dev_priv->display.hotplug.event_bits &= ~BIT(pin);
+ if (intel_hpd_irq_storm_detect(display, pin, long_hpd)) {
+ display->hotplug.event_bits &= ~BIT(pin);
storm_detected = true;
queue_hp = true;
}
@@ -696,17 +705,17 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
* deadlock.
*/
if (queue_dig)
- queue_work(dev_priv->display.hotplug.dp_wq, &dev_priv->display.hotplug.dig_port_work);
+ queue_work(display->hotplug.dp_wq, &display->hotplug.dig_port_work);
if (queue_hp)
- queue_delayed_detection_work(dev_priv,
- &dev_priv->display.hotplug.hotplug_work, 0);
+ queue_delayed_detection_work(display,
+ &display->hotplug.hotplug_work, 0);
spin_unlock(&dev_priv->irq_lock);
}
/**
* intel_hpd_init - initializes and enables hpd support
- * @dev_priv: i915 device instance
+ * @display: display device instance
*
* This function enables the hotplug support. It requires that interrupts have
* already been enabled with intel_irq_init_hw(). From this point on hotplug and
@@ -718,16 +727,17 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
*
* Also see: intel_hpd_poll_enable() and intel_hpd_poll_disable().
*/
-void intel_hpd_init(struct drm_i915_private *dev_priv)
+void intel_hpd_init(struct intel_display *display)
{
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
int i;
- if (!HAS_DISPLAY(dev_priv))
+ if (!HAS_DISPLAY(display))
return;
for_each_hpd_pin(i) {
- dev_priv->display.hotplug.stats[i].count = 0;
- dev_priv->display.hotplug.stats[i].state = HPD_ENABLED;
+ display->hotplug.stats[i].count = 0;
+ display->hotplug.stats[i].state = HPD_ENABLED;
}
/*
@@ -739,19 +749,19 @@ void intel_hpd_init(struct drm_i915_private *dev_priv)
spin_unlock_irq(&dev_priv->irq_lock);
}
-static void i915_hpd_poll_detect_connectors(struct drm_i915_private *i915)
+static void i915_hpd_poll_detect_connectors(struct intel_display *display)
{
struct drm_connector_list_iter conn_iter;
struct intel_connector *connector;
struct intel_connector *first_changed_connector = NULL;
int changed = 0;
- mutex_lock(&i915->drm.mode_config.mutex);
+ mutex_lock(&display->drm->mode_config.mutex);
- if (!i915->drm.mode_config.poll_enabled)
+ if (!display->drm->mode_config.poll_enabled)
goto out;
- drm_connector_list_iter_begin(&i915->drm, &conn_iter);
+ drm_connector_list_iter_begin(display->drm, &conn_iter);
for_each_intel_connector_iter(connector, &conn_iter) {
if (!(connector->base.polled & DRM_CONNECTOR_POLL_HPD))
continue;
@@ -769,7 +779,7 @@ static void i915_hpd_poll_detect_connectors(struct drm_i915_private *i915)
drm_connector_list_iter_end(&conn_iter);
out:
- mutex_unlock(&i915->drm.mode_config.mutex);
+ mutex_unlock(&display->drm->mode_config.mutex);
if (!changed)
return;
@@ -777,25 +787,24 @@ static void i915_hpd_poll_detect_connectors(struct drm_i915_private *i915)
if (changed == 1)
drm_kms_helper_connector_hotplug_event(&first_changed_connector->base);
else
- drm_kms_helper_hotplug_event(&i915->drm);
+ drm_kms_helper_hotplug_event(display->drm);
drm_connector_put(&first_changed_connector->base);
}
static void i915_hpd_poll_init_work(struct work_struct *work)
{
- struct drm_i915_private *dev_priv =
- container_of(work, struct drm_i915_private,
- display.hotplug.poll_init_work);
- struct intel_display *display = &dev_priv->display;
+ struct intel_display *display =
+ container_of(work, typeof(*display), hotplug.poll_init_work);
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
struct drm_connector_list_iter conn_iter;
struct intel_connector *connector;
intel_wakeref_t wakeref;
bool enabled;
- mutex_lock(&dev_priv->drm.mode_config.mutex);
+ mutex_lock(&display->drm->mode_config.mutex);
- enabled = READ_ONCE(dev_priv->display.hotplug.poll_enabled);
+ enabled = READ_ONCE(display->hotplug.poll_enabled);
/*
* Prevent taking a power reference from this sequence of
* i915_hpd_poll_init_work() -> drm_helper_hpd_irq_event() ->
@@ -805,14 +814,14 @@ static void i915_hpd_poll_init_work(struct work_struct *work)
if (!enabled) {
wakeref = intel_display_power_get(display,
POWER_DOMAIN_DISPLAY_CORE);
- drm_WARN_ON(&dev_priv->drm,
- READ_ONCE(dev_priv->display.hotplug.poll_enabled));
- cancel_work(&dev_priv->display.hotplug.poll_init_work);
+ drm_WARN_ON(display->drm,
+ READ_ONCE(display->hotplug.poll_enabled));
+ cancel_work(&display->hotplug.poll_init_work);
}
spin_lock_irq(&dev_priv->irq_lock);
- drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter);
+ drm_connector_list_iter_begin(display->drm, &conn_iter);
for_each_intel_connector_iter(connector, &conn_iter) {
enum hpd_pin pin;
@@ -820,7 +829,7 @@ static void i915_hpd_poll_init_work(struct work_struct *work)
if (pin == HPD_NONE)
continue;
- if (dev_priv->display.hotplug.stats[pin].state == HPD_DISABLED)
+ if (display->hotplug.stats[pin].state == HPD_DISABLED)
continue;
connector->base.polled = connector->polled;
@@ -834,16 +843,16 @@ static void i915_hpd_poll_init_work(struct work_struct *work)
spin_unlock_irq(&dev_priv->irq_lock);
if (enabled)
- drm_kms_helper_poll_reschedule(&dev_priv->drm);
+ drm_kms_helper_poll_reschedule(display->drm);
- mutex_unlock(&dev_priv->drm.mode_config.mutex);
+ mutex_unlock(&display->drm->mode_config.mutex);
/*
* We might have missed any hotplugs that happened while we were
* in the middle of disabling polling
*/
if (!enabled) {
- i915_hpd_poll_detect_connectors(dev_priv);
+ i915_hpd_poll_detect_connectors(display);
intel_display_power_put(display,
POWER_DOMAIN_DISPLAY_CORE,
@@ -853,7 +862,7 @@ static void i915_hpd_poll_init_work(struct work_struct *work)
/**
* intel_hpd_poll_enable - enable polling for connectors with hpd
- * @dev_priv: i915 device instance
+ * @display: display device instance
*
* This function enables polling for all connectors which support HPD.
* Under certain conditions HPD may not be functional. On most Intel GPUs,
@@ -867,15 +876,14 @@ static void i915_hpd_poll_init_work(struct work_struct *work)
*
* Also see: intel_hpd_init() and intel_hpd_poll_disable().
*/
-void intel_hpd_poll_enable(struct drm_i915_private *dev_priv)
+void intel_hpd_poll_enable(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
- if (!HAS_DISPLAY(dev_priv) ||
- !intel_display_device_enabled(display))
+ if (!HAS_DISPLAY(display) || !intel_display_device_enabled(display))
return;
- WRITE_ONCE(dev_priv->display.hotplug.poll_enabled, true);
+ WRITE_ONCE(display->hotplug.poll_enabled, true);
/*
* We might already be holding dev->mode_config.mutex, so do this in a
@@ -884,14 +892,14 @@ void intel_hpd_poll_enable(struct drm_i915_private *dev_priv)
* this worker anyway
*/
spin_lock_irq(&dev_priv->irq_lock);
- queue_detection_work(dev_priv,
- &dev_priv->display.hotplug.poll_init_work);
+ queue_detection_work(display,
+ &display->hotplug.poll_init_work);
spin_unlock_irq(&dev_priv->irq_lock);
}
/**
* intel_hpd_poll_disable - disable polling for connectors with hpd
- * @dev_priv: i915 device instance
+ * @display: display device instance
*
* This function disables polling for all connectors which support HPD.
* Under certain conditions HPD may not be functional. On most Intel GPUs,
@@ -908,26 +916,28 @@ void intel_hpd_poll_enable(struct drm_i915_private *dev_priv)
*
* Also see: intel_hpd_init() and intel_hpd_poll_enable().
*/
-void intel_hpd_poll_disable(struct drm_i915_private *dev_priv)
+void intel_hpd_poll_disable(struct intel_display *display)
{
- if (!HAS_DISPLAY(dev_priv))
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
+
+ if (!HAS_DISPLAY(display))
return;
- WRITE_ONCE(dev_priv->display.hotplug.poll_enabled, false);
+ WRITE_ONCE(display->hotplug.poll_enabled, false);
spin_lock_irq(&dev_priv->irq_lock);
- queue_detection_work(dev_priv,
- &dev_priv->display.hotplug.poll_init_work);
+ queue_detection_work(display,
+ &display->hotplug.poll_init_work);
spin_unlock_irq(&dev_priv->irq_lock);
}
-void intel_hpd_poll_fini(struct drm_i915_private *i915)
+void intel_hpd_poll_fini(struct intel_display *display)
{
struct intel_connector *connector;
struct drm_connector_list_iter conn_iter;
/* Kill all the work that may have been queued by hpd. */
- drm_connector_list_iter_begin(&i915->drm, &conn_iter);
+ drm_connector_list_iter_begin(display->drm, &conn_iter);
for_each_intel_connector_iter(connector, &conn_iter) {
intel_connector_cancel_modeset_retry_work(connector);
intel_hdcp_cancel_works(connector);
@@ -935,70 +945,70 @@ void intel_hpd_poll_fini(struct drm_i915_private *i915)
drm_connector_list_iter_end(&conn_iter);
}
-void intel_hpd_init_early(struct drm_i915_private *i915)
+void intel_hpd_init_early(struct intel_display *display)
{
- INIT_DELAYED_WORK(&i915->display.hotplug.hotplug_work,
+ INIT_DELAYED_WORK(&display->hotplug.hotplug_work,
i915_hotplug_work_func);
- INIT_WORK(&i915->display.hotplug.dig_port_work, i915_digport_work_func);
- INIT_WORK(&i915->display.hotplug.poll_init_work, i915_hpd_poll_init_work);
- INIT_DELAYED_WORK(&i915->display.hotplug.reenable_work,
+ INIT_WORK(&display->hotplug.dig_port_work, i915_digport_work_func);
+ INIT_WORK(&display->hotplug.poll_init_work, i915_hpd_poll_init_work);
+ INIT_DELAYED_WORK(&display->hotplug.reenable_work,
intel_hpd_irq_storm_reenable_work);
- i915->display.hotplug.hpd_storm_threshold = HPD_STORM_DEFAULT_THRESHOLD;
+ display->hotplug.hpd_storm_threshold = HPD_STORM_DEFAULT_THRESHOLD;
/* If we have MST support, we want to avoid doing short HPD IRQ storm
* detection, as short HPD storms will occur as a natural part of
* sideband messaging with MST.
* On older platforms however, IRQ storms can occur with both long and
* short pulses, as seen on some G4x systems.
*/
- i915->display.hotplug.hpd_short_storm_enabled = !HAS_DP_MST(i915);
+ display->hotplug.hpd_short_storm_enabled = !HAS_DP_MST(display);
}
-static bool cancel_all_detection_work(struct drm_i915_private *i915)
+static bool cancel_all_detection_work(struct intel_display *display)
{
bool was_pending = false;
- if (cancel_delayed_work_sync(&i915->display.hotplug.hotplug_work))
+ if (cancel_delayed_work_sync(&display->hotplug.hotplug_work))
was_pending = true;
- if (cancel_work_sync(&i915->display.hotplug.poll_init_work))
+ if (cancel_work_sync(&display->hotplug.poll_init_work))
was_pending = true;
- if (cancel_delayed_work_sync(&i915->display.hotplug.reenable_work))
+ if (cancel_delayed_work_sync(&display->hotplug.reenable_work))
was_pending = true;
return was_pending;
}
-void intel_hpd_cancel_work(struct drm_i915_private *dev_priv)
+void intel_hpd_cancel_work(struct intel_display *display)
{
- struct intel_display *display = to_intel_display(&dev_priv->drm);
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
- if (!HAS_DISPLAY(dev_priv))
+ if (!HAS_DISPLAY(display))
return;
spin_lock_irq(&dev_priv->irq_lock);
drm_WARN_ON(display->drm, get_blocked_hpd_pin_mask(display));
- dev_priv->display.hotplug.long_hpd_pin_mask = 0;
- dev_priv->display.hotplug.short_hpd_pin_mask = 0;
- dev_priv->display.hotplug.event_bits = 0;
- dev_priv->display.hotplug.retry_bits = 0;
+ display->hotplug.long_hpd_pin_mask = 0;
+ display->hotplug.short_hpd_pin_mask = 0;
+ display->hotplug.event_bits = 0;
+ display->hotplug.retry_bits = 0;
spin_unlock_irq(&dev_priv->irq_lock);
- cancel_work_sync(&dev_priv->display.hotplug.dig_port_work);
+ cancel_work_sync(&display->hotplug.dig_port_work);
/*
* All other work triggered by hotplug events should be canceled by
* now.
*/
- if (cancel_all_detection_work(dev_priv))
- drm_dbg_kms(&dev_priv->drm, "Hotplug detection work still active\n");
+ if (cancel_all_detection_work(display))
+ drm_dbg_kms(display->drm, "Hotplug detection work still active\n");
}
-static void queue_work_for_missed_irqs(struct drm_i915_private *i915)
+static void queue_work_for_missed_irqs(struct intel_display *display)
{
- struct intel_display *display = to_intel_display(&i915->drm);
+ struct drm_i915_private *i915 = to_i915(display->drm);
struct intel_hotplug *hotplug = &display->hotplug;
bool queue_hp_work = false;
u32 blocked_hpd_pin_mask;
@@ -1011,7 +1021,7 @@ static void queue_work_for_missed_irqs(struct drm_i915_private *i915)
queue_hp_work = true;
for_each_hpd_pin(pin) {
- switch (i915->display.hotplug.stats[pin].state) {
+ switch (display->hotplug.stats[pin].state) {
case HPD_MARK_DISABLED:
queue_hp_work = true;
break;
@@ -1019,7 +1029,7 @@ static void queue_work_for_missed_irqs(struct drm_i915_private *i915)
case HPD_ENABLED:
break;
default:
- MISSING_CASE(i915->display.hotplug.stats[pin].state);
+ MISSING_CASE(display->hotplug.stats[pin].state);
}
}
@@ -1027,7 +1037,7 @@ static void queue_work_for_missed_irqs(struct drm_i915_private *i915)
queue_work(hotplug->dp_wq, &hotplug->dig_port_work);
if (queue_hp_work)
- queue_delayed_detection_work(i915, &i915->display.hotplug.hotplug_work, 0);
+ queue_delayed_detection_work(display, &display->hotplug.hotplug_work, 0);
}
static bool block_hpd_pin(struct intel_display *display, enum hpd_pin pin)
@@ -1121,7 +1131,7 @@ void intel_hpd_unblock(struct intel_encoder *encoder)
spin_lock_irq(&i915->irq_lock);
if (unblock_hpd_pin(display, encoder->hpd_pin))
- queue_work_for_missed_irqs(i915);
+ queue_work_for_missed_irqs(display);
spin_unlock_irq(&i915->irq_lock);
}
@@ -1156,30 +1166,35 @@ void intel_hpd_clear_and_unblock(struct intel_encoder *encoder)
spin_unlock_irq(&i915->irq_lock);
}
-void intel_hpd_enable_detection_work(struct drm_i915_private *i915)
+void intel_hpd_enable_detection_work(struct intel_display *display)
{
+ struct drm_i915_private *i915 = to_i915(display->drm);
+
spin_lock_irq(&i915->irq_lock);
- i915->display.hotplug.detection_work_enabled = true;
- queue_work_for_missed_irqs(i915);
+ display->hotplug.detection_work_enabled = true;
+ queue_work_for_missed_irqs(display);
spin_unlock_irq(&i915->irq_lock);
}
-void intel_hpd_disable_detection_work(struct drm_i915_private *i915)
+void intel_hpd_disable_detection_work(struct intel_display *display)
{
+ struct drm_i915_private *i915 = to_i915(display->drm);
+
spin_lock_irq(&i915->irq_lock);
- i915->display.hotplug.detection_work_enabled = false;
+ display->hotplug.detection_work_enabled = false;
spin_unlock_irq(&i915->irq_lock);
- cancel_all_detection_work(i915);
+ cancel_all_detection_work(display);
}
-bool intel_hpd_schedule_detection(struct drm_i915_private *i915)
+bool intel_hpd_schedule_detection(struct intel_display *display)
{
+ struct drm_i915_private *i915 = to_i915(display->drm);
unsigned long flags;
bool ret;
spin_lock_irqsave(&i915->irq_lock, flags);
- ret = queue_delayed_detection_work(i915, &i915->display.hotplug.hotplug_work, 0);
+ ret = queue_delayed_detection_work(display, &display->hotplug.hotplug_work, 0);
spin_unlock_irqrestore(&i915->irq_lock, flags);
return ret;
@@ -1188,14 +1203,15 @@ bool intel_hpd_schedule_detection(struct drm_i915_private *i915)
static int i915_hpd_storm_ctl_show(struct seq_file *m, void *data)
{
struct drm_i915_private *dev_priv = m->private;
- struct intel_hotplug *hotplug = &dev_priv->display.hotplug;
+ struct intel_display *display = &dev_priv->display;
+ struct intel_hotplug *hotplug = &display->hotplug;
/* Synchronize with everything first in case there's been an HPD
* storm, but we haven't finished handling it in the kernel yet
*/
intel_synchronize_irq(dev_priv);
- flush_work(&dev_priv->display.hotplug.dig_port_work);
- flush_delayed_work(&dev_priv->display.hotplug.hotplug_work);
+ flush_work(&display->hotplug.dig_port_work);
+ flush_delayed_work(&display->hotplug.hotplug_work);
seq_printf(m, "Threshold: %d\n", hotplug->hpd_storm_threshold);
seq_printf(m, "Detected: %s\n",
@@ -1210,7 +1226,8 @@ static ssize_t i915_hpd_storm_ctl_write(struct file *file,
{
struct seq_file *m = file->private_data;
struct drm_i915_private *dev_priv = m->private;
- struct intel_hotplug *hotplug = &dev_priv->display.hotplug;
+ struct intel_display *display = &dev_priv->display;
+ struct intel_hotplug *hotplug = &display->hotplug;
unsigned int new_threshold;
int i;
char *newline;
@@ -1235,11 +1252,11 @@ static ssize_t i915_hpd_storm_ctl_write(struct file *file,
return -EINVAL;
if (new_threshold > 0)
- drm_dbg_kms(&dev_priv->drm,
+ drm_dbg_kms(display->drm,
"Setting HPD storm detection threshold to %d\n",
new_threshold);
else
- drm_dbg_kms(&dev_priv->drm, "Disabling HPD storm detection\n");
+ drm_dbg_kms(display->drm, "Disabling HPD storm detection\n");
spin_lock_irq(&dev_priv->irq_lock);
hotplug->hpd_storm_threshold = new_threshold;
@@ -1249,7 +1266,7 @@ static ssize_t i915_hpd_storm_ctl_write(struct file *file,
spin_unlock_irq(&dev_priv->irq_lock);
/* Re-enable hpd immediately if we were in an irq storm */
- flush_delayed_work(&dev_priv->display.hotplug.reenable_work);
+ flush_delayed_work(&display->hotplug.reenable_work);
return len;
}
@@ -1271,9 +1288,10 @@ static const struct file_operations i915_hpd_storm_ctl_fops = {
static int i915_hpd_short_storm_ctl_show(struct seq_file *m, void *data)
{
struct drm_i915_private *dev_priv = m->private;
+ struct intel_display *display = &dev_priv->display;
seq_printf(m, "Enabled: %s\n",
- str_yes_no(dev_priv->display.hotplug.hpd_short_storm_enabled));
+ str_yes_no(display->hotplug.hpd_short_storm_enabled));
return 0;
}
@@ -1291,7 +1309,8 @@ static ssize_t i915_hpd_short_storm_ctl_write(struct file *file,
{
struct seq_file *m = file->private_data;
struct drm_i915_private *dev_priv = m->private;
- struct intel_hotplug *hotplug = &dev_priv->display.hotplug;
+ struct intel_display *display = &dev_priv->display;
+ struct intel_hotplug *hotplug = &display->hotplug;
char *newline;
char tmp[16];
int i;
@@ -1312,11 +1331,11 @@ static ssize_t i915_hpd_short_storm_ctl_write(struct file *file,
/* Reset to the "default" state for this system */
if (strcmp(tmp, "reset") == 0)
- new_state = !HAS_DP_MST(dev_priv);
+ new_state = !HAS_DP_MST(display);
else if (kstrtobool(tmp, &new_state) != 0)
return -EINVAL;
- drm_dbg_kms(&dev_priv->drm, "%sabling HPD short storm detection\n",
+ drm_dbg_kms(display->drm, "%sabling HPD short storm detection\n",
new_state ? "En" : "Dis");
spin_lock_irq(&dev_priv->irq_lock);
@@ -1327,7 +1346,7 @@ static ssize_t i915_hpd_short_storm_ctl_write(struct file *file,
spin_unlock_irq(&dev_priv->irq_lock);
/* Re-enable hpd immediately if we were in an irq storm */
- flush_delayed_work(&dev_priv->display.hotplug.reenable_work);
+ flush_delayed_work(&display->hotplug.reenable_work);
return len;
}
@@ -1341,14 +1360,15 @@ static const struct file_operations i915_hpd_short_storm_ctl_fops = {
.write = i915_hpd_short_storm_ctl_write,
};
-void intel_hpd_debugfs_register(struct drm_i915_private *i915)
+void intel_hpd_debugfs_register(struct intel_display *display)
{
- struct drm_minor *minor = i915->drm.primary;
+ struct drm_minor *minor = display->drm->primary;
+ struct drm_i915_private *i915 = to_i915(display->drm);
debugfs_create_file("i915_hpd_storm_ctl", 0644, minor->debugfs_root,
i915, &i915_hpd_storm_ctl_fops);
debugfs_create_file("i915_hpd_short_storm_ctl", 0644, minor->debugfs_root,
i915, &i915_hpd_short_storm_ctl_fops);
debugfs_create_bool("i915_ignore_long_hpd", 0644, minor->debugfs_root,
- &i915->display.hotplug.ignore_long_hpd);
+ &display->hotplug.ignore_long_hpd);
}
diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.h b/drivers/gpu/drm/i915/display/intel_hotplug.h
index f189b871904e..edc41c9d3d65 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug.h
+++ b/drivers/gpu/drm/i915/display/intel_hotplug.h
@@ -8,31 +8,31 @@
#include <linux/types.h>
-struct drm_i915_private;
+enum port;
struct intel_connector;
struct intel_digital_port;
+struct intel_display;
struct intel_encoder;
-enum port;
-void intel_hpd_poll_enable(struct drm_i915_private *dev_priv);
-void intel_hpd_poll_disable(struct drm_i915_private *dev_priv);
-void intel_hpd_poll_fini(struct drm_i915_private *i915);
+void intel_hpd_poll_enable(struct intel_display *display);
+void intel_hpd_poll_disable(struct intel_display *display);
+void intel_hpd_poll_fini(struct intel_display *display);
enum intel_hotplug_state intel_encoder_hotplug(struct intel_encoder *encoder,
struct intel_connector *connector);
-void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
+void intel_hpd_irq_handler(struct intel_display *display,
u32 pin_mask, u32 long_mask);
void intel_hpd_trigger_irq(struct intel_digital_port *dig_port);
-void intel_hpd_init(struct drm_i915_private *dev_priv);
-void intel_hpd_init_early(struct drm_i915_private *i915);
-void intel_hpd_cancel_work(struct drm_i915_private *dev_priv);
+void intel_hpd_init(struct intel_display *display);
+void intel_hpd_init_early(struct intel_display *display);
+void intel_hpd_cancel_work(struct intel_display *display);
enum hpd_pin intel_hpd_pin_default(enum port port);
void intel_hpd_block(struct intel_encoder *encoder);
void intel_hpd_unblock(struct intel_encoder *encoder);
void intel_hpd_clear_and_unblock(struct intel_encoder *encoder);
-void intel_hpd_debugfs_register(struct drm_i915_private *i915);
+void intel_hpd_debugfs_register(struct intel_display *display);
-void intel_hpd_enable_detection_work(struct drm_i915_private *i915);
-void intel_hpd_disable_detection_work(struct drm_i915_private *i915);
-bool intel_hpd_schedule_detection(struct drm_i915_private *i915);
+void intel_hpd_enable_detection_work(struct intel_display *display);
+void intel_hpd_disable_detection_work(struct intel_display *display);
+bool intel_hpd_schedule_detection(struct intel_display *display);
#endif /* __INTEL_HOTPLUG_H__ */
diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
index 2137ac7b882a..e6320838df59 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
@@ -472,7 +472,7 @@ void i9xx_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_status)
dev_priv->display.hotplug.hpd,
i9xx_port_hotplug_long_detect);
- intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
+ intel_hpd_irq_handler(display, pin_mask, long_mask);
}
if ((IS_G4X(dev_priv) ||
@@ -483,6 +483,7 @@ void i9xx_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_status)
void ibx_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_trigger)
{
+ struct intel_display *display = &dev_priv->display;
u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
/*
@@ -509,7 +510,7 @@ void ibx_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_trigger)
dev_priv->display.hotplug.pch_hpd,
pch_port_hotplug_long_detect);
- intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
+ intel_hpd_irq_handler(display, pin_mask, long_mask);
}
void xelpdp_pica_irq_handler(struct drm_i915_private *i915, u32 iir)
@@ -543,7 +544,7 @@ void xelpdp_pica_irq_handler(struct drm_i915_private *i915, u32 iir)
"pica hotplug event received, stat 0x%08x, pins 0x%08x, long 0x%08x\n",
hotplug_trigger, pin_mask, long_mask);
- intel_hpd_irq_handler(i915, pin_mask, long_mask);
+ intel_hpd_irq_handler(display, pin_mask, long_mask);
}
if (trigger_aux)
@@ -587,7 +588,7 @@ void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
}
if (pin_mask)
- intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
+ intel_hpd_irq_handler(display, pin_mask, long_mask);
if (pch_iir & SDE_GMBUS_ICP)
intel_gmbus_irq_handler(display);
@@ -624,7 +625,7 @@ void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
}
if (pin_mask)
- intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
+ intel_hpd_irq_handler(display, pin_mask, long_mask);
if (pch_iir & SDE_GMBUS_CPT)
intel_gmbus_irq_handler(display);
@@ -632,6 +633,7 @@ void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
void ilk_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_trigger)
{
+ struct intel_display *display = &dev_priv->display;
u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore, DIGITAL_PORT_HOTPLUG_CNTRL, 0, 0);
@@ -641,11 +643,12 @@ void ilk_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_trigger)
dev_priv->display.hotplug.hpd,
ilk_port_hotplug_long_detect);
- intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
+ intel_hpd_irq_handler(display, pin_mask, long_mask);
}
void bxt_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_trigger)
{
+ struct intel_display *display = &dev_priv->display;
u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG, 0, 0);
@@ -655,11 +658,12 @@ void bxt_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_trigger)
dev_priv->display.hotplug.hpd,
bxt_port_hotplug_long_detect);
- intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
+ intel_hpd_irq_handler(display, pin_mask, long_mask);
}
void gen11_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
{
+ struct intel_display *display = &dev_priv->display;
u32 pin_mask = 0, long_mask = 0;
u32 trigger_tc = iir & GEN11_DE_TC_HOTPLUG_MASK;
u32 trigger_tbt = iir & GEN11_DE_TBT_HOTPLUG_MASK;
@@ -687,7 +691,7 @@ void gen11_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
}
if (pin_mask)
- intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
+ intel_hpd_irq_handler(display, pin_mask, long_mask);
else
drm_err(&dev_priv->drm,
"Unexpected DE HPD interrupt 0x%08x\n", iir);
@@ -1467,9 +1471,11 @@ void intel_hpd_irq_setup(struct drm_i915_private *i915)
void intel_hotplug_irq_init(struct drm_i915_private *i915)
{
+ struct intel_display *display = &i915->display;
+
intel_hpd_init_pins(i915);
- intel_hpd_init_early(i915);
+ intel_hpd_init_early(display);
if (HAS_GMCH(i915)) {
if (I915_HAS_HOTPLUG(i915))
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index ce3cc93ea211..510e240c000b 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -981,7 +981,7 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
intel_dp_mst_suspend(display);
intel_irq_suspend(i915);
- intel_hpd_cancel_work(i915);
+ intel_hpd_cancel_work(display);
if (HAS_DISPLAY(i915))
intel_display_driver_suspend_access(display);
@@ -1064,7 +1064,7 @@ static int i915_drm_suspend(struct drm_device *dev)
intel_display_driver_suspend(display);
intel_irq_suspend(dev_priv);
- intel_hpd_cancel_work(dev_priv);
+ intel_hpd_cancel_work(display);
if (HAS_DISPLAY(dev_priv))
intel_display_driver_suspend_access(display);
@@ -1227,7 +1227,7 @@ static int i915_drm_resume(struct drm_device *dev)
if (HAS_DISPLAY(dev_priv))
intel_display_driver_resume_access(display);
- intel_hpd_init(dev_priv);
+ intel_hpd_init(display);
intel_display_driver_resume(display);
@@ -1235,7 +1235,7 @@ static int i915_drm_resume(struct drm_device *dev)
intel_display_driver_enable_user_access(display);
drm_kms_helper_poll_enable(dev);
}
- intel_hpd_poll_disable(dev_priv);
+ intel_hpd_poll_disable(display);
intel_opregion_resume(display);
@@ -1575,7 +1575,7 @@ static int intel_runtime_suspend(struct device *kdev)
assert_forcewakes_inactive(&dev_priv->uncore);
if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
- intel_hpd_poll_enable(dev_priv);
+ intel_hpd_poll_enable(display);
drm_dbg(&dev_priv->drm, "Device suspended\n");
return 0;
@@ -1633,8 +1633,8 @@ static int intel_runtime_resume(struct device *kdev)
* everyone else do it here.
*/
if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv)) {
- intel_hpd_init(dev_priv);
- intel_hpd_poll_disable(dev_priv);
+ intel_hpd_init(display);
+ intel_hpd_poll_disable(display);
}
skl_watermark_ipc_update(dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 37ca4a35daf2..de53615571be 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1280,6 +1280,7 @@ int intel_irq_install(struct drm_i915_private *dev_priv)
*/
void intel_irq_uninstall(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
int irq = to_pci_dev(dev_priv->drm.dev)->irq;
if (drm_WARN_ON(&dev_priv->drm, !dev_priv->irqs_enabled))
@@ -1289,7 +1290,7 @@ void intel_irq_uninstall(struct drm_i915_private *dev_priv)
free_irq(irq, dev_priv);
- intel_hpd_cancel_work(dev_priv);
+ intel_hpd_cancel_work(display);
dev_priv->irqs_enabled = false;
}
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 0b0aca7a25af..263459323bf7 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -173,7 +173,7 @@ static void xe_display_fini(void *arg)
struct xe_device *xe = arg;
struct intel_display *display = &xe->display;
- intel_hpd_poll_fini(xe);
+ intel_hpd_poll_fini(display);
intel_hdcp_component_fini(display);
intel_audio_deinit(display);
intel_display_driver_remove(display);
@@ -305,7 +305,7 @@ static void xe_display_enable_d3cold(struct xe_device *xe)
intel_dmc_suspend(display);
if (has_display(xe))
- intel_hpd_poll_enable(xe);
+ intel_hpd_poll_enable(display);
}
static void xe_display_disable_d3cold(struct xe_device *xe)
@@ -322,10 +322,10 @@ static void xe_display_disable_d3cold(struct xe_device *xe)
intel_display_driver_init_hw(display);
- intel_hpd_init(xe);
+ intel_hpd_init(display);
if (has_display(xe))
- intel_hpd_poll_disable(xe);
+ intel_hpd_poll_disable(display);
intel_opregion_resume(display);
@@ -355,7 +355,7 @@ void xe_display_pm_suspend(struct xe_device *xe)
xe_display_flush_cleanup_work(xe);
- intel_hpd_cancel_work(xe);
+ intel_hpd_cancel_work(display);
if (has_display(xe)) {
intel_display_driver_suspend_access(display);
@@ -385,7 +385,7 @@ void xe_display_pm_shutdown(struct xe_device *xe)
xe_display_flush_cleanup_work(xe);
intel_dp_mst_suspend(display);
- intel_hpd_cancel_work(xe);
+ intel_hpd_cancel_work(display);
if (has_display(xe))
intel_display_driver_suspend_access(display);
@@ -400,6 +400,8 @@ void xe_display_pm_shutdown(struct xe_device *xe)
void xe_display_pm_runtime_suspend(struct xe_device *xe)
{
+ struct intel_display *display = &xe->display;
+
if (!xe->info.probe_display)
return;
@@ -408,7 +410,7 @@ void xe_display_pm_runtime_suspend(struct xe_device *xe)
return;
}
- intel_hpd_poll_enable(xe);
+ intel_hpd_poll_enable(display);
}
void xe_display_pm_suspend_late(struct xe_device *xe)
@@ -482,7 +484,7 @@ void xe_display_pm_resume(struct xe_device *xe)
if (has_display(xe))
intel_display_driver_resume_access(display);
- intel_hpd_init(xe);
+ intel_hpd_init(display);
if (has_display(xe)) {
intel_display_driver_resume(display);
@@ -491,7 +493,7 @@ void xe_display_pm_resume(struct xe_device *xe)
}
if (has_display(xe))
- intel_hpd_poll_disable(xe);
+ intel_hpd_poll_disable(display);
intel_opregion_resume(display);
@@ -502,6 +504,8 @@ void xe_display_pm_resume(struct xe_device *xe)
void xe_display_pm_runtime_resume(struct xe_device *xe)
{
+ struct intel_display *display = &xe->display;
+
if (!xe->info.probe_display)
return;
@@ -510,8 +514,8 @@ void xe_display_pm_runtime_resume(struct xe_device *xe)
return;
}
- intel_hpd_init(xe);
- intel_hpd_poll_disable(xe);
+ intel_hpd_init(display);
+ intel_hpd_poll_disable(display);
skl_watermark_ipc_update(xe);
}
--
2.39.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* RE: [PATCH 3/9] drm/i915/hotplug: convert intel_hotplug.[ch] to struct intel_display
2025-03-11 18:00 ` [PATCH 3/9] drm/i915/hotplug: convert intel_hotplug.[ch] " Jani Nikula
@ 2025-03-12 5:13 ` Shankar, Uma
0 siblings, 0 replies; 31+ messages in thread
From: Shankar, Uma @ 2025-03-12 5:13 UTC (permalink / raw)
To: Nikula, Jani, intel-gfx@lists.freedesktop.org,
intel-xe@lists.freedesktop.org
Cc: Nikula, Jani
> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jani
> Nikula
> Sent: Tuesday, March 11, 2025 11:31 PM
> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nikula@intel.com>
> Subject: [PATCH 3/9] drm/i915/hotplug: convert intel_hotplug.[ch] to struct
> intel_display
>
> Going forward, struct intel_display is the main display device data
> pointer. Convert as much as possible of intel_hotplug.[ch] to struct
> intel_display.
Looks Good to me.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> .../drm/i915/display/intel_display_debugfs.c | 2 +-
> .../drm/i915/display/intel_display_driver.c | 14 +-
> .../i915/display/intel_display_power_well.c | 6 +-
> .../drm/i915/display/intel_display_reset.c | 4 +-
> drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
> drivers/gpu/drm/i915/display/intel_hotplug.c | 332 ++++++++++--------
> drivers/gpu/drm/i915/display/intel_hotplug.h | 26 +-
> .../gpu/drm/i915/display/intel_hotplug_irq.c | 24 +-
> drivers/gpu/drm/i915/i915_driver.c | 14 +-
> drivers/gpu/drm/i915/i915_irq.c | 3 +-
> drivers/gpu/drm/xe/display/xe_display.c | 26 +-
> 11 files changed, 240 insertions(+), 213 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index fdedf65bee53..f42b5a69eed5 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -844,7 +844,7 @@ void intel_display_debugfs_register(struct intel_display
> *display)
> intel_dmc_debugfs_register(display);
> intel_dp_test_debugfs_register(display);
> intel_fbc_debugfs_register(display);
> - intel_hpd_debugfs_register(i915);
> + intel_hpd_debugfs_register(display);
> intel_opregion_debugfs_register(display);
> intel_psr_debugfs_register(display);
> intel_wm_debugfs_register(i915);
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c
> b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index 31740a677dd8..ae60ccb21520 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -315,11 +315,9 @@ static void set_display_access(struct intel_display
> *display,
> */
> void intel_display_driver_enable_user_access(struct intel_display *display)
> {
> - struct drm_i915_private *i915 = to_i915(display->drm);
> -
> set_display_access(display, true, NULL);
>
> - intel_hpd_enable_detection_work(i915);
> + intel_hpd_enable_detection_work(display);
> }
>
> /**
> @@ -341,9 +339,7 @@ void intel_display_driver_enable_user_access(struct
> intel_display *display)
> */
> void intel_display_driver_disable_user_access(struct intel_display *display)
> {
> - struct drm_i915_private *i915 = to_i915(display->drm);
> -
> - intel_hpd_disable_detection_work(i915);
> + intel_hpd_disable_detection_work(display);
>
> set_display_access(display, false, current);
> }
> @@ -524,7 +520,7 @@ int intel_display_driver_probe(struct intel_display
> *display)
> intel_overlay_setup(display);
>
> /* Only enable hotplug handling once the fbdev is fully set up. */
> - intel_hpd_init(i915);
> + intel_hpd_init(display);
>
> skl_watermark_ipc_init(i915);
>
> @@ -558,7 +554,7 @@ void intel_display_driver_register(struct intel_display
> *display)
> * fbdev->async_cookie.
> */
> drm_kms_helper_poll_init(display->drm);
> - intel_hpd_poll_disable(i915);
> + intel_hpd_poll_disable(display);
>
> intel_fbdev_setup(i915);
>
> @@ -600,7 +596,7 @@ void intel_display_driver_remove_noirq(struct
> intel_display *display)
> * Due to the hpd irq storm handling the hotplug work can re-arm the
> * poll handlers. Hence disable polling after hpd handling is shut down.
> */
> - intel_hpd_poll_fini(i915);
> + intel_hpd_poll_fini(display);
>
> intel_unregister_dsm_handler();
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power_well.c
> b/drivers/gpu/drm/i915/display/intel_display_power_well.c
> index 8ec87ffd87d2..daf2a0cbb157 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
> @@ -1236,8 +1236,8 @@ static void vlv_display_power_well_init(struct
> intel_display *display)
> if (display->power.domains.initializing)
> return;
>
> - intel_hpd_init(dev_priv);
> - intel_hpd_poll_disable(dev_priv);
> + intel_hpd_init(display);
> + intel_hpd_poll_disable(display);
>
> /* Re-enable the ADPA, if we have one */
> for_each_intel_encoder(display->drm, encoder) {
> @@ -1265,7 +1265,7 @@ static void vlv_display_power_well_deinit(struct
> intel_display *display)
>
> /* Prevent us from re-enabling polling on accident in late suspend */
> if (!display->drm->dev->power.is_suspended)
> - intel_hpd_poll_enable(dev_priv);
> + intel_hpd_poll_enable(display);
> }
>
> static void vlv_display_power_well_enable(struct intel_display *display,
> diff --git a/drivers/gpu/drm/i915/display/intel_display_reset.c
> b/drivers/gpu/drm/i915/display/intel_display_reset.c
> index 1f2798404f2c..1dbd3e841df3 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_reset.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_reset.c
> @@ -107,14 +107,14 @@ void intel_display_reset_finish(struct intel_display
> *display, bool test_only)
> intel_display_driver_init_hw(display);
> intel_clock_gating_init(i915);
> intel_cx0_pll_power_save_wa(display);
> - intel_hpd_init(i915);
> + intel_hpd_init(display);
>
> ret = __intel_display_driver_resume(display, state, ctx);
> if (ret)
> drm_err(display->drm,
> "Restoring old state failed with %i\n", ret);
>
> - intel_hpd_poll_disable(i915);
> + intel_hpd_poll_disable(display);
> }
>
> drm_atomic_state_put(state);
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c
> b/drivers/gpu/drm/i915/display/intel_dp.c
> index a236b5fc7a3d..7d074770d793 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -6117,7 +6117,7 @@ static void intel_dp_oob_hotplug_event(struct
> drm_connector *connector,
> spin_unlock_irq(&i915->irq_lock);
>
> if (need_work)
> - intel_hpd_schedule_detection(i915);
> + intel_hpd_schedule_detection(display);
> }
>
> static const struct drm_connector_funcs intel_dp_connector_funcs = {
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c
> b/drivers/gpu/drm/i915/display/intel_hotplug.c
> index c69b1f5fd160..9bde28ce1979 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug.c
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
> @@ -118,7 +118,7 @@ intel_connector_hpd_pin(struct intel_connector
> *connector)
>
> /**
> * intel_hpd_irq_storm_detect - gather stats and detect HPD IRQ storm on a pin
> - * @dev_priv: private driver data pointer
> + * @display: display device
> * @pin: the pin to gather stats on
> * @long_hpd: whether the HPD IRQ was long or short
> *
> @@ -127,13 +127,13 @@ intel_connector_hpd_pin(struct intel_connector
> *connector)
> * responsible for further action.
> *
> * The number of IRQs that are allowed within @HPD_STORM_DETECT_PERIOD
> is
> - * stored in @dev_priv->display.hotplug.hpd_storm_threshold which defaults to
> + * stored in @display->hotplug.hpd_storm_threshold which defaults to
> * @HPD_STORM_DEFAULT_THRESHOLD. Long IRQs count as +10 to this
> threshold, and
> * short IRQs count as +1. If this threshold is exceeded, it's considered an
> * IRQ storm and the IRQ state is set to @HPD_MARK_DISABLED.
> *
> * By default, most systems will only count long IRQs towards
> - * &dev_priv->display.hotplug.hpd_storm_threshold. However, some older
> systems also
> + * &display->hotplug.hpd_storm_threshold. However, some older systems also
> * suffer from short IRQ storms and must also track these. Because short IRQ
> * storms are naturally caused by sideband interactions with DP MST devices,
> * short IRQ detection is only enabled for systems without DP MST support.
> @@ -145,10 +145,10 @@ intel_connector_hpd_pin(struct intel_connector
> *connector)
> *
> * Return true if an IRQ storm was detected on @pin.
> */
> -static bool intel_hpd_irq_storm_detect(struct drm_i915_private *dev_priv,
> +static bool intel_hpd_irq_storm_detect(struct intel_display *display,
> enum hpd_pin pin, bool long_hpd)
> {
> - struct intel_hotplug *hpd = &dev_priv->display.hotplug;
> + struct intel_hotplug *hpd = &display->hotplug;
> unsigned long start = hpd->stats[pin].last_jiffies;
> unsigned long end = start +
> msecs_to_jiffies(HPD_STORM_DETECT_PERIOD);
> const int increment = long_hpd ? 10 : 1;
> @@ -156,7 +156,7 @@ static bool intel_hpd_irq_storm_detect(struct
> drm_i915_private *dev_priv,
> bool storm = false;
>
> if (!threshold ||
> - (!long_hpd && !dev_priv->display.hotplug.hpd_short_storm_enabled))
> + (!long_hpd && !display->hotplug.hpd_short_storm_enabled))
> return false;
>
> if (!time_in_range(jiffies, start, end)) {
> @@ -167,11 +167,11 @@ static bool intel_hpd_irq_storm_detect(struct
> drm_i915_private *dev_priv,
> hpd->stats[pin].count += increment;
> if (hpd->stats[pin].count > threshold) {
> hpd->stats[pin].state = HPD_MARK_DISABLED;
> - drm_dbg_kms(&dev_priv->drm,
> + drm_dbg_kms(display->drm,
> "HPD interrupt storm detected on PIN %d\n", pin);
> storm = true;
> } else {
> - drm_dbg_kms(&dev_priv->drm,
> + drm_dbg_kms(display->drm,
> "Received HPD interrupt on PIN %d - cnt: %d\n",
> pin,
> hpd->stats[pin].count);
> @@ -180,56 +180,65 @@ static bool intel_hpd_irq_storm_detect(struct
> drm_i915_private *dev_priv,
> return storm;
> }
>
> -static bool detection_work_enabled(struct drm_i915_private *i915)
> +static bool detection_work_enabled(struct intel_display *display)
> {
> + struct drm_i915_private *i915 = to_i915(display->drm);
> +
> lockdep_assert_held(&i915->irq_lock);
>
> - return i915->display.hotplug.detection_work_enabled;
> + return display->hotplug.detection_work_enabled;
> }
>
> static bool
> -mod_delayed_detection_work(struct drm_i915_private *i915, struct
> delayed_work *work, int delay)
> +mod_delayed_detection_work(struct intel_display *display, struct delayed_work
> *work, int delay)
> {
> + struct drm_i915_private *i915 = to_i915(display->drm);
> +
> lockdep_assert_held(&i915->irq_lock);
>
> - if (!detection_work_enabled(i915))
> + if (!detection_work_enabled(display))
> return false;
>
> return mod_delayed_work(i915->unordered_wq, work, delay);
> }
>
> static bool
> -queue_delayed_detection_work(struct drm_i915_private *i915, struct
> delayed_work *work, int delay)
> +queue_delayed_detection_work(struct intel_display *display, struct
> delayed_work *work, int delay)
> {
> + struct drm_i915_private *i915 = to_i915(display->drm);
> +
> lockdep_assert_held(&i915->irq_lock);
>
> - if (!detection_work_enabled(i915))
> + if (!detection_work_enabled(display))
> return false;
>
> return queue_delayed_work(i915->unordered_wq, work, delay);
> }
>
> static bool
> -queue_detection_work(struct drm_i915_private *i915, struct work_struct
> *work)
> +queue_detection_work(struct intel_display *display, struct work_struct *work)
> {
> + struct drm_i915_private *i915 = to_i915(display->drm);
> +
> lockdep_assert_held(&i915->irq_lock);
>
> - if (!detection_work_enabled(i915))
> + if (!detection_work_enabled(display))
> return false;
>
> return queue_work(i915->unordered_wq, work);
> }
>
> static void
> -intel_hpd_irq_storm_switch_to_polling(struct drm_i915_private *dev_priv)
> +intel_hpd_irq_storm_switch_to_polling(struct intel_display *display)
> {
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> struct drm_connector_list_iter conn_iter;
> struct intel_connector *connector;
> bool hpd_disabled = false;
>
> lockdep_assert_held(&dev_priv->irq_lock);
>
> - drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter);
> + drm_connector_list_iter_begin(display->drm, &conn_iter);
> for_each_intel_connector_iter(connector, &conn_iter) {
> enum hpd_pin pin;
>
> @@ -238,15 +247,15 @@ intel_hpd_irq_storm_switch_to_polling(struct
> drm_i915_private *dev_priv)
>
> pin = intel_connector_hpd_pin(connector);
> if (pin == HPD_NONE ||
> - dev_priv->display.hotplug.stats[pin].state !=
> HPD_MARK_DISABLED)
> + display->hotplug.stats[pin].state != HPD_MARK_DISABLED)
> continue;
>
> - drm_info(&dev_priv->drm,
> + drm_info(display->drm,
> "HPD interrupt storm detected on connector %s: "
> "switching from hotplug detection to polling\n",
> connector->base.name);
>
> - dev_priv->display.hotplug.stats[pin].state = HPD_DISABLED;
> + display->hotplug.stats[pin].state = HPD_DISABLED;
> connector->base.polled = DRM_CONNECTOR_POLL_CONNECT |
> DRM_CONNECTOR_POLL_DISCONNECT;
> hpd_disabled = true;
> @@ -255,18 +264,18 @@ intel_hpd_irq_storm_switch_to_polling(struct
> drm_i915_private *dev_priv)
>
> /* Enable polling and queue hotplug re-enabling. */
> if (hpd_disabled) {
> - drm_kms_helper_poll_reschedule(&dev_priv->drm);
> - mod_delayed_detection_work(dev_priv,
> - &dev_priv-
> >display.hotplug.reenable_work,
> + drm_kms_helper_poll_reschedule(display->drm);
> + mod_delayed_detection_work(display,
> + &display->hotplug.reenable_work,
>
> msecs_to_jiffies(HPD_STORM_REENABLE_DELAY));
> }
> }
>
> static void intel_hpd_irq_storm_reenable_work(struct work_struct *work)
> {
> - struct drm_i915_private *dev_priv =
> - container_of(work, typeof(*dev_priv),
> - display.hotplug.reenable_work.work);
> + struct intel_display *display =
> + container_of(work, typeof(*display),
> hotplug.reenable_work.work);
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> struct drm_connector_list_iter conn_iter;
> struct intel_connector *connector;
> intel_wakeref_t wakeref;
> @@ -276,15 +285,15 @@ static void intel_hpd_irq_storm_reenable_work(struct
> work_struct *work)
>
> spin_lock_irq(&dev_priv->irq_lock);
>
> - drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter);
> + drm_connector_list_iter_begin(display->drm, &conn_iter);
> for_each_intel_connector_iter(connector, &conn_iter) {
> pin = intel_connector_hpd_pin(connector);
> if (pin == HPD_NONE ||
> - dev_priv->display.hotplug.stats[pin].state != HPD_DISABLED)
> + display->hotplug.stats[pin].state != HPD_DISABLED)
> continue;
>
> if (connector->base.polled != connector->polled)
> - drm_dbg(&dev_priv->drm,
> + drm_dbg(display->drm,
> "Reenabling HPD on connector %s\n",
> connector->base.name);
> connector->base.polled = connector->polled;
> @@ -292,8 +301,8 @@ static void intel_hpd_irq_storm_reenable_work(struct
> work_struct *work)
> drm_connector_list_iter_end(&conn_iter);
>
> for_each_hpd_pin(pin) {
> - if (dev_priv->display.hotplug.stats[pin].state == HPD_DISABLED)
> - dev_priv->display.hotplug.stats[pin].state =
> HPD_ENABLED;
> + if (display->hotplug.stats[pin].state == HPD_DISABLED)
> + display->hotplug.stats[pin].state = HPD_ENABLED;
> }
>
> intel_hpd_irq_setup(dev_priv);
> @@ -407,7 +416,7 @@ static void i915_digport_work_func(struct work_struct
> *work)
>
> spin_unlock_irq(&dev_priv->irq_lock);
>
> - for_each_intel_encoder(&dev_priv->drm, encoder) {
> + for_each_intel_encoder(display->drm, encoder) {
> struct intel_digital_port *dig_port;
> enum hpd_pin pin = encoder->hpd_pin;
> bool long_hpd, short_hpd;
> @@ -433,9 +442,9 @@ static void i915_digport_work_func(struct work_struct
> *work)
>
> if (old_bits) {
> spin_lock_irq(&dev_priv->irq_lock);
> - dev_priv->display.hotplug.event_bits |= old_bits;
> - queue_delayed_detection_work(dev_priv,
> - &dev_priv-
> >display.hotplug.hotplug_work, 0);
> + display->hotplug.event_bits |= old_bits;
> + queue_delayed_detection_work(display,
> + &display->hotplug.hotplug_work, 0);
> spin_unlock_irq(&dev_priv->irq_lock);
> }
> }
> @@ -481,8 +490,8 @@ static void i915_hotplug_work_func(struct work_struct
> *work)
> int changed_connectors = 0;
> u32 blocked_hpd_pin_mask;
>
> - mutex_lock(&dev_priv->drm.mode_config.mutex);
> - drm_dbg_kms(&dev_priv->drm, "running encoder hotplug functions\n");
> + mutex_lock(&display->drm->mode_config.mutex);
> + drm_dbg_kms(display->drm, "running encoder hotplug functions\n");
>
> spin_lock_irq(&dev_priv->irq_lock);
>
> @@ -493,18 +502,18 @@ static void i915_hotplug_work_func(struct work_struct
> *work)
> hotplug->retry_bits &= ~hpd_retry_bits;
>
> /* Enable polling for connectors which had HPD IRQ storms */
> - intel_hpd_irq_storm_switch_to_polling(dev_priv);
> + intel_hpd_irq_storm_switch_to_polling(display);
>
> spin_unlock_irq(&dev_priv->irq_lock);
>
> /* Skip calling encode hotplug handlers if ignore long HPD set*/
> - if (dev_priv->display.hotplug.ignore_long_hpd) {
> - drm_dbg_kms(&dev_priv->drm, "Ignore HPD flag on - skip
> encoder hotplug handlers\n");
> - mutex_unlock(&dev_priv->drm.mode_config.mutex);
> + if (display->hotplug.ignore_long_hpd) {
> + drm_dbg_kms(display->drm, "Ignore HPD flag on - skip encoder
> hotplug handlers\n");
> + mutex_unlock(&display->drm->mode_config.mutex);
> return;
> }
>
> - drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter);
> + drm_connector_list_iter_begin(display->drm, &conn_iter);
> for_each_intel_connector_iter(connector, &conn_iter) {
> enum hpd_pin pin;
> u32 hpd_bit;
> @@ -523,7 +532,7 @@ static void i915_hotplug_work_func(struct work_struct
> *work)
> else
> connector->hotplug_retries++;
>
> - drm_dbg_kms(&dev_priv->drm,
> + drm_dbg_kms(display->drm,
> "Connector %s (pin %i) received hotplug
> event. (retry %d)\n",
> connector->base.name, pin,
> connector->hotplug_retries);
> @@ -546,12 +555,12 @@ static void i915_hotplug_work_func(struct work_struct
> *work)
> }
> }
> drm_connector_list_iter_end(&conn_iter);
> - mutex_unlock(&dev_priv->drm.mode_config.mutex);
> + mutex_unlock(&display->drm->mode_config.mutex);
>
> if (changed_connectors == 1)
>
> drm_kms_helper_connector_hotplug_event(first_changed_connector);
> else if (changed_connectors > 0)
> - drm_kms_helper_hotplug_event(&dev_priv->drm);
> + drm_kms_helper_hotplug_event(display->drm);
>
> if (first_changed_connector)
> drm_connector_put(first_changed_connector);
> @@ -560,10 +569,10 @@ static void i915_hotplug_work_func(struct work_struct
> *work)
> retry &= ~changed;
> if (retry) {
> spin_lock_irq(&dev_priv->irq_lock);
> - dev_priv->display.hotplug.retry_bits |= retry;
> + display->hotplug.retry_bits |= retry;
>
> - mod_delayed_detection_work(dev_priv,
> - &dev_priv-
> >display.hotplug.hotplug_work,
> + mod_delayed_detection_work(display,
> + &display->hotplug.hotplug_work,
>
> msecs_to_jiffies(HPD_RETRY_DELAY));
> spin_unlock_irq(&dev_priv->irq_lock);
> }
> @@ -572,7 +581,7 @@ static void i915_hotplug_work_func(struct work_struct
> *work)
>
> /**
> * intel_hpd_irq_handler - main hotplug irq handler
> - * @dev_priv: drm_i915_private
> + * @display: display device
> * @pin_mask: a mask of hpd pins that have triggered the irq
> * @long_mask: a mask of hpd pins that may be long hpd pulses
> *
> @@ -586,10 +595,10 @@ static void i915_hotplug_work_func(struct work_struct
> *work)
> * Here, we do hotplug irq storm detection and mitigation, and pass further
> * processing to appropriate bottom halves.
> */
> -void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
> +void intel_hpd_irq_handler(struct intel_display *display,
> u32 pin_mask, u32 long_mask)
> {
> - struct intel_display *display = to_intel_display(&dev_priv->drm);
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> struct intel_encoder *encoder;
> bool storm_detected = false;
> bool queue_dig = false, queue_hp = false;
> @@ -608,7 +617,7 @@ void intel_hpd_irq_handler(struct drm_i915_private
> *dev_priv,
> * as each pin may have up to two encoders (HDMI and DP) and
> * only the one of them (DP) will have ->hpd_pulse().
> */
> - for_each_intel_encoder(&dev_priv->drm, encoder) {
> + for_each_intel_encoder(display->drm, encoder) {
> bool long_hpd;
>
> pin = encoder->hpd_pin;
> @@ -620,7 +629,7 @@ void intel_hpd_irq_handler(struct drm_i915_private
> *dev_priv,
>
> long_hpd = long_mask & BIT(pin);
>
> - drm_dbg(&dev_priv->drm,
> + drm_dbg(display->drm,
> "digital hpd on [ENCODER:%d:%s] - %s\n",
> encoder->base.base.id, encoder->base.name,
> long_hpd ? "long" : "short");
> @@ -630,10 +639,10 @@ void intel_hpd_irq_handler(struct drm_i915_private
> *dev_priv,
>
> if (long_hpd) {
> long_hpd_pulse_mask |= BIT(pin);
> - dev_priv->display.hotplug.long_hpd_pin_mask |=
> BIT(pin);
> + display->hotplug.long_hpd_pin_mask |= BIT(pin);
> } else {
> short_hpd_pulse_mask |= BIT(pin);
> - dev_priv->display.hotplug.short_hpd_pin_mask |=
> BIT(pin);
> + display->hotplug.short_hpd_pin_mask |= BIT(pin);
> }
> }
>
> @@ -644,20 +653,20 @@ void intel_hpd_irq_handler(struct drm_i915_private
> *dev_priv,
> if (!(BIT(pin) & pin_mask))
> continue;
>
> - if (dev_priv->display.hotplug.stats[pin].state == HPD_DISABLED)
> {
> + if (display->hotplug.stats[pin].state == HPD_DISABLED) {
> /*
> * On GMCH platforms the interrupt mask bits only
> * prevent irq generation, not the setting of the
> * hotplug bits itself. So only WARN about unexpected
> * interrupts on saner platforms.
> */
> - drm_WARN_ONCE(&dev_priv->drm,
> !HAS_GMCH(dev_priv),
> + drm_WARN_ONCE(display->drm, !HAS_GMCH(display),
> "Received HPD interrupt on pin %d although
> disabled\n",
> pin);
> continue;
> }
>
> - if (dev_priv->display.hotplug.stats[pin].state != HPD_ENABLED)
> + if (display->hotplug.stats[pin].state != HPD_ENABLED)
> continue;
>
> /*
> @@ -668,15 +677,15 @@ void intel_hpd_irq_handler(struct drm_i915_private
> *dev_priv,
> if (((short_hpd_pulse_mask | long_hpd_pulse_mask) & BIT(pin)))
> {
> long_hpd = long_hpd_pulse_mask & BIT(pin);
> } else {
> - dev_priv->display.hotplug.event_bits |= BIT(pin);
> + display->hotplug.event_bits |= BIT(pin);
> long_hpd = true;
>
> if (!hpd_pin_is_blocked(display, pin))
> queue_hp = true;
> }
>
> - if (intel_hpd_irq_storm_detect(dev_priv, pin, long_hpd)) {
> - dev_priv->display.hotplug.event_bits &= ~BIT(pin);
> + if (intel_hpd_irq_storm_detect(display, pin, long_hpd)) {
> + display->hotplug.event_bits &= ~BIT(pin);
> storm_detected = true;
> queue_hp = true;
> }
> @@ -696,17 +705,17 @@ void intel_hpd_irq_handler(struct drm_i915_private
> *dev_priv,
> * deadlock.
> */
> if (queue_dig)
> - queue_work(dev_priv->display.hotplug.dp_wq, &dev_priv-
> >display.hotplug.dig_port_work);
> + queue_work(display->hotplug.dp_wq, &display-
> >hotplug.dig_port_work);
> if (queue_hp)
> - queue_delayed_detection_work(dev_priv,
> - &dev_priv-
> >display.hotplug.hotplug_work, 0);
> + queue_delayed_detection_work(display,
> + &display->hotplug.hotplug_work, 0);
>
> spin_unlock(&dev_priv->irq_lock);
> }
>
> /**
> * intel_hpd_init - initializes and enables hpd support
> - * @dev_priv: i915 device instance
> + * @display: display device instance
> *
> * This function enables the hotplug support. It requires that interrupts have
> * already been enabled with intel_irq_init_hw(). From this point on hotplug and
> @@ -718,16 +727,17 @@ void intel_hpd_irq_handler(struct drm_i915_private
> *dev_priv,
> *
> * Also see: intel_hpd_poll_enable() and intel_hpd_poll_disable().
> */
> -void intel_hpd_init(struct drm_i915_private *dev_priv)
> +void intel_hpd_init(struct intel_display *display)
> {
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> int i;
>
> - if (!HAS_DISPLAY(dev_priv))
> + if (!HAS_DISPLAY(display))
> return;
>
> for_each_hpd_pin(i) {
> - dev_priv->display.hotplug.stats[i].count = 0;
> - dev_priv->display.hotplug.stats[i].state = HPD_ENABLED;
> + display->hotplug.stats[i].count = 0;
> + display->hotplug.stats[i].state = HPD_ENABLED;
> }
>
> /*
> @@ -739,19 +749,19 @@ void intel_hpd_init(struct drm_i915_private *dev_priv)
> spin_unlock_irq(&dev_priv->irq_lock);
> }
>
> -static void i915_hpd_poll_detect_connectors(struct drm_i915_private *i915)
> +static void i915_hpd_poll_detect_connectors(struct intel_display *display)
> {
> struct drm_connector_list_iter conn_iter;
> struct intel_connector *connector;
> struct intel_connector *first_changed_connector = NULL;
> int changed = 0;
>
> - mutex_lock(&i915->drm.mode_config.mutex);
> + mutex_lock(&display->drm->mode_config.mutex);
>
> - if (!i915->drm.mode_config.poll_enabled)
> + if (!display->drm->mode_config.poll_enabled)
> goto out;
>
> - drm_connector_list_iter_begin(&i915->drm, &conn_iter);
> + drm_connector_list_iter_begin(display->drm, &conn_iter);
> for_each_intel_connector_iter(connector, &conn_iter) {
> if (!(connector->base.polled & DRM_CONNECTOR_POLL_HPD))
> continue;
> @@ -769,7 +779,7 @@ static void i915_hpd_poll_detect_connectors(struct
> drm_i915_private *i915)
> drm_connector_list_iter_end(&conn_iter);
>
> out:
> - mutex_unlock(&i915->drm.mode_config.mutex);
> + mutex_unlock(&display->drm->mode_config.mutex);
>
> if (!changed)
> return;
> @@ -777,25 +787,24 @@ static void i915_hpd_poll_detect_connectors(struct
> drm_i915_private *i915)
> if (changed == 1)
>
> drm_kms_helper_connector_hotplug_event(&first_changed_connector-
> >base);
> else
> - drm_kms_helper_hotplug_event(&i915->drm);
> + drm_kms_helper_hotplug_event(display->drm);
>
> drm_connector_put(&first_changed_connector->base);
> }
>
> static void i915_hpd_poll_init_work(struct work_struct *work)
> {
> - struct drm_i915_private *dev_priv =
> - container_of(work, struct drm_i915_private,
> - display.hotplug.poll_init_work);
> - struct intel_display *display = &dev_priv->display;
> + struct intel_display *display =
> + container_of(work, typeof(*display), hotplug.poll_init_work);
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> struct drm_connector_list_iter conn_iter;
> struct intel_connector *connector;
> intel_wakeref_t wakeref;
> bool enabled;
>
> - mutex_lock(&dev_priv->drm.mode_config.mutex);
> + mutex_lock(&display->drm->mode_config.mutex);
>
> - enabled = READ_ONCE(dev_priv->display.hotplug.poll_enabled);
> + enabled = READ_ONCE(display->hotplug.poll_enabled);
> /*
> * Prevent taking a power reference from this sequence of
> * i915_hpd_poll_init_work() -> drm_helper_hpd_irq_event() ->
> @@ -805,14 +814,14 @@ static void i915_hpd_poll_init_work(struct work_struct
> *work)
> if (!enabled) {
> wakeref = intel_display_power_get(display,
>
> POWER_DOMAIN_DISPLAY_CORE);
> - drm_WARN_ON(&dev_priv->drm,
> - READ_ONCE(dev_priv-
> >display.hotplug.poll_enabled));
> - cancel_work(&dev_priv->display.hotplug.poll_init_work);
> + drm_WARN_ON(display->drm,
> + READ_ONCE(display->hotplug.poll_enabled));
> + cancel_work(&display->hotplug.poll_init_work);
> }
>
> spin_lock_irq(&dev_priv->irq_lock);
>
> - drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter);
> + drm_connector_list_iter_begin(display->drm, &conn_iter);
> for_each_intel_connector_iter(connector, &conn_iter) {
> enum hpd_pin pin;
>
> @@ -820,7 +829,7 @@ static void i915_hpd_poll_init_work(struct work_struct
> *work)
> if (pin == HPD_NONE)
> continue;
>
> - if (dev_priv->display.hotplug.stats[pin].state == HPD_DISABLED)
> + if (display->hotplug.stats[pin].state == HPD_DISABLED)
> continue;
>
> connector->base.polled = connector->polled;
> @@ -834,16 +843,16 @@ static void i915_hpd_poll_init_work(struct work_struct
> *work)
> spin_unlock_irq(&dev_priv->irq_lock);
>
> if (enabled)
> - drm_kms_helper_poll_reschedule(&dev_priv->drm);
> + drm_kms_helper_poll_reschedule(display->drm);
>
> - mutex_unlock(&dev_priv->drm.mode_config.mutex);
> + mutex_unlock(&display->drm->mode_config.mutex);
>
> /*
> * We might have missed any hotplugs that happened while we were
> * in the middle of disabling polling
> */
> if (!enabled) {
> - i915_hpd_poll_detect_connectors(dev_priv);
> + i915_hpd_poll_detect_connectors(display);
>
> intel_display_power_put(display,
> POWER_DOMAIN_DISPLAY_CORE,
> @@ -853,7 +862,7 @@ static void i915_hpd_poll_init_work(struct work_struct
> *work)
>
> /**
> * intel_hpd_poll_enable - enable polling for connectors with hpd
> - * @dev_priv: i915 device instance
> + * @display: display device instance
> *
> * This function enables polling for all connectors which support HPD.
> * Under certain conditions HPD may not be functional. On most Intel GPUs,
> @@ -867,15 +876,14 @@ static void i915_hpd_poll_init_work(struct work_struct
> *work)
> *
> * Also see: intel_hpd_init() and intel_hpd_poll_disable().
> */
> -void intel_hpd_poll_enable(struct drm_i915_private *dev_priv)
> +void intel_hpd_poll_enable(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
>
> - if (!HAS_DISPLAY(dev_priv) ||
> - !intel_display_device_enabled(display))
> + if (!HAS_DISPLAY(display) || !intel_display_device_enabled(display))
> return;
>
> - WRITE_ONCE(dev_priv->display.hotplug.poll_enabled, true);
> + WRITE_ONCE(display->hotplug.poll_enabled, true);
>
> /*
> * We might already be holding dev->mode_config.mutex, so do this in a
> @@ -884,14 +892,14 @@ void intel_hpd_poll_enable(struct drm_i915_private
> *dev_priv)
> * this worker anyway
> */
> spin_lock_irq(&dev_priv->irq_lock);
> - queue_detection_work(dev_priv,
> - &dev_priv->display.hotplug.poll_init_work);
> + queue_detection_work(display,
> + &display->hotplug.poll_init_work);
> spin_unlock_irq(&dev_priv->irq_lock);
> }
>
> /**
> * intel_hpd_poll_disable - disable polling for connectors with hpd
> - * @dev_priv: i915 device instance
> + * @display: display device instance
> *
> * This function disables polling for all connectors which support HPD.
> * Under certain conditions HPD may not be functional. On most Intel GPUs,
> @@ -908,26 +916,28 @@ void intel_hpd_poll_enable(struct drm_i915_private
> *dev_priv)
> *
> * Also see: intel_hpd_init() and intel_hpd_poll_enable().
> */
> -void intel_hpd_poll_disable(struct drm_i915_private *dev_priv)
> +void intel_hpd_poll_disable(struct intel_display *display)
> {
> - if (!HAS_DISPLAY(dev_priv))
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> +
> + if (!HAS_DISPLAY(display))
> return;
>
> - WRITE_ONCE(dev_priv->display.hotplug.poll_enabled, false);
> + WRITE_ONCE(display->hotplug.poll_enabled, false);
>
> spin_lock_irq(&dev_priv->irq_lock);
> - queue_detection_work(dev_priv,
> - &dev_priv->display.hotplug.poll_init_work);
> + queue_detection_work(display,
> + &display->hotplug.poll_init_work);
> spin_unlock_irq(&dev_priv->irq_lock);
> }
>
> -void intel_hpd_poll_fini(struct drm_i915_private *i915)
> +void intel_hpd_poll_fini(struct intel_display *display)
> {
> struct intel_connector *connector;
> struct drm_connector_list_iter conn_iter;
>
> /* Kill all the work that may have been queued by hpd. */
> - drm_connector_list_iter_begin(&i915->drm, &conn_iter);
> + drm_connector_list_iter_begin(display->drm, &conn_iter);
> for_each_intel_connector_iter(connector, &conn_iter) {
> intel_connector_cancel_modeset_retry_work(connector);
> intel_hdcp_cancel_works(connector);
> @@ -935,70 +945,70 @@ void intel_hpd_poll_fini(struct drm_i915_private
> *i915)
> drm_connector_list_iter_end(&conn_iter);
> }
>
> -void intel_hpd_init_early(struct drm_i915_private *i915)
> +void intel_hpd_init_early(struct intel_display *display)
> {
> - INIT_DELAYED_WORK(&i915->display.hotplug.hotplug_work,
> + INIT_DELAYED_WORK(&display->hotplug.hotplug_work,
> i915_hotplug_work_func);
> - INIT_WORK(&i915->display.hotplug.dig_port_work,
> i915_digport_work_func);
> - INIT_WORK(&i915->display.hotplug.poll_init_work,
> i915_hpd_poll_init_work);
> - INIT_DELAYED_WORK(&i915->display.hotplug.reenable_work,
> + INIT_WORK(&display->hotplug.dig_port_work, i915_digport_work_func);
> + INIT_WORK(&display->hotplug.poll_init_work, i915_hpd_poll_init_work);
> + INIT_DELAYED_WORK(&display->hotplug.reenable_work,
> intel_hpd_irq_storm_reenable_work);
>
> - i915->display.hotplug.hpd_storm_threshold =
> HPD_STORM_DEFAULT_THRESHOLD;
> + display->hotplug.hpd_storm_threshold =
> HPD_STORM_DEFAULT_THRESHOLD;
> /* If we have MST support, we want to avoid doing short HPD IRQ storm
> * detection, as short HPD storms will occur as a natural part of
> * sideband messaging with MST.
> * On older platforms however, IRQ storms can occur with both long and
> * short pulses, as seen on some G4x systems.
> */
> - i915->display.hotplug.hpd_short_storm_enabled = !HAS_DP_MST(i915);
> + display->hotplug.hpd_short_storm_enabled = !HAS_DP_MST(display);
> }
>
> -static bool cancel_all_detection_work(struct drm_i915_private *i915)
> +static bool cancel_all_detection_work(struct intel_display *display)
> {
> bool was_pending = false;
>
> - if (cancel_delayed_work_sync(&i915->display.hotplug.hotplug_work))
> + if (cancel_delayed_work_sync(&display->hotplug.hotplug_work))
> was_pending = true;
> - if (cancel_work_sync(&i915->display.hotplug.poll_init_work))
> + if (cancel_work_sync(&display->hotplug.poll_init_work))
> was_pending = true;
> - if (cancel_delayed_work_sync(&i915->display.hotplug.reenable_work))
> + if (cancel_delayed_work_sync(&display->hotplug.reenable_work))
> was_pending = true;
>
> return was_pending;
> }
>
> -void intel_hpd_cancel_work(struct drm_i915_private *dev_priv)
> +void intel_hpd_cancel_work(struct intel_display *display)
> {
> - struct intel_display *display = to_intel_display(&dev_priv->drm);
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
>
> - if (!HAS_DISPLAY(dev_priv))
> + if (!HAS_DISPLAY(display))
> return;
>
> spin_lock_irq(&dev_priv->irq_lock);
>
> drm_WARN_ON(display->drm, get_blocked_hpd_pin_mask(display));
>
> - dev_priv->display.hotplug.long_hpd_pin_mask = 0;
> - dev_priv->display.hotplug.short_hpd_pin_mask = 0;
> - dev_priv->display.hotplug.event_bits = 0;
> - dev_priv->display.hotplug.retry_bits = 0;
> + display->hotplug.long_hpd_pin_mask = 0;
> + display->hotplug.short_hpd_pin_mask = 0;
> + display->hotplug.event_bits = 0;
> + display->hotplug.retry_bits = 0;
>
> spin_unlock_irq(&dev_priv->irq_lock);
>
> - cancel_work_sync(&dev_priv->display.hotplug.dig_port_work);
> + cancel_work_sync(&display->hotplug.dig_port_work);
>
> /*
> * All other work triggered by hotplug events should be canceled by
> * now.
> */
> - if (cancel_all_detection_work(dev_priv))
> - drm_dbg_kms(&dev_priv->drm, "Hotplug detection work still
> active\n");
> + if (cancel_all_detection_work(display))
> + drm_dbg_kms(display->drm, "Hotplug detection work still
> active\n");
> }
>
> -static void queue_work_for_missed_irqs(struct drm_i915_private *i915)
> +static void queue_work_for_missed_irqs(struct intel_display *display)
> {
> - struct intel_display *display = to_intel_display(&i915->drm);
> + struct drm_i915_private *i915 = to_i915(display->drm);
> struct intel_hotplug *hotplug = &display->hotplug;
> bool queue_hp_work = false;
> u32 blocked_hpd_pin_mask;
> @@ -1011,7 +1021,7 @@ static void queue_work_for_missed_irqs(struct
> drm_i915_private *i915)
> queue_hp_work = true;
>
> for_each_hpd_pin(pin) {
> - switch (i915->display.hotplug.stats[pin].state) {
> + switch (display->hotplug.stats[pin].state) {
> case HPD_MARK_DISABLED:
> queue_hp_work = true;
> break;
> @@ -1019,7 +1029,7 @@ static void queue_work_for_missed_irqs(struct
> drm_i915_private *i915)
> case HPD_ENABLED:
> break;
> default:
> - MISSING_CASE(i915->display.hotplug.stats[pin].state);
> + MISSING_CASE(display->hotplug.stats[pin].state);
> }
> }
>
> @@ -1027,7 +1037,7 @@ static void queue_work_for_missed_irqs(struct
> drm_i915_private *i915)
> queue_work(hotplug->dp_wq, &hotplug->dig_port_work);
>
> if (queue_hp_work)
> - queue_delayed_detection_work(i915, &i915-
> >display.hotplug.hotplug_work, 0);
> + queue_delayed_detection_work(display, &display-
> >hotplug.hotplug_work, 0);
> }
>
> static bool block_hpd_pin(struct intel_display *display, enum hpd_pin pin)
> @@ -1121,7 +1131,7 @@ void intel_hpd_unblock(struct intel_encoder *encoder)
> spin_lock_irq(&i915->irq_lock);
>
> if (unblock_hpd_pin(display, encoder->hpd_pin))
> - queue_work_for_missed_irqs(i915);
> + queue_work_for_missed_irqs(display);
>
> spin_unlock_irq(&i915->irq_lock);
> }
> @@ -1156,30 +1166,35 @@ void intel_hpd_clear_and_unblock(struct
> intel_encoder *encoder)
> spin_unlock_irq(&i915->irq_lock);
> }
>
> -void intel_hpd_enable_detection_work(struct drm_i915_private *i915)
> +void intel_hpd_enable_detection_work(struct intel_display *display)
> {
> + struct drm_i915_private *i915 = to_i915(display->drm);
> +
> spin_lock_irq(&i915->irq_lock);
> - i915->display.hotplug.detection_work_enabled = true;
> - queue_work_for_missed_irqs(i915);
> + display->hotplug.detection_work_enabled = true;
> + queue_work_for_missed_irqs(display);
> spin_unlock_irq(&i915->irq_lock);
> }
>
> -void intel_hpd_disable_detection_work(struct drm_i915_private *i915)
> +void intel_hpd_disable_detection_work(struct intel_display *display)
> {
> + struct drm_i915_private *i915 = to_i915(display->drm);
> +
> spin_lock_irq(&i915->irq_lock);
> - i915->display.hotplug.detection_work_enabled = false;
> + display->hotplug.detection_work_enabled = false;
> spin_unlock_irq(&i915->irq_lock);
>
> - cancel_all_detection_work(i915);
> + cancel_all_detection_work(display);
> }
>
> -bool intel_hpd_schedule_detection(struct drm_i915_private *i915)
> +bool intel_hpd_schedule_detection(struct intel_display *display)
> {
> + struct drm_i915_private *i915 = to_i915(display->drm);
> unsigned long flags;
> bool ret;
>
> spin_lock_irqsave(&i915->irq_lock, flags);
> - ret = queue_delayed_detection_work(i915, &i915-
> >display.hotplug.hotplug_work, 0);
> + ret = queue_delayed_detection_work(display, &display-
> >hotplug.hotplug_work, 0);
> spin_unlock_irqrestore(&i915->irq_lock, flags);
>
> return ret;
> @@ -1188,14 +1203,15 @@ bool intel_hpd_schedule_detection(struct
> drm_i915_private *i915)
> static int i915_hpd_storm_ctl_show(struct seq_file *m, void *data)
> {
> struct drm_i915_private *dev_priv = m->private;
> - struct intel_hotplug *hotplug = &dev_priv->display.hotplug;
> + struct intel_display *display = &dev_priv->display;
> + struct intel_hotplug *hotplug = &display->hotplug;
>
> /* Synchronize with everything first in case there's been an HPD
> * storm, but we haven't finished handling it in the kernel yet
> */
> intel_synchronize_irq(dev_priv);
> - flush_work(&dev_priv->display.hotplug.dig_port_work);
> - flush_delayed_work(&dev_priv->display.hotplug.hotplug_work);
> + flush_work(&display->hotplug.dig_port_work);
> + flush_delayed_work(&display->hotplug.hotplug_work);
>
> seq_printf(m, "Threshold: %d\n", hotplug->hpd_storm_threshold);
> seq_printf(m, "Detected: %s\n",
> @@ -1210,7 +1226,8 @@ static ssize_t i915_hpd_storm_ctl_write(struct file
> *file,
> {
> struct seq_file *m = file->private_data;
> struct drm_i915_private *dev_priv = m->private;
> - struct intel_hotplug *hotplug = &dev_priv->display.hotplug;
> + struct intel_display *display = &dev_priv->display;
> + struct intel_hotplug *hotplug = &display->hotplug;
> unsigned int new_threshold;
> int i;
> char *newline;
> @@ -1235,11 +1252,11 @@ static ssize_t i915_hpd_storm_ctl_write(struct file
> *file,
> return -EINVAL;
>
> if (new_threshold > 0)
> - drm_dbg_kms(&dev_priv->drm,
> + drm_dbg_kms(display->drm,
> "Setting HPD storm detection threshold to %d\n",
> new_threshold);
> else
> - drm_dbg_kms(&dev_priv->drm, "Disabling HPD storm
> detection\n");
> + drm_dbg_kms(display->drm, "Disabling HPD storm detection\n");
>
> spin_lock_irq(&dev_priv->irq_lock);
> hotplug->hpd_storm_threshold = new_threshold;
> @@ -1249,7 +1266,7 @@ static ssize_t i915_hpd_storm_ctl_write(struct file
> *file,
> spin_unlock_irq(&dev_priv->irq_lock);
>
> /* Re-enable hpd immediately if we were in an irq storm */
> - flush_delayed_work(&dev_priv->display.hotplug.reenable_work);
> + flush_delayed_work(&display->hotplug.reenable_work);
>
> return len;
> }
> @@ -1271,9 +1288,10 @@ static const struct file_operations
> i915_hpd_storm_ctl_fops = {
> static int i915_hpd_short_storm_ctl_show(struct seq_file *m, void *data)
> {
> struct drm_i915_private *dev_priv = m->private;
> + struct intel_display *display = &dev_priv->display;
>
> seq_printf(m, "Enabled: %s\n",
> - str_yes_no(dev_priv-
> >display.hotplug.hpd_short_storm_enabled));
> + str_yes_no(display->hotplug.hpd_short_storm_enabled));
>
> return 0;
> }
> @@ -1291,7 +1309,8 @@ static ssize_t i915_hpd_short_storm_ctl_write(struct
> file *file,
> {
> struct seq_file *m = file->private_data;
> struct drm_i915_private *dev_priv = m->private;
> - struct intel_hotplug *hotplug = &dev_priv->display.hotplug;
> + struct intel_display *display = &dev_priv->display;
> + struct intel_hotplug *hotplug = &display->hotplug;
> char *newline;
> char tmp[16];
> int i;
> @@ -1312,11 +1331,11 @@ static ssize_t
> i915_hpd_short_storm_ctl_write(struct file *file,
>
> /* Reset to the "default" state for this system */
> if (strcmp(tmp, "reset") == 0)
> - new_state = !HAS_DP_MST(dev_priv);
> + new_state = !HAS_DP_MST(display);
> else if (kstrtobool(tmp, &new_state) != 0)
> return -EINVAL;
>
> - drm_dbg_kms(&dev_priv->drm, "%sabling HPD short storm detection\n",
> + drm_dbg_kms(display->drm, "%sabling HPD short storm detection\n",
> new_state ? "En" : "Dis");
>
> spin_lock_irq(&dev_priv->irq_lock);
> @@ -1327,7 +1346,7 @@ static ssize_t i915_hpd_short_storm_ctl_write(struct
> file *file,
> spin_unlock_irq(&dev_priv->irq_lock);
>
> /* Re-enable hpd immediately if we were in an irq storm */
> - flush_delayed_work(&dev_priv->display.hotplug.reenable_work);
> + flush_delayed_work(&display->hotplug.reenable_work);
>
> return len;
> }
> @@ -1341,14 +1360,15 @@ static const struct file_operations
> i915_hpd_short_storm_ctl_fops = {
> .write = i915_hpd_short_storm_ctl_write,
> };
>
> -void intel_hpd_debugfs_register(struct drm_i915_private *i915)
> +void intel_hpd_debugfs_register(struct intel_display *display)
> {
> - struct drm_minor *minor = i915->drm.primary;
> + struct drm_minor *minor = display->drm->primary;
> + struct drm_i915_private *i915 = to_i915(display->drm);
>
> debugfs_create_file("i915_hpd_storm_ctl", 0644, minor->debugfs_root,
> i915, &i915_hpd_storm_ctl_fops);
> debugfs_create_file("i915_hpd_short_storm_ctl", 0644, minor-
> >debugfs_root,
> i915, &i915_hpd_short_storm_ctl_fops);
> debugfs_create_bool("i915_ignore_long_hpd", 0644, minor-
> >debugfs_root,
> - &i915->display.hotplug.ignore_long_hpd);
> + &display->hotplug.ignore_long_hpd);
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.h
> b/drivers/gpu/drm/i915/display/intel_hotplug.h
> index f189b871904e..edc41c9d3d65 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug.h
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug.h
> @@ -8,31 +8,31 @@
>
> #include <linux/types.h>
>
> -struct drm_i915_private;
> +enum port;
> struct intel_connector;
> struct intel_digital_port;
> +struct intel_display;
> struct intel_encoder;
> -enum port;
>
> -void intel_hpd_poll_enable(struct drm_i915_private *dev_priv);
> -void intel_hpd_poll_disable(struct drm_i915_private *dev_priv);
> -void intel_hpd_poll_fini(struct drm_i915_private *i915);
> +void intel_hpd_poll_enable(struct intel_display *display);
> +void intel_hpd_poll_disable(struct intel_display *display);
> +void intel_hpd_poll_fini(struct intel_display *display);
> enum intel_hotplug_state intel_encoder_hotplug(struct intel_encoder *encoder,
> struct intel_connector *connector);
> -void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
> +void intel_hpd_irq_handler(struct intel_display *display,
> u32 pin_mask, u32 long_mask);
> void intel_hpd_trigger_irq(struct intel_digital_port *dig_port);
> -void intel_hpd_init(struct drm_i915_private *dev_priv);
> -void intel_hpd_init_early(struct drm_i915_private *i915);
> -void intel_hpd_cancel_work(struct drm_i915_private *dev_priv);
> +void intel_hpd_init(struct intel_display *display);
> +void intel_hpd_init_early(struct intel_display *display);
> +void intel_hpd_cancel_work(struct intel_display *display);
> enum hpd_pin intel_hpd_pin_default(enum port port);
> void intel_hpd_block(struct intel_encoder *encoder);
> void intel_hpd_unblock(struct intel_encoder *encoder);
> void intel_hpd_clear_and_unblock(struct intel_encoder *encoder);
> -void intel_hpd_debugfs_register(struct drm_i915_private *i915);
> +void intel_hpd_debugfs_register(struct intel_display *display);
>
> -void intel_hpd_enable_detection_work(struct drm_i915_private *i915);
> -void intel_hpd_disable_detection_work(struct drm_i915_private *i915);
> -bool intel_hpd_schedule_detection(struct drm_i915_private *i915);
> +void intel_hpd_enable_detection_work(struct intel_display *display);
> +void intel_hpd_disable_detection_work(struct intel_display *display);
> +bool intel_hpd_schedule_detection(struct intel_display *display);
>
> #endif /* __INTEL_HOTPLUG_H__ */
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> index 2137ac7b882a..e6320838df59 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> @@ -472,7 +472,7 @@ void i9xx_hpd_irq_handler(struct drm_i915_private
> *dev_priv, u32 hotplug_status)
> dev_priv->display.hotplug.hpd,
> i9xx_port_hotplug_long_detect);
>
> - intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
> + intel_hpd_irq_handler(display, pin_mask, long_mask);
> }
>
> if ((IS_G4X(dev_priv) ||
> @@ -483,6 +483,7 @@ void i9xx_hpd_irq_handler(struct drm_i915_private
> *dev_priv, u32 hotplug_status)
>
> void ibx_hpd_irq_handler(struct drm_i915_private *dev_priv, u32
> hotplug_trigger)
> {
> + struct intel_display *display = &dev_priv->display;
> u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
>
> /*
> @@ -509,7 +510,7 @@ void ibx_hpd_irq_handler(struct drm_i915_private
> *dev_priv, u32 hotplug_trigger)
> dev_priv->display.hotplug.pch_hpd,
> pch_port_hotplug_long_detect);
>
> - intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
> + intel_hpd_irq_handler(display, pin_mask, long_mask);
> }
>
> void xelpdp_pica_irq_handler(struct drm_i915_private *i915, u32 iir)
> @@ -543,7 +544,7 @@ void xelpdp_pica_irq_handler(struct drm_i915_private
> *i915, u32 iir)
> "pica hotplug event received, stat 0x%08x, pins 0x%08x,
> long 0x%08x\n",
> hotplug_trigger, pin_mask, long_mask);
>
> - intel_hpd_irq_handler(i915, pin_mask, long_mask);
> + intel_hpd_irq_handler(display, pin_mask, long_mask);
> }
>
> if (trigger_aux)
> @@ -587,7 +588,7 @@ void icp_irq_handler(struct drm_i915_private *dev_priv,
> u32 pch_iir)
> }
>
> if (pin_mask)
> - intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
> + intel_hpd_irq_handler(display, pin_mask, long_mask);
>
> if (pch_iir & SDE_GMBUS_ICP)
> intel_gmbus_irq_handler(display);
> @@ -624,7 +625,7 @@ void spt_irq_handler(struct drm_i915_private *dev_priv,
> u32 pch_iir)
> }
>
> if (pin_mask)
> - intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
> + intel_hpd_irq_handler(display, pin_mask, long_mask);
>
> if (pch_iir & SDE_GMBUS_CPT)
> intel_gmbus_irq_handler(display);
> @@ -632,6 +633,7 @@ void spt_irq_handler(struct drm_i915_private *dev_priv,
> u32 pch_iir)
>
> void ilk_hpd_irq_handler(struct drm_i915_private *dev_priv, u32
> hotplug_trigger)
> {
> + struct intel_display *display = &dev_priv->display;
> u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
>
> dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore,
> DIGITAL_PORT_HOTPLUG_CNTRL, 0, 0);
> @@ -641,11 +643,12 @@ void ilk_hpd_irq_handler(struct drm_i915_private
> *dev_priv, u32 hotplug_trigger)
> dev_priv->display.hotplug.hpd,
> ilk_port_hotplug_long_detect);
>
> - intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
> + intel_hpd_irq_handler(display, pin_mask, long_mask);
> }
>
> void bxt_hpd_irq_handler(struct drm_i915_private *dev_priv, u32
> hotplug_trigger)
> {
> + struct intel_display *display = &dev_priv->display;
> u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
>
> dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore,
> PCH_PORT_HOTPLUG, 0, 0);
> @@ -655,11 +658,12 @@ void bxt_hpd_irq_handler(struct drm_i915_private
> *dev_priv, u32 hotplug_trigger)
> dev_priv->display.hotplug.hpd,
> bxt_port_hotplug_long_detect);
>
> - intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
> + intel_hpd_irq_handler(display, pin_mask, long_mask);
> }
>
> void gen11_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
> {
> + struct intel_display *display = &dev_priv->display;
> u32 pin_mask = 0, long_mask = 0;
> u32 trigger_tc = iir & GEN11_DE_TC_HOTPLUG_MASK;
> u32 trigger_tbt = iir & GEN11_DE_TBT_HOTPLUG_MASK;
> @@ -687,7 +691,7 @@ void gen11_hpd_irq_handler(struct drm_i915_private
> *dev_priv, u32 iir)
> }
>
> if (pin_mask)
> - intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
> + intel_hpd_irq_handler(display, pin_mask, long_mask);
> else
> drm_err(&dev_priv->drm,
> "Unexpected DE HPD interrupt 0x%08x\n", iir);
> @@ -1467,9 +1471,11 @@ void intel_hpd_irq_setup(struct drm_i915_private
> *i915)
>
> void intel_hotplug_irq_init(struct drm_i915_private *i915)
> {
> + struct intel_display *display = &i915->display;
> +
> intel_hpd_init_pins(i915);
>
> - intel_hpd_init_early(i915);
> + intel_hpd_init_early(display);
>
> if (HAS_GMCH(i915)) {
> if (I915_HAS_HOTPLUG(i915))
> diff --git a/drivers/gpu/drm/i915/i915_driver.c
> b/drivers/gpu/drm/i915/i915_driver.c
> index ce3cc93ea211..510e240c000b 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -981,7 +981,7 @@ void i915_driver_shutdown(struct drm_i915_private
> *i915)
> intel_dp_mst_suspend(display);
>
> intel_irq_suspend(i915);
> - intel_hpd_cancel_work(i915);
> + intel_hpd_cancel_work(display);
>
> if (HAS_DISPLAY(i915))
> intel_display_driver_suspend_access(display);
> @@ -1064,7 +1064,7 @@ static int i915_drm_suspend(struct drm_device *dev)
> intel_display_driver_suspend(display);
>
> intel_irq_suspend(dev_priv);
> - intel_hpd_cancel_work(dev_priv);
> + intel_hpd_cancel_work(display);
>
> if (HAS_DISPLAY(dev_priv))
> intel_display_driver_suspend_access(display);
> @@ -1227,7 +1227,7 @@ static int i915_drm_resume(struct drm_device *dev)
> if (HAS_DISPLAY(dev_priv))
> intel_display_driver_resume_access(display);
>
> - intel_hpd_init(dev_priv);
> + intel_hpd_init(display);
>
> intel_display_driver_resume(display);
>
> @@ -1235,7 +1235,7 @@ static int i915_drm_resume(struct drm_device *dev)
> intel_display_driver_enable_user_access(display);
> drm_kms_helper_poll_enable(dev);
> }
> - intel_hpd_poll_disable(dev_priv);
> + intel_hpd_poll_disable(display);
>
> intel_opregion_resume(display);
>
> @@ -1575,7 +1575,7 @@ static int intel_runtime_suspend(struct device *kdev)
> assert_forcewakes_inactive(&dev_priv->uncore);
>
> if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
> - intel_hpd_poll_enable(dev_priv);
> + intel_hpd_poll_enable(display);
>
> drm_dbg(&dev_priv->drm, "Device suspended\n");
> return 0;
> @@ -1633,8 +1633,8 @@ static int intel_runtime_resume(struct device *kdev)
> * everyone else do it here.
> */
> if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv)) {
> - intel_hpd_init(dev_priv);
> - intel_hpd_poll_disable(dev_priv);
> + intel_hpd_init(display);
> + intel_hpd_poll_disable(display);
> }
>
> skl_watermark_ipc_update(dev_priv);
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 37ca4a35daf2..de53615571be 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1280,6 +1280,7 @@ int intel_irq_install(struct drm_i915_private *dev_priv)
> */
> void intel_irq_uninstall(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> int irq = to_pci_dev(dev_priv->drm.dev)->irq;
>
> if (drm_WARN_ON(&dev_priv->drm, !dev_priv->irqs_enabled))
> @@ -1289,7 +1290,7 @@ void intel_irq_uninstall(struct drm_i915_private
> *dev_priv)
>
> free_irq(irq, dev_priv);
>
> - intel_hpd_cancel_work(dev_priv);
> + intel_hpd_cancel_work(display);
> dev_priv->irqs_enabled = false;
> }
>
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c
> b/drivers/gpu/drm/xe/display/xe_display.c
> index 0b0aca7a25af..263459323bf7 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -173,7 +173,7 @@ static void xe_display_fini(void *arg)
> struct xe_device *xe = arg;
> struct intel_display *display = &xe->display;
>
> - intel_hpd_poll_fini(xe);
> + intel_hpd_poll_fini(display);
> intel_hdcp_component_fini(display);
> intel_audio_deinit(display);
> intel_display_driver_remove(display);
> @@ -305,7 +305,7 @@ static void xe_display_enable_d3cold(struct xe_device
> *xe)
> intel_dmc_suspend(display);
>
> if (has_display(xe))
> - intel_hpd_poll_enable(xe);
> + intel_hpd_poll_enable(display);
> }
>
> static void xe_display_disable_d3cold(struct xe_device *xe)
> @@ -322,10 +322,10 @@ static void xe_display_disable_d3cold(struct xe_device
> *xe)
>
> intel_display_driver_init_hw(display);
>
> - intel_hpd_init(xe);
> + intel_hpd_init(display);
>
> if (has_display(xe))
> - intel_hpd_poll_disable(xe);
> + intel_hpd_poll_disable(display);
>
> intel_opregion_resume(display);
>
> @@ -355,7 +355,7 @@ void xe_display_pm_suspend(struct xe_device *xe)
>
> xe_display_flush_cleanup_work(xe);
>
> - intel_hpd_cancel_work(xe);
> + intel_hpd_cancel_work(display);
>
> if (has_display(xe)) {
> intel_display_driver_suspend_access(display);
> @@ -385,7 +385,7 @@ void xe_display_pm_shutdown(struct xe_device *xe)
>
> xe_display_flush_cleanup_work(xe);
> intel_dp_mst_suspend(display);
> - intel_hpd_cancel_work(xe);
> + intel_hpd_cancel_work(display);
>
> if (has_display(xe))
> intel_display_driver_suspend_access(display);
> @@ -400,6 +400,8 @@ void xe_display_pm_shutdown(struct xe_device *xe)
>
> void xe_display_pm_runtime_suspend(struct xe_device *xe)
> {
> + struct intel_display *display = &xe->display;
> +
> if (!xe->info.probe_display)
> return;
>
> @@ -408,7 +410,7 @@ void xe_display_pm_runtime_suspend(struct xe_device
> *xe)
> return;
> }
>
> - intel_hpd_poll_enable(xe);
> + intel_hpd_poll_enable(display);
> }
>
> void xe_display_pm_suspend_late(struct xe_device *xe)
> @@ -482,7 +484,7 @@ void xe_display_pm_resume(struct xe_device *xe)
> if (has_display(xe))
> intel_display_driver_resume_access(display);
>
> - intel_hpd_init(xe);
> + intel_hpd_init(display);
>
> if (has_display(xe)) {
> intel_display_driver_resume(display);
> @@ -491,7 +493,7 @@ void xe_display_pm_resume(struct xe_device *xe)
> }
>
> if (has_display(xe))
> - intel_hpd_poll_disable(xe);
> + intel_hpd_poll_disable(display);
>
> intel_opregion_resume(display);
>
> @@ -502,6 +504,8 @@ void xe_display_pm_resume(struct xe_device *xe)
>
> void xe_display_pm_runtime_resume(struct xe_device *xe)
> {
> + struct intel_display *display = &xe->display;
> +
> if (!xe->info.probe_display)
> return;
>
> @@ -510,8 +514,8 @@ void xe_display_pm_runtime_resume(struct xe_device
> *xe)
> return;
> }
>
> - intel_hpd_init(xe);
> - intel_hpd_poll_disable(xe);
> + intel_hpd_init(display);
> + intel_hpd_poll_disable(display);
> skl_watermark_ipc_update(xe);
> }
>
> --
> 2.39.5
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 4/9] drm/i915/hotplug: convert hotplug debugfs to struct intel_display
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (2 preceding siblings ...)
2025-03-11 18:00 ` [PATCH 3/9] drm/i915/hotplug: convert intel_hotplug.[ch] " Jani Nikula
@ 2025-03-11 18:00 ` Jani Nikula
2025-03-12 5:17 ` Shankar, Uma
2025-03-11 18:00 ` [PATCH 5/9] drm/i915/hotplug: convert hotplug irq handling to intel_de_*() Jani Nikula
` (13 subsequent siblings)
17 siblings, 1 reply; 31+ messages in thread
From: Jani Nikula @ 2025-03-11 18:00 UTC (permalink / raw)
To: intel-gfx, intel-xe; +Cc: jani.nikula
Pass struct intel_display as the cookie to debugfs functions.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_hotplug.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
index 9bde28ce1979..7683b3ce124d 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
@@ -1202,8 +1202,8 @@ bool intel_hpd_schedule_detection(struct intel_display *display)
static int i915_hpd_storm_ctl_show(struct seq_file *m, void *data)
{
- struct drm_i915_private *dev_priv = m->private;
- struct intel_display *display = &dev_priv->display;
+ struct intel_display *display = m->private;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
struct intel_hotplug *hotplug = &display->hotplug;
/* Synchronize with everything first in case there's been an HPD
@@ -1225,8 +1225,8 @@ static ssize_t i915_hpd_storm_ctl_write(struct file *file,
loff_t *offp)
{
struct seq_file *m = file->private_data;
- struct drm_i915_private *dev_priv = m->private;
- struct intel_display *display = &dev_priv->display;
+ struct intel_display *display = m->private;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
struct intel_hotplug *hotplug = &display->hotplug;
unsigned int new_threshold;
int i;
@@ -1287,8 +1287,7 @@ static const struct file_operations i915_hpd_storm_ctl_fops = {
static int i915_hpd_short_storm_ctl_show(struct seq_file *m, void *data)
{
- struct drm_i915_private *dev_priv = m->private;
- struct intel_display *display = &dev_priv->display;
+ struct intel_display *display = m->private;
seq_printf(m, "Enabled: %s\n",
str_yes_no(display->hotplug.hpd_short_storm_enabled));
@@ -1308,8 +1307,8 @@ static ssize_t i915_hpd_short_storm_ctl_write(struct file *file,
size_t len, loff_t *offp)
{
struct seq_file *m = file->private_data;
- struct drm_i915_private *dev_priv = m->private;
- struct intel_display *display = &dev_priv->display;
+ struct intel_display *display = m->private;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
struct intel_hotplug *hotplug = &display->hotplug;
char *newline;
char tmp[16];
@@ -1363,12 +1362,11 @@ static const struct file_operations i915_hpd_short_storm_ctl_fops = {
void intel_hpd_debugfs_register(struct intel_display *display)
{
struct drm_minor *minor = display->drm->primary;
- struct drm_i915_private *i915 = to_i915(display->drm);
debugfs_create_file("i915_hpd_storm_ctl", 0644, minor->debugfs_root,
- i915, &i915_hpd_storm_ctl_fops);
+ display, &i915_hpd_storm_ctl_fops);
debugfs_create_file("i915_hpd_short_storm_ctl", 0644, minor->debugfs_root,
- i915, &i915_hpd_short_storm_ctl_fops);
+ display, &i915_hpd_short_storm_ctl_fops);
debugfs_create_bool("i915_ignore_long_hpd", 0644, minor->debugfs_root,
&display->hotplug.ignore_long_hpd);
}
--
2.39.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* RE: [PATCH 4/9] drm/i915/hotplug: convert hotplug debugfs to struct intel_display
2025-03-11 18:00 ` [PATCH 4/9] drm/i915/hotplug: convert hotplug debugfs " Jani Nikula
@ 2025-03-12 5:17 ` Shankar, Uma
0 siblings, 0 replies; 31+ messages in thread
From: Shankar, Uma @ 2025-03-12 5:17 UTC (permalink / raw)
To: Nikula, Jani, intel-gfx@lists.freedesktop.org,
intel-xe@lists.freedesktop.org
Cc: Nikula, Jani
> -----Original Message-----
> From: Intel-xe <intel-xe-bounces@lists.freedesktop.org> On Behalf Of Jani Nikula
> Sent: Tuesday, March 11, 2025 11:31 PM
> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nikula@intel.com>
> Subject: [PATCH 4/9] drm/i915/hotplug: convert hotplug debugfs to struct
> intel_display
>
> Pass struct intel_display as the cookie to debugfs functions.
Looks Good to me.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_hotplug.c | 20 +++++++++-----------
> 1 file changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c
> b/drivers/gpu/drm/i915/display/intel_hotplug.c
> index 9bde28ce1979..7683b3ce124d 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug.c
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
> @@ -1202,8 +1202,8 @@ bool intel_hpd_schedule_detection(struct intel_display
> *display)
>
> static int i915_hpd_storm_ctl_show(struct seq_file *m, void *data) {
> - struct drm_i915_private *dev_priv = m->private;
> - struct intel_display *display = &dev_priv->display;
> + struct intel_display *display = m->private;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> struct intel_hotplug *hotplug = &display->hotplug;
>
> /* Synchronize with everything first in case there's been an HPD @@ -
> 1225,8 +1225,8 @@ static ssize_t i915_hpd_storm_ctl_write(struct file *file,
> loff_t *offp)
> {
> struct seq_file *m = file->private_data;
> - struct drm_i915_private *dev_priv = m->private;
> - struct intel_display *display = &dev_priv->display;
> + struct intel_display *display = m->private;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> struct intel_hotplug *hotplug = &display->hotplug;
> unsigned int new_threshold;
> int i;
> @@ -1287,8 +1287,7 @@ static const struct file_operations
> i915_hpd_storm_ctl_fops = {
>
> static int i915_hpd_short_storm_ctl_show(struct seq_file *m, void *data) {
> - struct drm_i915_private *dev_priv = m->private;
> - struct intel_display *display = &dev_priv->display;
> + struct intel_display *display = m->private;
>
> seq_printf(m, "Enabled: %s\n",
> str_yes_no(display->hotplug.hpd_short_storm_enabled));
> @@ -1308,8 +1307,8 @@ static ssize_t i915_hpd_short_storm_ctl_write(struct
> file *file,
> size_t len, loff_t *offp)
> {
> struct seq_file *m = file->private_data;
> - struct drm_i915_private *dev_priv = m->private;
> - struct intel_display *display = &dev_priv->display;
> + struct intel_display *display = m->private;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> struct intel_hotplug *hotplug = &display->hotplug;
> char *newline;
> char tmp[16];
> @@ -1363,12 +1362,11 @@ static const struct file_operations
> i915_hpd_short_storm_ctl_fops = { void intel_hpd_debugfs_register(struct
> intel_display *display) {
> struct drm_minor *minor = display->drm->primary;
> - struct drm_i915_private *i915 = to_i915(display->drm);
>
> debugfs_create_file("i915_hpd_storm_ctl", 0644, minor->debugfs_root,
> - i915, &i915_hpd_storm_ctl_fops);
> + display, &i915_hpd_storm_ctl_fops);
> debugfs_create_file("i915_hpd_short_storm_ctl", 0644, minor-
> >debugfs_root,
> - i915, &i915_hpd_short_storm_ctl_fops);
> + display, &i915_hpd_short_storm_ctl_fops);
> debugfs_create_bool("i915_ignore_long_hpd", 0644, minor-
> >debugfs_root,
> &display->hotplug.ignore_long_hpd);
> }
> --
> 2.39.5
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 5/9] drm/i915/hotplug: convert hotplug irq handling to intel_de_*()
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (3 preceding siblings ...)
2025-03-11 18:00 ` [PATCH 4/9] drm/i915/hotplug: convert hotplug debugfs " Jani Nikula
@ 2025-03-11 18:00 ` Jani Nikula
2025-03-12 5:23 ` Shankar, Uma
2025-03-11 18:00 ` [PATCH 6/9] drm/i915/hotplug: convert intel_hotplug_irq.[ch] to struct intel_display Jani Nikula
` (12 subsequent siblings)
17 siblings, 1 reply; 31+ messages in thread
From: Jani Nikula @ 2025-03-11 18:00 UTC (permalink / raw)
To: intel-gfx, intel-xe; +Cc: jani.nikula
All the registers handled here are display registers. Switch from
intel_uncore_*() to intel_de_*() functions.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../gpu/drm/i915/display/intel_hotplug_irq.c | 205 ++++++++++--------
1 file changed, 114 insertions(+), 91 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
index e6320838df59..f24c65478742 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
@@ -183,11 +183,12 @@ static void intel_hpd_init_pins(struct drm_i915_private *dev_priv)
void i915_hotplug_interrupt_update_locked(struct drm_i915_private *dev_priv,
u32 mask, u32 bits)
{
+ struct intel_display *display = &dev_priv->display;
+
lockdep_assert_held(&dev_priv->irq_lock);
drm_WARN_ON(&dev_priv->drm, bits & ~mask);
- intel_uncore_rmw(&dev_priv->uncore, PORT_HOTPLUG_EN(dev_priv), mask,
- bits);
+ intel_de_rmw(display, PORT_HOTPLUG_EN(display), mask, bits);
}
/**
@@ -415,6 +416,7 @@ static u32 intel_hpd_hotplug_enables(struct drm_i915_private *i915,
u32 i9xx_hpd_irq_ack(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
u32 hotplug_status = 0, hotplug_status_mask;
int i;
@@ -435,21 +437,20 @@ u32 i9xx_hpd_irq_ack(struct drm_i915_private *dev_priv)
* bits can itself generate a new hotplug interrupt :(
*/
for (i = 0; i < 10; i++) {
- u32 tmp = intel_uncore_read(&dev_priv->uncore,
- PORT_HOTPLUG_STAT(dev_priv)) & hotplug_status_mask;
+ u32 tmp = intel_de_read(display,
+ PORT_HOTPLUG_STAT(display)) & hotplug_status_mask;
if (tmp == 0)
return hotplug_status;
hotplug_status |= tmp;
- intel_uncore_write(&dev_priv->uncore,
- PORT_HOTPLUG_STAT(dev_priv),
- hotplug_status);
+ intel_de_write(display, PORT_HOTPLUG_STAT(display),
+ hotplug_status);
}
drm_WARN_ONCE(&dev_priv->drm, 1,
"PORT_HOTPLUG_STAT did not clear (0x%08x)\n",
- intel_uncore_read(&dev_priv->uncore, PORT_HOTPLUG_STAT(dev_priv)));
+ intel_de_read(display, PORT_HOTPLUG_STAT(display)));
return hotplug_status;
}
@@ -492,7 +493,7 @@ void ibx_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_trigger)
* zero. Not acking leads to "The master control interrupt lied (SDE)!"
* errors.
*/
- dig_hotplug_reg = intel_uncore_read(&dev_priv->uncore, PCH_PORT_HOTPLUG);
+ dig_hotplug_reg = intel_de_read(display, PCH_PORT_HOTPLUG);
if (!hotplug_trigger) {
u32 mask = PORTA_HOTPLUG_STATUS_MASK |
PORTD_HOTPLUG_STATUS_MASK |
@@ -501,7 +502,7 @@ void ibx_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_trigger)
dig_hotplug_reg &= ~mask;
}
- intel_uncore_write(&dev_priv->uncore, PCH_PORT_HOTPLUG, dig_hotplug_reg);
+ intel_de_write(display, PCH_PORT_HOTPLUG, dig_hotplug_reg);
if (!hotplug_trigger)
return;
@@ -567,7 +568,7 @@ void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
/* Locking due to DSI native GPIO sequences */
spin_lock(&dev_priv->irq_lock);
- dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore, SHOTPLUG_CTL_DDI, 0, 0);
+ dig_hotplug_reg = intel_de_rmw(display, SHOTPLUG_CTL_DDI, 0, 0);
spin_unlock(&dev_priv->irq_lock);
intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
@@ -579,7 +580,7 @@ void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
if (tc_hotplug_trigger) {
u32 dig_hotplug_reg;
- dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore, SHOTPLUG_CTL_TC, 0, 0);
+ dig_hotplug_reg = intel_de_rmw(display, SHOTPLUG_CTL_TC, 0, 0);
intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
tc_hotplug_trigger, dig_hotplug_reg,
@@ -605,7 +606,7 @@ void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
if (hotplug_trigger) {
u32 dig_hotplug_reg;
- dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG, 0, 0);
+ dig_hotplug_reg = intel_de_rmw(display, PCH_PORT_HOTPLUG, 0, 0);
intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
hotplug_trigger, dig_hotplug_reg,
@@ -616,7 +617,7 @@ void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
if (hotplug2_trigger) {
u32 dig_hotplug_reg;
- dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG2, 0, 0);
+ dig_hotplug_reg = intel_de_rmw(display, PCH_PORT_HOTPLUG2, 0, 0);
intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
hotplug2_trigger, dig_hotplug_reg,
@@ -636,7 +637,7 @@ void ilk_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_trigger)
struct intel_display *display = &dev_priv->display;
u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
- dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore, DIGITAL_PORT_HOTPLUG_CNTRL, 0, 0);
+ dig_hotplug_reg = intel_de_rmw(display, DIGITAL_PORT_HOTPLUG_CNTRL, 0, 0);
intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
hotplug_trigger, dig_hotplug_reg,
@@ -651,7 +652,7 @@ void bxt_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_trigger)
struct intel_display *display = &dev_priv->display;
u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
- dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG, 0, 0);
+ dig_hotplug_reg = intel_de_rmw(display, PCH_PORT_HOTPLUG, 0, 0);
intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
hotplug_trigger, dig_hotplug_reg,
@@ -671,7 +672,7 @@ void gen11_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
if (trigger_tc) {
u32 dig_hotplug_reg;
- dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore, GEN11_TC_HOTPLUG_CTL, 0, 0);
+ dig_hotplug_reg = intel_de_rmw(display, GEN11_TC_HOTPLUG_CTL, 0, 0);
intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
trigger_tc, dig_hotplug_reg,
@@ -682,7 +683,7 @@ void gen11_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
if (trigger_tbt) {
u32 dig_hotplug_reg;
- dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore, GEN11_TBT_HOTPLUG_CTL, 0, 0);
+ dig_hotplug_reg = intel_de_rmw(display, GEN11_TBT_HOTPLUG_CTL, 0, 0);
intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
trigger_tbt, dig_hotplug_reg,
@@ -741,23 +742,25 @@ static u32 ibx_hotplug_enables(struct intel_encoder *encoder)
static void ibx_hpd_detection_setup(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
+
/*
* Enable digital hotplug on the PCH, and configure the DP short pulse
* duration to 2ms (which is the minimum in the Display Port spec).
* The pulse duration bits are reserved on LPT+.
*/
- intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG,
- intel_hpd_hotplug_mask(dev_priv, ibx_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, ibx_hotplug_enables));
+ intel_de_rmw(display, PCH_PORT_HOTPLUG,
+ intel_hpd_hotplug_mask(dev_priv, ibx_hotplug_mask),
+ intel_hpd_hotplug_enables(dev_priv, ibx_hotplug_enables));
}
static void ibx_hpd_enable_detection(struct intel_encoder *encoder)
{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ struct intel_display *display = to_intel_display(encoder);
- intel_uncore_rmw(&i915->uncore, PCH_PORT_HOTPLUG,
- ibx_hotplug_mask(encoder->hpd_pin),
- ibx_hotplug_enables(encoder));
+ intel_de_rmw(display, PCH_PORT_HOTPLUG,
+ ibx_hotplug_mask(encoder->hpd_pin),
+ ibx_hotplug_enables(encoder));
}
static void ibx_hpd_irq_setup(struct drm_i915_private *dev_priv)
@@ -812,34 +815,38 @@ static u32 icp_tc_hotplug_enables(struct intel_encoder *encoder)
static void icp_ddi_hpd_detection_setup(struct drm_i915_private *dev_priv)
{
- intel_uncore_rmw(&dev_priv->uncore, SHOTPLUG_CTL_DDI,
- intel_hpd_hotplug_mask(dev_priv, icp_ddi_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, icp_ddi_hotplug_enables));
+ struct intel_display *display = &dev_priv->display;
+
+ intel_de_rmw(display, SHOTPLUG_CTL_DDI,
+ intel_hpd_hotplug_mask(dev_priv, icp_ddi_hotplug_mask),
+ intel_hpd_hotplug_enables(dev_priv, icp_ddi_hotplug_enables));
}
static void icp_ddi_hpd_enable_detection(struct intel_encoder *encoder)
{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ struct intel_display *display = to_intel_display(encoder);
- intel_uncore_rmw(&i915->uncore, SHOTPLUG_CTL_DDI,
- icp_ddi_hotplug_mask(encoder->hpd_pin),
- icp_ddi_hotplug_enables(encoder));
+ intel_de_rmw(display, SHOTPLUG_CTL_DDI,
+ icp_ddi_hotplug_mask(encoder->hpd_pin),
+ icp_ddi_hotplug_enables(encoder));
}
static void icp_tc_hpd_detection_setup(struct drm_i915_private *dev_priv)
{
- intel_uncore_rmw(&dev_priv->uncore, SHOTPLUG_CTL_TC,
- intel_hpd_hotplug_mask(dev_priv, icp_tc_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, icp_tc_hotplug_enables));
+ struct intel_display *display = &dev_priv->display;
+
+ intel_de_rmw(display, SHOTPLUG_CTL_TC,
+ intel_hpd_hotplug_mask(dev_priv, icp_tc_hotplug_mask),
+ intel_hpd_hotplug_enables(dev_priv, icp_tc_hotplug_enables));
}
static void icp_tc_hpd_enable_detection(struct intel_encoder *encoder)
{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ struct intel_display *display = to_intel_display(encoder);
- intel_uncore_rmw(&i915->uncore, SHOTPLUG_CTL_TC,
- icp_tc_hotplug_mask(encoder->hpd_pin),
- icp_tc_hotplug_enables(encoder));
+ intel_de_rmw(display, SHOTPLUG_CTL_TC,
+ icp_tc_hotplug_mask(encoder->hpd_pin),
+ icp_tc_hotplug_enables(encoder));
}
static void icp_hpd_enable_detection(struct intel_encoder *encoder)
@@ -850,6 +857,7 @@ static void icp_hpd_enable_detection(struct intel_encoder *encoder)
static void icp_hpd_irq_setup(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
u32 hotplug_irqs, enabled_irqs;
enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv->display.hotplug.pch_hpd);
@@ -859,7 +867,7 @@ static void icp_hpd_irq_setup(struct drm_i915_private *dev_priv)
* We reduce the value to 250us to be able to detect SHPD when an external display
* is connected. This is also expected of us as stated in DP1.4a Table 3-4.
*/
- intel_uncore_write(&dev_priv->uncore, SHPD_FILTER_CNT, SHPD_FILTER_CNT_250);
+ intel_de_write(display, SHPD_FILTER_CNT, SHPD_FILTER_CNT_250);
ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
@@ -889,11 +897,12 @@ static u32 gen11_hotplug_enables(struct intel_encoder *encoder)
static void dg1_hpd_invert(struct drm_i915_private *i915)
{
+ struct intel_display *display = &i915->display;
u32 val = (INVERT_DDIA_HPD |
INVERT_DDIB_HPD |
INVERT_DDIC_HPD |
INVERT_DDID_HPD);
- intel_uncore_rmw(&i915->uncore, SOUTH_CHICKEN1, 0, val);
+ intel_de_rmw(display, SOUTH_CHICKEN1, 0, val);
}
static void dg1_hpd_enable_detection(struct intel_encoder *encoder)
@@ -912,34 +921,38 @@ static void dg1_hpd_irq_setup(struct drm_i915_private *dev_priv)
static void gen11_tc_hpd_detection_setup(struct drm_i915_private *dev_priv)
{
- intel_uncore_rmw(&dev_priv->uncore, GEN11_TC_HOTPLUG_CTL,
- intel_hpd_hotplug_mask(dev_priv, gen11_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, gen11_hotplug_enables));
+ struct intel_display *display = &dev_priv->display;
+
+ intel_de_rmw(display, GEN11_TC_HOTPLUG_CTL,
+ intel_hpd_hotplug_mask(dev_priv, gen11_hotplug_mask),
+ intel_hpd_hotplug_enables(dev_priv, gen11_hotplug_enables));
}
static void gen11_tc_hpd_enable_detection(struct intel_encoder *encoder)
{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ struct intel_display *display = to_intel_display(encoder);
- intel_uncore_rmw(&i915->uncore, GEN11_TC_HOTPLUG_CTL,
- gen11_hotplug_mask(encoder->hpd_pin),
- gen11_hotplug_enables(encoder));
+ intel_de_rmw(display, GEN11_TC_HOTPLUG_CTL,
+ gen11_hotplug_mask(encoder->hpd_pin),
+ gen11_hotplug_enables(encoder));
}
static void gen11_tbt_hpd_detection_setup(struct drm_i915_private *dev_priv)
{
- intel_uncore_rmw(&dev_priv->uncore, GEN11_TBT_HOTPLUG_CTL,
- intel_hpd_hotplug_mask(dev_priv, gen11_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, gen11_hotplug_enables));
+ struct intel_display *display = &dev_priv->display;
+
+ intel_de_rmw(display, GEN11_TBT_HOTPLUG_CTL,
+ intel_hpd_hotplug_mask(dev_priv, gen11_hotplug_mask),
+ intel_hpd_hotplug_enables(dev_priv, gen11_hotplug_enables));
}
static void gen11_tbt_hpd_enable_detection(struct intel_encoder *encoder)
{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ struct intel_display *display = to_intel_display(encoder);
- intel_uncore_rmw(&i915->uncore, GEN11_TBT_HOTPLUG_CTL,
- gen11_hotplug_mask(encoder->hpd_pin),
- gen11_hotplug_enables(encoder));
+ intel_de_rmw(display, GEN11_TBT_HOTPLUG_CTL,
+ gen11_hotplug_mask(encoder->hpd_pin),
+ gen11_hotplug_enables(encoder));
}
static void gen11_hpd_enable_detection(struct intel_encoder *encoder)
@@ -955,14 +968,15 @@ static void gen11_hpd_enable_detection(struct intel_encoder *encoder)
static void gen11_hpd_irq_setup(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
u32 hotplug_irqs, enabled_irqs;
enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv->display.hotplug.hpd);
hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv->display.hotplug.hpd);
- intel_uncore_rmw(&dev_priv->uncore, GEN11_DE_HPD_IMR, hotplug_irqs,
- ~enabled_irqs & hotplug_irqs);
- intel_uncore_posting_read(&dev_priv->uncore, GEN11_DE_HPD_IMR);
+ intel_de_rmw(display, GEN11_DE_HPD_IMR, hotplug_irqs,
+ ~enabled_irqs & hotplug_irqs);
+ intel_de_posting_read(display, GEN11_DE_HPD_IMR);
gen11_tc_hpd_detection_setup(dev_priv);
gen11_tbt_hpd_detection_setup(dev_priv);
@@ -1141,6 +1155,7 @@ static void xelpdp_hpd_enable_detection(struct intel_encoder *encoder)
static void xelpdp_hpd_irq_setup(struct drm_i915_private *i915)
{
+ struct intel_display *display = &i915->display;
u32 hotplug_irqs, enabled_irqs;
enabled_irqs = intel_hpd_enabled_irqs(i915, i915->display.hotplug.hpd);
@@ -1148,7 +1163,7 @@ static void xelpdp_hpd_irq_setup(struct drm_i915_private *i915)
intel_de_rmw(i915, PICAINTERRUPT_IMR, hotplug_irqs,
~enabled_irqs & hotplug_irqs);
- intel_uncore_posting_read(&i915->uncore, PICAINTERRUPT_IMR);
+ intel_de_posting_read(display, PICAINTERRUPT_IMR);
xelpdp_pica_hpd_detection_setup(i915);
@@ -1196,48 +1211,52 @@ static u32 spt_hotplug2_enables(struct intel_encoder *encoder)
static void spt_hpd_detection_setup(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
+
/* Display WA #1179 WaHardHangonHotPlug: cnp */
if (HAS_PCH_CNP(dev_priv)) {
- intel_uncore_rmw(&dev_priv->uncore, SOUTH_CHICKEN1, CHASSIS_CLK_REQ_DURATION_MASK,
- CHASSIS_CLK_REQ_DURATION(0xf));
+ intel_de_rmw(display, SOUTH_CHICKEN1, CHASSIS_CLK_REQ_DURATION_MASK,
+ CHASSIS_CLK_REQ_DURATION(0xf));
}
/* Enable digital hotplug on the PCH */
- intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG,
- intel_hpd_hotplug_mask(dev_priv, spt_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, spt_hotplug_enables));
+ intel_de_rmw(display, PCH_PORT_HOTPLUG,
+ intel_hpd_hotplug_mask(dev_priv, spt_hotplug_mask),
+ intel_hpd_hotplug_enables(dev_priv, spt_hotplug_enables));
- intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG2,
- intel_hpd_hotplug_mask(dev_priv, spt_hotplug2_mask),
- intel_hpd_hotplug_enables(dev_priv, spt_hotplug2_enables));
+ intel_de_rmw(display, PCH_PORT_HOTPLUG2,
+ intel_hpd_hotplug_mask(dev_priv, spt_hotplug2_mask),
+ intel_hpd_hotplug_enables(dev_priv, spt_hotplug2_enables));
}
static void spt_hpd_enable_detection(struct intel_encoder *encoder)
{
+ struct intel_display *display = to_intel_display(encoder);
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
/* Display WA #1179 WaHardHangonHotPlug: cnp */
if (HAS_PCH_CNP(i915)) {
- intel_uncore_rmw(&i915->uncore, SOUTH_CHICKEN1,
- CHASSIS_CLK_REQ_DURATION_MASK,
- CHASSIS_CLK_REQ_DURATION(0xf));
+ intel_de_rmw(display, SOUTH_CHICKEN1,
+ CHASSIS_CLK_REQ_DURATION_MASK,
+ CHASSIS_CLK_REQ_DURATION(0xf));
}
- intel_uncore_rmw(&i915->uncore, PCH_PORT_HOTPLUG,
- spt_hotplug_mask(encoder->hpd_pin),
- spt_hotplug_enables(encoder));
+ intel_de_rmw(display, PCH_PORT_HOTPLUG,
+ spt_hotplug_mask(encoder->hpd_pin),
+ spt_hotplug_enables(encoder));
- intel_uncore_rmw(&i915->uncore, PCH_PORT_HOTPLUG2,
- spt_hotplug2_mask(encoder->hpd_pin),
- spt_hotplug2_enables(encoder));
+ intel_de_rmw(display, PCH_PORT_HOTPLUG2,
+ spt_hotplug2_mask(encoder->hpd_pin),
+ spt_hotplug2_enables(encoder));
}
static void spt_hpd_irq_setup(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
u32 hotplug_irqs, enabled_irqs;
if (INTEL_PCH_TYPE(dev_priv) >= PCH_CNP)
- intel_uncore_write(&dev_priv->uncore, SHPD_FILTER_CNT, SHPD_FILTER_CNT_500_ADJ);
+ intel_de_write(display, SHPD_FILTER_CNT, SHPD_FILTER_CNT_500_ADJ);
enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv->display.hotplug.pch_hpd);
hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv->display.hotplug.pch_hpd);
@@ -1271,23 +1290,25 @@ static u32 ilk_hotplug_enables(struct intel_encoder *encoder)
static void ilk_hpd_detection_setup(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
+
/*
* Enable digital hotplug on the CPU, and configure the DP short pulse
* duration to 2ms (which is the minimum in the Display Port spec)
* The pulse duration bits are reserved on HSW+.
*/
- intel_uncore_rmw(&dev_priv->uncore, DIGITAL_PORT_HOTPLUG_CNTRL,
- intel_hpd_hotplug_mask(dev_priv, ilk_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, ilk_hotplug_enables));
+ intel_de_rmw(display, DIGITAL_PORT_HOTPLUG_CNTRL,
+ intel_hpd_hotplug_mask(dev_priv, ilk_hotplug_mask),
+ intel_hpd_hotplug_enables(dev_priv, ilk_hotplug_enables));
}
static void ilk_hpd_enable_detection(struct intel_encoder *encoder)
{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ struct intel_display *display = to_intel_display(encoder);
- intel_uncore_rmw(&i915->uncore, DIGITAL_PORT_HOTPLUG_CNTRL,
- ilk_hotplug_mask(encoder->hpd_pin),
- ilk_hotplug_enables(encoder));
+ intel_de_rmw(display, DIGITAL_PORT_HOTPLUG_CNTRL,
+ ilk_hotplug_mask(encoder->hpd_pin),
+ ilk_hotplug_enables(encoder));
ibx_hpd_enable_detection(encoder);
}
@@ -1350,18 +1371,20 @@ static u32 bxt_hotplug_enables(struct intel_encoder *encoder)
static void bxt_hpd_detection_setup(struct drm_i915_private *dev_priv)
{
- intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG,
- intel_hpd_hotplug_mask(dev_priv, bxt_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, bxt_hotplug_enables));
+ struct intel_display *display = &dev_priv->display;
+
+ intel_de_rmw(display, PCH_PORT_HOTPLUG,
+ intel_hpd_hotplug_mask(dev_priv, bxt_hotplug_mask),
+ intel_hpd_hotplug_enables(dev_priv, bxt_hotplug_enables));
}
static void bxt_hpd_enable_detection(struct intel_encoder *encoder)
{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ struct intel_display *display = to_intel_display(encoder);
- intel_uncore_rmw(&i915->uncore, PCH_PORT_HOTPLUG,
- bxt_hotplug_mask(encoder->hpd_pin),
- bxt_hotplug_enables(encoder));
+ intel_de_rmw(display, PCH_PORT_HOTPLUG,
+ bxt_hotplug_mask(encoder->hpd_pin),
+ bxt_hotplug_enables(encoder));
}
static void bxt_hpd_irq_setup(struct drm_i915_private *dev_priv)
--
2.39.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* RE: [PATCH 5/9] drm/i915/hotplug: convert hotplug irq handling to intel_de_*()
2025-03-11 18:00 ` [PATCH 5/9] drm/i915/hotplug: convert hotplug irq handling to intel_de_*() Jani Nikula
@ 2025-03-12 5:23 ` Shankar, Uma
0 siblings, 0 replies; 31+ messages in thread
From: Shankar, Uma @ 2025-03-12 5:23 UTC (permalink / raw)
To: Nikula, Jani, intel-gfx@lists.freedesktop.org,
intel-xe@lists.freedesktop.org
Cc: Nikula, Jani
> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jani
> Nikula
> Sent: Tuesday, March 11, 2025 11:31 PM
> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nikula@intel.com>
> Subject: [PATCH 5/9] drm/i915/hotplug: convert hotplug irq handling to
> intel_de_*()
>
> All the registers handled here are display registers. Switch from
> intel_uncore_*() to intel_de_*() functions.
Looks Good to me.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> .../gpu/drm/i915/display/intel_hotplug_irq.c | 205 ++++++++++--------
> 1 file changed, 114 insertions(+), 91 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> index e6320838df59..f24c65478742 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> @@ -183,11 +183,12 @@ static void intel_hpd_init_pins(struct drm_i915_private
> *dev_priv) void i915_hotplug_interrupt_update_locked(struct drm_i915_private
> *dev_priv,
> u32 mask, u32 bits)
> {
> + struct intel_display *display = &dev_priv->display;
> +
> lockdep_assert_held(&dev_priv->irq_lock);
> drm_WARN_ON(&dev_priv->drm, bits & ~mask);
>
> - intel_uncore_rmw(&dev_priv->uncore, PORT_HOTPLUG_EN(dev_priv),
> mask,
> - bits);
> + intel_de_rmw(display, PORT_HOTPLUG_EN(display), mask, bits);
> }
>
> /**
> @@ -415,6 +416,7 @@ static u32 intel_hpd_hotplug_enables(struct
> drm_i915_private *i915,
>
> u32 i9xx_hpd_irq_ack(struct drm_i915_private *dev_priv) {
> + struct intel_display *display = &dev_priv->display;
> u32 hotplug_status = 0, hotplug_status_mask;
> int i;
>
> @@ -435,21 +437,20 @@ u32 i9xx_hpd_irq_ack(struct drm_i915_private
> *dev_priv)
> * bits can itself generate a new hotplug interrupt :(
> */
> for (i = 0; i < 10; i++) {
> - u32 tmp = intel_uncore_read(&dev_priv->uncore,
> - PORT_HOTPLUG_STAT(dev_priv)) &
> hotplug_status_mask;
> + u32 tmp = intel_de_read(display,
> + PORT_HOTPLUG_STAT(display)) &
> hotplug_status_mask;
>
> if (tmp == 0)
> return hotplug_status;
>
> hotplug_status |= tmp;
> - intel_uncore_write(&dev_priv->uncore,
> - PORT_HOTPLUG_STAT(dev_priv),
> - hotplug_status);
> + intel_de_write(display, PORT_HOTPLUG_STAT(display),
> + hotplug_status);
> }
>
> drm_WARN_ONCE(&dev_priv->drm, 1,
> "PORT_HOTPLUG_STAT did not clear (0x%08x)\n",
> - intel_uncore_read(&dev_priv->uncore,
> PORT_HOTPLUG_STAT(dev_priv)));
> + intel_de_read(display, PORT_HOTPLUG_STAT(display)));
>
> return hotplug_status;
> }
> @@ -492,7 +493,7 @@ void ibx_hpd_irq_handler(struct drm_i915_private
> *dev_priv, u32 hotplug_trigger)
> * zero. Not acking leads to "The master control interrupt lied (SDE)!"
> * errors.
> */
> - dig_hotplug_reg = intel_uncore_read(&dev_priv->uncore,
> PCH_PORT_HOTPLUG);
> + dig_hotplug_reg = intel_de_read(display, PCH_PORT_HOTPLUG);
> if (!hotplug_trigger) {
> u32 mask = PORTA_HOTPLUG_STATUS_MASK |
> PORTD_HOTPLUG_STATUS_MASK |
> @@ -501,7 +502,7 @@ void ibx_hpd_irq_handler(struct drm_i915_private
> *dev_priv, u32 hotplug_trigger)
> dig_hotplug_reg &= ~mask;
> }
>
> - intel_uncore_write(&dev_priv->uncore, PCH_PORT_HOTPLUG,
> dig_hotplug_reg);
> + intel_de_write(display, PCH_PORT_HOTPLUG, dig_hotplug_reg);
> if (!hotplug_trigger)
> return;
>
> @@ -567,7 +568,7 @@ void icp_irq_handler(struct drm_i915_private *dev_priv,
> u32 pch_iir)
>
> /* Locking due to DSI native GPIO sequences */
> spin_lock(&dev_priv->irq_lock);
> - dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore,
> SHOTPLUG_CTL_DDI, 0, 0);
> + dig_hotplug_reg = intel_de_rmw(display, SHOTPLUG_CTL_DDI, 0,
> 0);
> spin_unlock(&dev_priv->irq_lock);
>
> intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask, @@ -
> 579,7 +580,7 @@ void icp_irq_handler(struct drm_i915_private *dev_priv, u32
> pch_iir)
> if (tc_hotplug_trigger) {
> u32 dig_hotplug_reg;
>
> - dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore,
> SHOTPLUG_CTL_TC, 0, 0);
> + dig_hotplug_reg = intel_de_rmw(display, SHOTPLUG_CTL_TC, 0,
> 0);
>
> intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> tc_hotplug_trigger, dig_hotplug_reg, @@ -
> 605,7 +606,7 @@ void spt_irq_handler(struct drm_i915_private *dev_priv, u32
> pch_iir)
> if (hotplug_trigger) {
> u32 dig_hotplug_reg;
>
> - dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore,
> PCH_PORT_HOTPLUG, 0, 0);
> + dig_hotplug_reg = intel_de_rmw(display, PCH_PORT_HOTPLUG,
> 0, 0);
>
> intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> hotplug_trigger, dig_hotplug_reg, @@ -616,7
> +617,7 @@ void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
> if (hotplug2_trigger) {
> u32 dig_hotplug_reg;
>
> - dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore,
> PCH_PORT_HOTPLUG2, 0, 0);
> + dig_hotplug_reg = intel_de_rmw(display, PCH_PORT_HOTPLUG2,
> 0, 0);
>
> intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> hotplug2_trigger, dig_hotplug_reg, @@ -636,7
> +637,7 @@ void ilk_hpd_irq_handler(struct drm_i915_private *dev_priv, u32
> hotplug_trigger)
> struct intel_display *display = &dev_priv->display;
> u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
>
> - dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore,
> DIGITAL_PORT_HOTPLUG_CNTRL, 0, 0);
> + dig_hotplug_reg = intel_de_rmw(display,
> DIGITAL_PORT_HOTPLUG_CNTRL, 0,
> +0);
>
> intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> hotplug_trigger, dig_hotplug_reg, @@ -651,7 +652,7
> @@ void bxt_hpd_irq_handler(struct drm_i915_private *dev_priv, u32
> hotplug_trigger)
> struct intel_display *display = &dev_priv->display;
> u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
>
> - dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore,
> PCH_PORT_HOTPLUG, 0, 0);
> + dig_hotplug_reg = intel_de_rmw(display, PCH_PORT_HOTPLUG, 0, 0);
>
> intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> hotplug_trigger, dig_hotplug_reg, @@ -671,7 +672,7
> @@ void gen11_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
> if (trigger_tc) {
> u32 dig_hotplug_reg;
>
> - dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore,
> GEN11_TC_HOTPLUG_CTL, 0, 0);
> + dig_hotplug_reg = intel_de_rmw(display,
> GEN11_TC_HOTPLUG_CTL, 0, 0);
>
> intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> trigger_tc, dig_hotplug_reg,
> @@ -682,7 +683,7 @@ void gen11_hpd_irq_handler(struct drm_i915_private
> *dev_priv, u32 iir)
> if (trigger_tbt) {
> u32 dig_hotplug_reg;
>
> - dig_hotplug_reg = intel_uncore_rmw(&dev_priv->uncore,
> GEN11_TBT_HOTPLUG_CTL, 0, 0);
> + dig_hotplug_reg = intel_de_rmw(display,
> GEN11_TBT_HOTPLUG_CTL, 0, 0);
>
> intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> trigger_tbt, dig_hotplug_reg,
> @@ -741,23 +742,25 @@ static u32 ibx_hotplug_enables(struct intel_encoder
> *encoder)
>
> static void ibx_hpd_detection_setup(struct drm_i915_private *dev_priv) {
> + struct intel_display *display = &dev_priv->display;
> +
> /*
> * Enable digital hotplug on the PCH, and configure the DP short pulse
> * duration to 2ms (which is the minimum in the Display Port spec).
> * The pulse duration bits are reserved on LPT+.
> */
> - intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG,
> - intel_hpd_hotplug_mask(dev_priv, ibx_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv,
> ibx_hotplug_enables));
> + intel_de_rmw(display, PCH_PORT_HOTPLUG,
> + intel_hpd_hotplug_mask(dev_priv, ibx_hotplug_mask),
> + intel_hpd_hotplug_enables(dev_priv, ibx_hotplug_enables));
> }
>
> static void ibx_hpd_enable_detection(struct intel_encoder *encoder) {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
>
> - intel_uncore_rmw(&i915->uncore, PCH_PORT_HOTPLUG,
> - ibx_hotplug_mask(encoder->hpd_pin),
> - ibx_hotplug_enables(encoder));
> + intel_de_rmw(display, PCH_PORT_HOTPLUG,
> + ibx_hotplug_mask(encoder->hpd_pin),
> + ibx_hotplug_enables(encoder));
> }
>
> static void ibx_hpd_irq_setup(struct drm_i915_private *dev_priv) @@ -812,34
> +815,38 @@ static u32 icp_tc_hotplug_enables(struct intel_encoder *encoder)
>
> static void icp_ddi_hpd_detection_setup(struct drm_i915_private *dev_priv) {
> - intel_uncore_rmw(&dev_priv->uncore, SHOTPLUG_CTL_DDI,
> - intel_hpd_hotplug_mask(dev_priv,
> icp_ddi_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv,
> icp_ddi_hotplug_enables));
> + struct intel_display *display = &dev_priv->display;
> +
> + intel_de_rmw(display, SHOTPLUG_CTL_DDI,
> + intel_hpd_hotplug_mask(dev_priv, icp_ddi_hotplug_mask),
> + intel_hpd_hotplug_enables(dev_priv,
> icp_ddi_hotplug_enables));
> }
>
> static void icp_ddi_hpd_enable_detection(struct intel_encoder *encoder) {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
>
> - intel_uncore_rmw(&i915->uncore, SHOTPLUG_CTL_DDI,
> - icp_ddi_hotplug_mask(encoder->hpd_pin),
> - icp_ddi_hotplug_enables(encoder));
> + intel_de_rmw(display, SHOTPLUG_CTL_DDI,
> + icp_ddi_hotplug_mask(encoder->hpd_pin),
> + icp_ddi_hotplug_enables(encoder));
> }
>
> static void icp_tc_hpd_detection_setup(struct drm_i915_private *dev_priv) {
> - intel_uncore_rmw(&dev_priv->uncore, SHOTPLUG_CTL_TC,
> - intel_hpd_hotplug_mask(dev_priv,
> icp_tc_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv,
> icp_tc_hotplug_enables));
> + struct intel_display *display = &dev_priv->display;
> +
> + intel_de_rmw(display, SHOTPLUG_CTL_TC,
> + intel_hpd_hotplug_mask(dev_priv, icp_tc_hotplug_mask),
> + intel_hpd_hotplug_enables(dev_priv,
> icp_tc_hotplug_enables));
> }
>
> static void icp_tc_hpd_enable_detection(struct intel_encoder *encoder) {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
>
> - intel_uncore_rmw(&i915->uncore, SHOTPLUG_CTL_TC,
> - icp_tc_hotplug_mask(encoder->hpd_pin),
> - icp_tc_hotplug_enables(encoder));
> + intel_de_rmw(display, SHOTPLUG_CTL_TC,
> + icp_tc_hotplug_mask(encoder->hpd_pin),
> + icp_tc_hotplug_enables(encoder));
> }
>
> static void icp_hpd_enable_detection(struct intel_encoder *encoder) @@ -850,6
> +857,7 @@ static void icp_hpd_enable_detection(struct intel_encoder *encoder)
>
> static void icp_hpd_irq_setup(struct drm_i915_private *dev_priv) {
> + struct intel_display *display = &dev_priv->display;
> u32 hotplug_irqs, enabled_irqs;
>
> enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv-
> >display.hotplug.pch_hpd);
> @@ -859,7 +867,7 @@ static void icp_hpd_irq_setup(struct drm_i915_private
> *dev_priv)
> * We reduce the value to 250us to be able to detect SHPD when an
> external display
> * is connected. This is also expected of us as stated in DP1.4a Table 3-4.
> */
> - intel_uncore_write(&dev_priv->uncore, SHPD_FILTER_CNT,
> SHPD_FILTER_CNT_250);
> + intel_de_write(display, SHPD_FILTER_CNT, SHPD_FILTER_CNT_250);
>
> ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
>
> @@ -889,11 +897,12 @@ static u32 gen11_hotplug_enables(struct
> intel_encoder *encoder)
>
> static void dg1_hpd_invert(struct drm_i915_private *i915) {
> + struct intel_display *display = &i915->display;
> u32 val = (INVERT_DDIA_HPD |
> INVERT_DDIB_HPD |
> INVERT_DDIC_HPD |
> INVERT_DDID_HPD);
> - intel_uncore_rmw(&i915->uncore, SOUTH_CHICKEN1, 0, val);
> + intel_de_rmw(display, SOUTH_CHICKEN1, 0, val);
> }
>
> static void dg1_hpd_enable_detection(struct intel_encoder *encoder) @@ -
> 912,34 +921,38 @@ static void dg1_hpd_irq_setup(struct drm_i915_private
> *dev_priv)
>
> static void gen11_tc_hpd_detection_setup(struct drm_i915_private *dev_priv) {
> - intel_uncore_rmw(&dev_priv->uncore, GEN11_TC_HOTPLUG_CTL,
> - intel_hpd_hotplug_mask(dev_priv,
> gen11_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv,
> gen11_hotplug_enables));
> + struct intel_display *display = &dev_priv->display;
> +
> + intel_de_rmw(display, GEN11_TC_HOTPLUG_CTL,
> + intel_hpd_hotplug_mask(dev_priv, gen11_hotplug_mask),
> + intel_hpd_hotplug_enables(dev_priv,
> gen11_hotplug_enables));
> }
>
> static void gen11_tc_hpd_enable_detection(struct intel_encoder *encoder) {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
>
> - intel_uncore_rmw(&i915->uncore, GEN11_TC_HOTPLUG_CTL,
> - gen11_hotplug_mask(encoder->hpd_pin),
> - gen11_hotplug_enables(encoder));
> + intel_de_rmw(display, GEN11_TC_HOTPLUG_CTL,
> + gen11_hotplug_mask(encoder->hpd_pin),
> + gen11_hotplug_enables(encoder));
> }
>
> static void gen11_tbt_hpd_detection_setup(struct drm_i915_private *dev_priv)
> {
> - intel_uncore_rmw(&dev_priv->uncore, GEN11_TBT_HOTPLUG_CTL,
> - intel_hpd_hotplug_mask(dev_priv,
> gen11_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv,
> gen11_hotplug_enables));
> + struct intel_display *display = &dev_priv->display;
> +
> + intel_de_rmw(display, GEN11_TBT_HOTPLUG_CTL,
> + intel_hpd_hotplug_mask(dev_priv, gen11_hotplug_mask),
> + intel_hpd_hotplug_enables(dev_priv,
> gen11_hotplug_enables));
> }
>
> static void gen11_tbt_hpd_enable_detection(struct intel_encoder *encoder) {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
>
> - intel_uncore_rmw(&i915->uncore, GEN11_TBT_HOTPLUG_CTL,
> - gen11_hotplug_mask(encoder->hpd_pin),
> - gen11_hotplug_enables(encoder));
> + intel_de_rmw(display, GEN11_TBT_HOTPLUG_CTL,
> + gen11_hotplug_mask(encoder->hpd_pin),
> + gen11_hotplug_enables(encoder));
> }
>
> static void gen11_hpd_enable_detection(struct intel_encoder *encoder) @@ -
> 955,14 +968,15 @@ static void gen11_hpd_enable_detection(struct
> intel_encoder *encoder)
>
> static void gen11_hpd_irq_setup(struct drm_i915_private *dev_priv) {
> + struct intel_display *display = &dev_priv->display;
> u32 hotplug_irqs, enabled_irqs;
>
> enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv-
> >display.hotplug.hpd);
> hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv-
> >display.hotplug.hpd);
>
> - intel_uncore_rmw(&dev_priv->uncore, GEN11_DE_HPD_IMR,
> hotplug_irqs,
> - ~enabled_irqs & hotplug_irqs);
> - intel_uncore_posting_read(&dev_priv->uncore, GEN11_DE_HPD_IMR);
> + intel_de_rmw(display, GEN11_DE_HPD_IMR, hotplug_irqs,
> + ~enabled_irqs & hotplug_irqs);
> + intel_de_posting_read(display, GEN11_DE_HPD_IMR);
>
> gen11_tc_hpd_detection_setup(dev_priv);
> gen11_tbt_hpd_detection_setup(dev_priv);
> @@ -1141,6 +1155,7 @@ static void xelpdp_hpd_enable_detection(struct
> intel_encoder *encoder)
>
> static void xelpdp_hpd_irq_setup(struct drm_i915_private *i915) {
> + struct intel_display *display = &i915->display;
> u32 hotplug_irqs, enabled_irqs;
>
> enabled_irqs = intel_hpd_enabled_irqs(i915, i915->display.hotplug.hpd);
> @@ -1148,7 +1163,7 @@ static void xelpdp_hpd_irq_setup(struct
> drm_i915_private *i915)
>
> intel_de_rmw(i915, PICAINTERRUPT_IMR, hotplug_irqs,
> ~enabled_irqs & hotplug_irqs);
> - intel_uncore_posting_read(&i915->uncore, PICAINTERRUPT_IMR);
> + intel_de_posting_read(display, PICAINTERRUPT_IMR);
>
> xelpdp_pica_hpd_detection_setup(i915);
>
> @@ -1196,48 +1211,52 @@ static u32 spt_hotplug2_enables(struct
> intel_encoder *encoder)
>
> static void spt_hpd_detection_setup(struct drm_i915_private *dev_priv) {
> + struct intel_display *display = &dev_priv->display;
> +
> /* Display WA #1179 WaHardHangonHotPlug: cnp */
> if (HAS_PCH_CNP(dev_priv)) {
> - intel_uncore_rmw(&dev_priv->uncore, SOUTH_CHICKEN1,
> CHASSIS_CLK_REQ_DURATION_MASK,
> - CHASSIS_CLK_REQ_DURATION(0xf));
> + intel_de_rmw(display, SOUTH_CHICKEN1,
> CHASSIS_CLK_REQ_DURATION_MASK,
> + CHASSIS_CLK_REQ_DURATION(0xf));
> }
>
> /* Enable digital hotplug on the PCH */
> - intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG,
> - intel_hpd_hotplug_mask(dev_priv, spt_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv,
> spt_hotplug_enables));
> + intel_de_rmw(display, PCH_PORT_HOTPLUG,
> + intel_hpd_hotplug_mask(dev_priv, spt_hotplug_mask),
> + intel_hpd_hotplug_enables(dev_priv, spt_hotplug_enables));
>
> - intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG2,
> - intel_hpd_hotplug_mask(dev_priv, spt_hotplug2_mask),
> - intel_hpd_hotplug_enables(dev_priv,
> spt_hotplug2_enables));
> + intel_de_rmw(display, PCH_PORT_HOTPLUG2,
> + intel_hpd_hotplug_mask(dev_priv, spt_hotplug2_mask),
> + intel_hpd_hotplug_enables(dev_priv, spt_hotplug2_enables));
> }
>
> static void spt_hpd_enable_detection(struct intel_encoder *encoder) {
> + struct intel_display *display = to_intel_display(encoder);
> struct drm_i915_private *i915 = to_i915(encoder->base.dev);
>
> /* Display WA #1179 WaHardHangonHotPlug: cnp */
> if (HAS_PCH_CNP(i915)) {
> - intel_uncore_rmw(&i915->uncore, SOUTH_CHICKEN1,
> - CHASSIS_CLK_REQ_DURATION_MASK,
> - CHASSIS_CLK_REQ_DURATION(0xf));
> + intel_de_rmw(display, SOUTH_CHICKEN1,
> + CHASSIS_CLK_REQ_DURATION_MASK,
> + CHASSIS_CLK_REQ_DURATION(0xf));
> }
>
> - intel_uncore_rmw(&i915->uncore, PCH_PORT_HOTPLUG,
> - spt_hotplug_mask(encoder->hpd_pin),
> - spt_hotplug_enables(encoder));
> + intel_de_rmw(display, PCH_PORT_HOTPLUG,
> + spt_hotplug_mask(encoder->hpd_pin),
> + spt_hotplug_enables(encoder));
>
> - intel_uncore_rmw(&i915->uncore, PCH_PORT_HOTPLUG2,
> - spt_hotplug2_mask(encoder->hpd_pin),
> - spt_hotplug2_enables(encoder));
> + intel_de_rmw(display, PCH_PORT_HOTPLUG2,
> + spt_hotplug2_mask(encoder->hpd_pin),
> + spt_hotplug2_enables(encoder));
> }
>
> static void spt_hpd_irq_setup(struct drm_i915_private *dev_priv) {
> + struct intel_display *display = &dev_priv->display;
> u32 hotplug_irqs, enabled_irqs;
>
> if (INTEL_PCH_TYPE(dev_priv) >= PCH_CNP)
> - intel_uncore_write(&dev_priv->uncore, SHPD_FILTER_CNT,
> SHPD_FILTER_CNT_500_ADJ);
> + intel_de_write(display, SHPD_FILTER_CNT,
> SHPD_FILTER_CNT_500_ADJ);
>
> enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv-
> >display.hotplug.pch_hpd);
> hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv-
> >display.hotplug.pch_hpd);
> @@ -1271,23 +1290,25 @@ static u32 ilk_hotplug_enables(struct intel_encoder
> *encoder)
>
> static void ilk_hpd_detection_setup(struct drm_i915_private *dev_priv) {
> + struct intel_display *display = &dev_priv->display;
> +
> /*
> * Enable digital hotplug on the CPU, and configure the DP short pulse
> * duration to 2ms (which is the minimum in the Display Port spec)
> * The pulse duration bits are reserved on HSW+.
> */
> - intel_uncore_rmw(&dev_priv->uncore,
> DIGITAL_PORT_HOTPLUG_CNTRL,
> - intel_hpd_hotplug_mask(dev_priv, ilk_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv,
> ilk_hotplug_enables));
> + intel_de_rmw(display, DIGITAL_PORT_HOTPLUG_CNTRL,
> + intel_hpd_hotplug_mask(dev_priv, ilk_hotplug_mask),
> + intel_hpd_hotplug_enables(dev_priv, ilk_hotplug_enables));
> }
>
> static void ilk_hpd_enable_detection(struct intel_encoder *encoder) {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
>
> - intel_uncore_rmw(&i915->uncore, DIGITAL_PORT_HOTPLUG_CNTRL,
> - ilk_hotplug_mask(encoder->hpd_pin),
> - ilk_hotplug_enables(encoder));
> + intel_de_rmw(display, DIGITAL_PORT_HOTPLUG_CNTRL,
> + ilk_hotplug_mask(encoder->hpd_pin),
> + ilk_hotplug_enables(encoder));
>
> ibx_hpd_enable_detection(encoder);
> }
> @@ -1350,18 +1371,20 @@ static u32 bxt_hotplug_enables(struct intel_encoder
> *encoder)
>
> static void bxt_hpd_detection_setup(struct drm_i915_private *dev_priv) {
> - intel_uncore_rmw(&dev_priv->uncore, PCH_PORT_HOTPLUG,
> - intel_hpd_hotplug_mask(dev_priv, bxt_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv,
> bxt_hotplug_enables));
> + struct intel_display *display = &dev_priv->display;
> +
> + intel_de_rmw(display, PCH_PORT_HOTPLUG,
> + intel_hpd_hotplug_mask(dev_priv, bxt_hotplug_mask),
> + intel_hpd_hotplug_enables(dev_priv, bxt_hotplug_enables));
> }
>
> static void bxt_hpd_enable_detection(struct intel_encoder *encoder) {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
>
> - intel_uncore_rmw(&i915->uncore, PCH_PORT_HOTPLUG,
> - bxt_hotplug_mask(encoder->hpd_pin),
> - bxt_hotplug_enables(encoder));
> + intel_de_rmw(display, PCH_PORT_HOTPLUG,
> + bxt_hotplug_mask(encoder->hpd_pin),
> + bxt_hotplug_enables(encoder));
> }
>
> static void bxt_hpd_irq_setup(struct drm_i915_private *dev_priv)
> --
> 2.39.5
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 6/9] drm/i915/hotplug: convert intel_hotplug_irq.[ch] to struct intel_display
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (4 preceding siblings ...)
2025-03-11 18:00 ` [PATCH 5/9] drm/i915/hotplug: convert hotplug irq handling to intel_de_*() Jani Nikula
@ 2025-03-11 18:00 ` Jani Nikula
2025-03-12 5:33 ` Shankar, Uma
2025-03-11 18:00 ` [PATCH 7/9] drm/i915/irq: convert intel_display_irq.[ch] interfaces " Jani Nikula
` (11 subsequent siblings)
17 siblings, 1 reply; 31+ messages in thread
From: Jani Nikula @ 2025-03-11 18:00 UTC (permalink / raw)
To: intel-gfx, intel-xe; +Cc: jani.nikula
Going forward, struct intel_display is the main display device data
pointer. Convert as much as possible of intel_hotplug_irq.[ch] to struct
intel_display.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_crt.c | 4 +-
.../gpu/drm/i915/display/intel_display_irq.c | 33 +-
drivers/gpu/drm/i915/display/intel_hotplug.c | 6 +-
.../gpu/drm/i915/display/intel_hotplug_irq.c | 474 +++++++++---------
.../gpu/drm/i915/display/intel_hotplug_irq.h | 28 +-
drivers/gpu/drm/i915/i915_irq.c | 18 +-
6 files changed, 276 insertions(+), 287 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index bca91d49cb96..a7f360f89410 100644
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -606,7 +606,7 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)
for (i = 0; i < tries ; i++) {
/* turn on the FORCE_DETECT */
- i915_hotplug_interrupt_update(dev_priv,
+ i915_hotplug_interrupt_update(display,
CRT_HOTPLUG_FORCE_DETECT,
CRT_HOTPLUG_FORCE_DETECT);
/* wait for FORCE_DETECT to go off */
@@ -624,7 +624,7 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)
intel_de_write(display, PORT_HOTPLUG_STAT(display),
CRT_HOTPLUG_INT_STATUS);
- i915_hotplug_interrupt_update(dev_priv, CRT_HOTPLUG_FORCE_DETECT, 0);
+ i915_hotplug_interrupt_update(display, CRT_HOTPLUG_FORCE_DETECT, 0);
return ret;
}
diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
index aa23bb817805..b37bcb8fb2e8 100644
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -675,7 +675,7 @@ static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
enum pipe pipe;
u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK;
- ibx_hpd_irq_handler(dev_priv, hotplug_trigger);
+ ibx_hpd_irq_handler(display, hotplug_trigger);
if (pch_iir & SDE_AUDIO_POWER_MASK) {
int port = ffs((pch_iir & SDE_AUDIO_POWER_MASK) >>
@@ -812,7 +812,7 @@ static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
enum pipe pipe;
u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK_CPT;
- ibx_hpd_irq_handler(dev_priv, hotplug_trigger);
+ ibx_hpd_irq_handler(display, hotplug_trigger);
if (pch_iir & SDE_AUDIO_POWER_MASK_CPT) {
int port = ffs((pch_iir & SDE_AUDIO_POWER_MASK_CPT) >>
@@ -901,7 +901,7 @@ void ilk_display_irq_handler(struct drm_i915_private *dev_priv, u32 de_iir)
u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG;
if (hotplug_trigger)
- ilk_hpd_irq_handler(dev_priv, hotplug_trigger);
+ ilk_hpd_irq_handler(display, hotplug_trigger);
if (de_iir & DE_AUX_CHANNEL_A)
intel_dp_aux_irq_handler(display);
@@ -953,7 +953,7 @@ void ivb_display_irq_handler(struct drm_i915_private *dev_priv, u32 de_iir)
u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG_IVB;
if (hotplug_trigger)
- ilk_hpd_irq_handler(dev_priv, hotplug_trigger);
+ ilk_hpd_irq_handler(display, hotplug_trigger);
if (de_iir & DE_ERR_INT_IVB)
ivb_err_int_handler(dev_priv);
@@ -1382,7 +1382,7 @@ void gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
iir = intel_de_read(display, GEN11_DE_HPD_IIR);
if (iir) {
intel_de_write(display, GEN11_DE_HPD_IIR, iir);
- gen11_hpd_irq_handler(dev_priv, iir);
+ gen11_hpd_irq_handler(display, iir);
} else {
drm_err_ratelimited(&dev_priv->drm,
"The master control interrupt lied, (DE HPD)!\n");
@@ -1405,14 +1405,14 @@ void gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
u32 hotplug_trigger = iir & BXT_DE_PORT_HOTPLUG_MASK;
if (hotplug_trigger) {
- bxt_hpd_irq_handler(dev_priv, hotplug_trigger);
+ bxt_hpd_irq_handler(display, hotplug_trigger);
found = true;
}
} else if (IS_BROADWELL(dev_priv)) {
u32 hotplug_trigger = iir & BDW_DE_PORT_HOTPLUG_MASK;
if (hotplug_trigger) {
- ilk_hpd_irq_handler(dev_priv, hotplug_trigger);
+ ilk_hpd_irq_handler(display, hotplug_trigger);
found = true;
}
}
@@ -1498,12 +1498,12 @@ void gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
gen8_read_and_ack_pch_irqs(dev_priv, &iir, &pica_iir);
if (iir) {
if (pica_iir)
- xelpdp_pica_irq_handler(dev_priv, pica_iir);
+ xelpdp_pica_irq_handler(display, pica_iir);
if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
- icp_irq_handler(dev_priv, iir);
+ icp_irq_handler(display, iir);
else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT)
- spt_irq_handler(dev_priv, iir);
+ spt_irq_handler(display, iir);
else
cpt_irq_handler(dev_priv, iir);
} else {
@@ -1904,7 +1904,7 @@ static void _vlv_display_irq_reset(struct drm_i915_private *dev_priv)
gen2_error_reset(to_intel_uncore(display->drm),
VLV_ERROR_REGS);
- i915_hotplug_interrupt_update_locked(dev_priv, 0xffffffff, 0);
+ i915_hotplug_interrupt_update_locked(display, 0xffffffff, 0);
intel_de_rmw(display, PORT_HOTPLUG_STAT(dev_priv), 0, 0);
i9xx_pipestat_irq_reset(dev_priv);
@@ -1924,7 +1924,7 @@ void i9xx_display_irq_reset(struct drm_i915_private *i915)
struct intel_display *display = &i915->display;
if (I915_HAS_HOTPLUG(i915)) {
- i915_hotplug_interrupt_update(i915, 0xffffffff, 0);
+ i915_hotplug_interrupt_update(display, 0xffffffff, 0);
intel_de_rmw(display, PORT_HOTPLUG_STAT(i915), 0, 0);
}
@@ -2348,10 +2348,11 @@ void dg1_de_irq_postinstall(struct drm_i915_private *i915)
void intel_display_irq_init(struct drm_i915_private *i915)
{
- i915->drm.vblank_disable_immediate = true;
+ struct intel_display *display = &i915->display;
+
+ display->drm->vblank_disable_immediate = true;
- intel_hotplug_irq_init(i915);
+ intel_hotplug_irq_init(display);
- INIT_WORK(&i915->display.irq.vblank_dc_work,
- intel_display_vblank_dc_work);
+ INIT_WORK(&display->irq.vblank_dc_work, intel_display_vblank_dc_work);
}
diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
index 7683b3ce124d..fcc3f546cb97 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
@@ -305,7 +305,7 @@ static void intel_hpd_irq_storm_reenable_work(struct work_struct *work)
display->hotplug.stats[pin].state = HPD_ENABLED;
}
- intel_hpd_irq_setup(dev_priv);
+ intel_hpd_irq_setup(display);
spin_unlock_irq(&dev_priv->irq_lock);
@@ -696,7 +696,7 @@ void intel_hpd_irq_handler(struct intel_display *display,
* happens later in our hotplug work.
*/
if (storm_detected)
- intel_hpd_irq_setup(dev_priv);
+ intel_hpd_irq_setup(display);
/*
* Our hotplug handler can grab modeset locks (by calling down into the
@@ -745,7 +745,7 @@ void intel_hpd_init(struct intel_display *display)
* just to make the assert_spin_locked checks happy.
*/
spin_lock_irq(&dev_priv->irq_lock);
- intel_hpd_irq_setup(dev_priv);
+ intel_hpd_irq_setup(display);
spin_unlock_irq(&dev_priv->irq_lock);
}
diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
index f24c65478742..e44ae6acc55f 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
@@ -131,30 +131,31 @@ static const u32 hpd_mtp[HPD_NUM_PINS] = {
[HPD_PORT_TC4] = SDE_TC_HOTPLUG_ICP(HPD_PORT_TC4),
};
-static void intel_hpd_init_pins(struct drm_i915_private *dev_priv)
+static void intel_hpd_init_pins(struct intel_display *display)
{
- struct intel_hotplug *hpd = &dev_priv->display.hotplug;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
+ struct intel_hotplug *hpd = &display->hotplug;
- if (HAS_GMCH(dev_priv)) {
- if (IS_G4X(dev_priv) || IS_VALLEYVIEW(dev_priv) ||
- IS_CHERRYVIEW(dev_priv))
+ if (HAS_GMCH(display)) {
+ if (display->platform.g4x || display->platform.valleyview ||
+ display->platform.cherryview)
hpd->hpd = hpd_status_g4x;
else
hpd->hpd = hpd_status_i915;
return;
}
- if (DISPLAY_VER(dev_priv) >= 14)
+ if (DISPLAY_VER(display) >= 14)
hpd->hpd = hpd_xelpdp;
- else if (DISPLAY_VER(dev_priv) >= 11)
+ else if (DISPLAY_VER(display) >= 11)
hpd->hpd = hpd_gen11;
- else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv))
+ else if (display->platform.geminilake || display->platform.broxton)
hpd->hpd = hpd_bxt;
- else if (DISPLAY_VER(dev_priv) == 9)
+ else if (DISPLAY_VER(display) == 9)
hpd->hpd = NULL; /* no north HPD on SKL */
- else if (DISPLAY_VER(dev_priv) >= 8)
+ else if (DISPLAY_VER(display) >= 8)
hpd->hpd = hpd_bdw;
- else if (DISPLAY_VER(dev_priv) >= 7)
+ else if (DISPLAY_VER(display) >= 7)
hpd->hpd = hpd_ivb;
else
hpd->hpd = hpd_ilk;
@@ -180,20 +181,20 @@ static void intel_hpd_init_pins(struct drm_i915_private *dev_priv)
}
/* For display hotplug interrupt */
-void i915_hotplug_interrupt_update_locked(struct drm_i915_private *dev_priv,
+void i915_hotplug_interrupt_update_locked(struct intel_display *display,
u32 mask, u32 bits)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
lockdep_assert_held(&dev_priv->irq_lock);
- drm_WARN_ON(&dev_priv->drm, bits & ~mask);
+ drm_WARN_ON(display->drm, bits & ~mask);
intel_de_rmw(display, PORT_HOTPLUG_EN(display), mask, bits);
}
/**
* i915_hotplug_interrupt_update - update hotplug interrupt enable
- * @dev_priv: driver private
+ * @display: display device
* @mask: bits to update
* @bits: bits to enable
* NOTE: the HPD enable bits are modified both inside and outside
@@ -203,12 +204,14 @@ void i915_hotplug_interrupt_update_locked(struct drm_i915_private *dev_priv,
* held already, this function acquires the lock itself. A non-locking
* version is also available.
*/
-void i915_hotplug_interrupt_update(struct drm_i915_private *dev_priv,
+void i915_hotplug_interrupt_update(struct intel_display *display,
u32 mask,
u32 bits)
{
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
+
spin_lock_irq(&dev_priv->irq_lock);
- i915_hotplug_interrupt_update_locked(dev_priv, mask, bits);
+ i915_hotplug_interrupt_update_locked(display, mask, bits);
spin_unlock_irq(&dev_priv->irq_lock);
}
@@ -340,7 +343,7 @@ static bool i9xx_port_hotplug_long_detect(enum hpd_pin pin, u32 val)
*
* Note that the caller is expected to zero out the masks initially.
*/
-static void intel_get_hpd_pins(struct drm_i915_private *dev_priv,
+static void intel_get_hpd_pins(struct intel_display *display,
u32 *pin_mask, u32 *long_mask,
u32 hotplug_trigger, u32 dig_hotplug_reg,
const u32 hpd[HPD_NUM_PINS],
@@ -360,37 +363,37 @@ static void intel_get_hpd_pins(struct drm_i915_private *dev_priv,
*long_mask |= BIT(pin);
}
- drm_dbg(&dev_priv->drm,
- "hotplug event received, stat 0x%08x, dig 0x%08x, pins 0x%08x, long 0x%08x\n",
- hotplug_trigger, dig_hotplug_reg, *pin_mask, *long_mask);
+ drm_dbg_kms(display->drm,
+ "hotplug event received, stat 0x%08x, dig 0x%08x, pins 0x%08x, long 0x%08x\n",
+ hotplug_trigger, dig_hotplug_reg, *pin_mask, *long_mask);
}
-static u32 intel_hpd_enabled_irqs(struct drm_i915_private *dev_priv,
+static u32 intel_hpd_enabled_irqs(struct intel_display *display,
const u32 hpd[HPD_NUM_PINS])
{
struct intel_encoder *encoder;
u32 enabled_irqs = 0;
- for_each_intel_encoder(&dev_priv->drm, encoder)
- if (dev_priv->display.hotplug.stats[encoder->hpd_pin].state == HPD_ENABLED)
+ for_each_intel_encoder(display->drm, encoder)
+ if (display->hotplug.stats[encoder->hpd_pin].state == HPD_ENABLED)
enabled_irqs |= hpd[encoder->hpd_pin];
return enabled_irqs;
}
-static u32 intel_hpd_hotplug_irqs(struct drm_i915_private *dev_priv,
+static u32 intel_hpd_hotplug_irqs(struct intel_display *display,
const u32 hpd[HPD_NUM_PINS])
{
struct intel_encoder *encoder;
u32 hotplug_irqs = 0;
- for_each_intel_encoder(&dev_priv->drm, encoder)
+ for_each_intel_encoder(display->drm, encoder)
hotplug_irqs |= hpd[encoder->hpd_pin];
return hotplug_irqs;
}
-static u32 intel_hpd_hotplug_mask(struct drm_i915_private *i915,
+static u32 intel_hpd_hotplug_mask(struct intel_display *display,
hotplug_mask_func hotplug_mask)
{
enum hpd_pin pin;
@@ -402,26 +405,25 @@ static u32 intel_hpd_hotplug_mask(struct drm_i915_private *i915,
return hotplug;
}
-static u32 intel_hpd_hotplug_enables(struct drm_i915_private *i915,
+static u32 intel_hpd_hotplug_enables(struct intel_display *display,
hotplug_enables_func hotplug_enables)
{
struct intel_encoder *encoder;
u32 hotplug = 0;
- for_each_intel_encoder(&i915->drm, encoder)
+ for_each_intel_encoder(display->drm, encoder)
hotplug |= hotplug_enables(encoder);
return hotplug;
}
-u32 i9xx_hpd_irq_ack(struct drm_i915_private *dev_priv)
+u32 i9xx_hpd_irq_ack(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
u32 hotplug_status = 0, hotplug_status_mask;
int i;
- if (IS_G4X(dev_priv) ||
- IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
+ if (display->platform.g4x ||
+ display->platform.valleyview || display->platform.cherryview)
hotplug_status_mask = HOTPLUG_INT_STATUS_G4X |
DP_AUX_CHANNEL_MASK_INT_STATUS_G4X;
else
@@ -448,43 +450,41 @@ u32 i9xx_hpd_irq_ack(struct drm_i915_private *dev_priv)
hotplug_status);
}
- drm_WARN_ONCE(&dev_priv->drm, 1,
+ drm_WARN_ONCE(display->drm, 1,
"PORT_HOTPLUG_STAT did not clear (0x%08x)\n",
intel_de_read(display, PORT_HOTPLUG_STAT(display)));
return hotplug_status;
}
-void i9xx_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_status)
+void i9xx_hpd_irq_handler(struct intel_display *display, u32 hotplug_status)
{
- struct intel_display *display = &dev_priv->display;
u32 pin_mask = 0, long_mask = 0;
u32 hotplug_trigger;
- if (IS_G4X(dev_priv) ||
- IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
+ if (display->platform.g4x ||
+ display->platform.valleyview || display->platform.cherryview)
hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_G4X;
else
hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_I915;
if (hotplug_trigger) {
- intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
+ intel_get_hpd_pins(display, &pin_mask, &long_mask,
hotplug_trigger, hotplug_trigger,
- dev_priv->display.hotplug.hpd,
+ display->hotplug.hpd,
i9xx_port_hotplug_long_detect);
intel_hpd_irq_handler(display, pin_mask, long_mask);
}
- if ((IS_G4X(dev_priv) ||
- IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) &&
+ if ((display->platform.g4x ||
+ display->platform.valleyview || display->platform.cherryview) &&
hotplug_status & DP_AUX_CHANNEL_MASK_INT_STATUS_G4X)
intel_dp_aux_irq_handler(display);
}
-void ibx_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_trigger)
+void ibx_hpd_irq_handler(struct intel_display *display, u32 hotplug_trigger)
{
- struct intel_display *display = &dev_priv->display;
u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
/*
@@ -506,44 +506,43 @@ void ibx_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_trigger)
if (!hotplug_trigger)
return;
- intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
+ intel_get_hpd_pins(display, &pin_mask, &long_mask,
hotplug_trigger, dig_hotplug_reg,
- dev_priv->display.hotplug.pch_hpd,
+ display->hotplug.pch_hpd,
pch_port_hotplug_long_detect);
intel_hpd_irq_handler(display, pin_mask, long_mask);
}
-void xelpdp_pica_irq_handler(struct drm_i915_private *i915, u32 iir)
+void xelpdp_pica_irq_handler(struct intel_display *display, u32 iir)
{
- struct intel_display *display = &i915->display;
enum hpd_pin pin;
u32 hotplug_trigger = iir & (XELPDP_DP_ALT_HOTPLUG_MASK | XELPDP_TBT_HOTPLUG_MASK);
u32 trigger_aux = iir & XELPDP_AUX_TC_MASK;
u32 pin_mask = 0, long_mask = 0;
- if (DISPLAY_VER(i915) >= 20)
+ if (DISPLAY_VER(display) >= 20)
trigger_aux |= iir & XE2LPD_AUX_DDI_MASK;
for (pin = HPD_PORT_TC1; pin <= HPD_PORT_TC4; pin++) {
u32 val;
- if (!(i915->display.hotplug.hpd[pin] & hotplug_trigger))
+ if (!(display->hotplug.hpd[pin] & hotplug_trigger))
continue;
pin_mask |= BIT(pin);
- val = intel_de_read(i915, XELPDP_PORT_HOTPLUG_CTL(pin));
- intel_de_write(i915, XELPDP_PORT_HOTPLUG_CTL(pin), val);
+ val = intel_de_read(display, XELPDP_PORT_HOTPLUG_CTL(pin));
+ intel_de_write(display, XELPDP_PORT_HOTPLUG_CTL(pin), val);
if (val & (XELPDP_DP_ALT_HPD_LONG_DETECT | XELPDP_TBT_HPD_LONG_DETECT))
long_mask |= BIT(pin);
}
if (pin_mask) {
- drm_dbg(&i915->drm,
- "pica hotplug event received, stat 0x%08x, pins 0x%08x, long 0x%08x\n",
- hotplug_trigger, pin_mask, long_mask);
+ drm_dbg_kms(display->drm,
+ "pica hotplug event received, stat 0x%08x, pins 0x%08x, long 0x%08x\n",
+ hotplug_trigger, pin_mask, long_mask);
intel_hpd_irq_handler(display, pin_mask, long_mask);
}
@@ -552,13 +551,13 @@ void xelpdp_pica_irq_handler(struct drm_i915_private *i915, u32 iir)
intel_dp_aux_irq_handler(display);
if (!pin_mask && !trigger_aux)
- drm_err(&i915->drm,
+ drm_err(display->drm,
"Unexpected DE HPD/AUX interrupt 0x%08x\n", iir);
}
-void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
+void icp_irq_handler(struct intel_display *display, u32 pch_iir)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 ddi_hotplug_trigger = pch_iir & SDE_DDI_HOTPLUG_MASK_ICP;
u32 tc_hotplug_trigger = pch_iir & SDE_TC_HOTPLUG_MASK_ICP;
u32 pin_mask = 0, long_mask = 0;
@@ -571,9 +570,9 @@ void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
dig_hotplug_reg = intel_de_rmw(display, SHOTPLUG_CTL_DDI, 0, 0);
spin_unlock(&dev_priv->irq_lock);
- intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
+ intel_get_hpd_pins(display, &pin_mask, &long_mask,
ddi_hotplug_trigger, dig_hotplug_reg,
- dev_priv->display.hotplug.pch_hpd,
+ display->hotplug.pch_hpd,
icp_ddi_port_hotplug_long_detect);
}
@@ -582,9 +581,9 @@ void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
dig_hotplug_reg = intel_de_rmw(display, SHOTPLUG_CTL_TC, 0, 0);
- intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
+ intel_get_hpd_pins(display, &pin_mask, &long_mask,
tc_hotplug_trigger, dig_hotplug_reg,
- dev_priv->display.hotplug.pch_hpd,
+ display->hotplug.pch_hpd,
icp_tc_port_hotplug_long_detect);
}
@@ -595,9 +594,8 @@ void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
intel_gmbus_irq_handler(display);
}
-void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
+void spt_irq_handler(struct intel_display *display, u32 pch_iir)
{
- struct intel_display *display = &dev_priv->display;
u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK_SPT &
~SDE_PORTE_HOTPLUG_SPT;
u32 hotplug2_trigger = pch_iir & SDE_PORTE_HOTPLUG_SPT;
@@ -608,9 +606,9 @@ void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
dig_hotplug_reg = intel_de_rmw(display, PCH_PORT_HOTPLUG, 0, 0);
- intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
+ intel_get_hpd_pins(display, &pin_mask, &long_mask,
hotplug_trigger, dig_hotplug_reg,
- dev_priv->display.hotplug.pch_hpd,
+ display->hotplug.pch_hpd,
spt_port_hotplug_long_detect);
}
@@ -619,9 +617,9 @@ void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
dig_hotplug_reg = intel_de_rmw(display, PCH_PORT_HOTPLUG2, 0, 0);
- intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
+ intel_get_hpd_pins(display, &pin_mask, &long_mask,
hotplug2_trigger, dig_hotplug_reg,
- dev_priv->display.hotplug.pch_hpd,
+ display->hotplug.pch_hpd,
spt_port_hotplug2_long_detect);
}
@@ -632,39 +630,36 @@ void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
intel_gmbus_irq_handler(display);
}
-void ilk_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_trigger)
+void ilk_hpd_irq_handler(struct intel_display *display, u32 hotplug_trigger)
{
- struct intel_display *display = &dev_priv->display;
u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
dig_hotplug_reg = intel_de_rmw(display, DIGITAL_PORT_HOTPLUG_CNTRL, 0, 0);
- intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
+ intel_get_hpd_pins(display, &pin_mask, &long_mask,
hotplug_trigger, dig_hotplug_reg,
- dev_priv->display.hotplug.hpd,
+ display->hotplug.hpd,
ilk_port_hotplug_long_detect);
intel_hpd_irq_handler(display, pin_mask, long_mask);
}
-void bxt_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 hotplug_trigger)
+void bxt_hpd_irq_handler(struct intel_display *display, u32 hotplug_trigger)
{
- struct intel_display *display = &dev_priv->display;
u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
dig_hotplug_reg = intel_de_rmw(display, PCH_PORT_HOTPLUG, 0, 0);
- intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
+ intel_get_hpd_pins(display, &pin_mask, &long_mask,
hotplug_trigger, dig_hotplug_reg,
- dev_priv->display.hotplug.hpd,
+ display->hotplug.hpd,
bxt_port_hotplug_long_detect);
intel_hpd_irq_handler(display, pin_mask, long_mask);
}
-void gen11_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
+void gen11_hpd_irq_handler(struct intel_display *display, u32 iir)
{
- struct intel_display *display = &dev_priv->display;
u32 pin_mask = 0, long_mask = 0;
u32 trigger_tc = iir & GEN11_DE_TC_HOTPLUG_MASK;
u32 trigger_tbt = iir & GEN11_DE_TBT_HOTPLUG_MASK;
@@ -674,9 +669,9 @@ void gen11_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
dig_hotplug_reg = intel_de_rmw(display, GEN11_TC_HOTPLUG_CTL, 0, 0);
- intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
+ intel_get_hpd_pins(display, &pin_mask, &long_mask,
trigger_tc, dig_hotplug_reg,
- dev_priv->display.hotplug.hpd,
+ display->hotplug.hpd,
gen11_port_hotplug_long_detect);
}
@@ -685,16 +680,16 @@ void gen11_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
dig_hotplug_reg = intel_de_rmw(display, GEN11_TBT_HOTPLUG_CTL, 0, 0);
- intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
+ intel_get_hpd_pins(display, &pin_mask, &long_mask,
trigger_tbt, dig_hotplug_reg,
- dev_priv->display.hotplug.hpd,
+ display->hotplug.hpd,
gen11_port_hotplug_long_detect);
}
if (pin_mask)
intel_hpd_irq_handler(display, pin_mask, long_mask);
else
- drm_err(&dev_priv->drm,
+ drm_err(display->drm,
"Unexpected DE HPD interrupt 0x%08x\n", iir);
}
@@ -740,18 +735,16 @@ static u32 ibx_hotplug_enables(struct intel_encoder *encoder)
}
}
-static void ibx_hpd_detection_setup(struct drm_i915_private *dev_priv)
+static void ibx_hpd_detection_setup(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
-
/*
* Enable digital hotplug on the PCH, and configure the DP short pulse
* duration to 2ms (which is the minimum in the Display Port spec).
* The pulse duration bits are reserved on LPT+.
*/
intel_de_rmw(display, PCH_PORT_HOTPLUG,
- intel_hpd_hotplug_mask(dev_priv, ibx_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, ibx_hotplug_enables));
+ intel_hpd_hotplug_mask(display, ibx_hotplug_mask),
+ intel_hpd_hotplug_enables(display, ibx_hotplug_enables));
}
static void ibx_hpd_enable_detection(struct intel_encoder *encoder)
@@ -763,16 +756,17 @@ static void ibx_hpd_enable_detection(struct intel_encoder *encoder)
ibx_hotplug_enables(encoder));
}
-static void ibx_hpd_irq_setup(struct drm_i915_private *dev_priv)
+static void ibx_hpd_irq_setup(struct intel_display *display)
{
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
- enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv->display.hotplug.pch_hpd);
- hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv->display.hotplug.pch_hpd);
+ enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.pch_hpd);
+ hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
- ibx_hpd_detection_setup(dev_priv);
+ ibx_hpd_detection_setup(display);
}
static u32 icp_ddi_hotplug_mask(enum hpd_pin hpd_pin)
@@ -813,13 +807,11 @@ static u32 icp_tc_hotplug_enables(struct intel_encoder *encoder)
return icp_tc_hotplug_mask(encoder->hpd_pin);
}
-static void icp_ddi_hpd_detection_setup(struct drm_i915_private *dev_priv)
+static void icp_ddi_hpd_detection_setup(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
-
intel_de_rmw(display, SHOTPLUG_CTL_DDI,
- intel_hpd_hotplug_mask(dev_priv, icp_ddi_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, icp_ddi_hotplug_enables));
+ intel_hpd_hotplug_mask(display, icp_ddi_hotplug_mask),
+ intel_hpd_hotplug_enables(display, icp_ddi_hotplug_enables));
}
static void icp_ddi_hpd_enable_detection(struct intel_encoder *encoder)
@@ -831,13 +823,11 @@ static void icp_ddi_hpd_enable_detection(struct intel_encoder *encoder)
icp_ddi_hotplug_enables(encoder));
}
-static void icp_tc_hpd_detection_setup(struct drm_i915_private *dev_priv)
+static void icp_tc_hpd_detection_setup(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
-
intel_de_rmw(display, SHOTPLUG_CTL_TC,
- intel_hpd_hotplug_mask(dev_priv, icp_tc_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, icp_tc_hotplug_enables));
+ intel_hpd_hotplug_mask(display, icp_tc_hotplug_mask),
+ intel_hpd_hotplug_enables(display, icp_tc_hotplug_enables));
}
static void icp_tc_hpd_enable_detection(struct intel_encoder *encoder)
@@ -855,13 +845,13 @@ static void icp_hpd_enable_detection(struct intel_encoder *encoder)
icp_tc_hpd_enable_detection(encoder);
}
-static void icp_hpd_irq_setup(struct drm_i915_private *dev_priv)
+static void icp_hpd_irq_setup(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
- enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv->display.hotplug.pch_hpd);
- hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv->display.hotplug.pch_hpd);
+ enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.pch_hpd);
+ hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
/*
* We reduce the value to 250us to be able to detect SHPD when an external display
@@ -871,8 +861,8 @@ static void icp_hpd_irq_setup(struct drm_i915_private *dev_priv)
ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
- icp_ddi_hpd_detection_setup(dev_priv);
- icp_tc_hpd_detection_setup(dev_priv);
+ icp_ddi_hpd_detection_setup(display);
+ icp_tc_hpd_detection_setup(display);
}
static u32 gen11_hotplug_mask(enum hpd_pin hpd_pin)
@@ -895,9 +885,8 @@ static u32 gen11_hotplug_enables(struct intel_encoder *encoder)
return gen11_hotplug_mask(encoder->hpd_pin);
}
-static void dg1_hpd_invert(struct drm_i915_private *i915)
+static void dg1_hpd_invert(struct intel_display *display)
{
- struct intel_display *display = &i915->display;
u32 val = (INVERT_DDIA_HPD |
INVERT_DDIB_HPD |
INVERT_DDIC_HPD |
@@ -907,25 +896,23 @@ static void dg1_hpd_invert(struct drm_i915_private *i915)
static void dg1_hpd_enable_detection(struct intel_encoder *encoder)
{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ struct intel_display *display = to_intel_display(encoder);
- dg1_hpd_invert(i915);
+ dg1_hpd_invert(display);
icp_hpd_enable_detection(encoder);
}
-static void dg1_hpd_irq_setup(struct drm_i915_private *dev_priv)
+static void dg1_hpd_irq_setup(struct intel_display *display)
{
- dg1_hpd_invert(dev_priv);
- icp_hpd_irq_setup(dev_priv);
+ dg1_hpd_invert(display);
+ icp_hpd_irq_setup(display);
}
-static void gen11_tc_hpd_detection_setup(struct drm_i915_private *dev_priv)
+static void gen11_tc_hpd_detection_setup(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
-
intel_de_rmw(display, GEN11_TC_HOTPLUG_CTL,
- intel_hpd_hotplug_mask(dev_priv, gen11_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, gen11_hotplug_enables));
+ intel_hpd_hotplug_mask(display, gen11_hotplug_mask),
+ intel_hpd_hotplug_enables(display, gen11_hotplug_enables));
}
static void gen11_tc_hpd_enable_detection(struct intel_encoder *encoder)
@@ -937,13 +924,11 @@ static void gen11_tc_hpd_enable_detection(struct intel_encoder *encoder)
gen11_hotplug_enables(encoder));
}
-static void gen11_tbt_hpd_detection_setup(struct drm_i915_private *dev_priv)
+static void gen11_tbt_hpd_detection_setup(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
-
intel_de_rmw(display, GEN11_TBT_HOTPLUG_CTL,
- intel_hpd_hotplug_mask(dev_priv, gen11_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, gen11_hotplug_enables));
+ intel_hpd_hotplug_mask(display, gen11_hotplug_mask),
+ intel_hpd_hotplug_enables(display, gen11_hotplug_enables));
}
static void gen11_tbt_hpd_enable_detection(struct intel_encoder *encoder)
@@ -966,23 +951,23 @@ static void gen11_hpd_enable_detection(struct intel_encoder *encoder)
icp_hpd_enable_detection(encoder);
}
-static void gen11_hpd_irq_setup(struct drm_i915_private *dev_priv)
+static void gen11_hpd_irq_setup(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
- enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv->display.hotplug.hpd);
- hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv->display.hotplug.hpd);
+ enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.hpd);
+ hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.hpd);
intel_de_rmw(display, GEN11_DE_HPD_IMR, hotplug_irqs,
~enabled_irqs & hotplug_irqs);
intel_de_posting_read(display, GEN11_DE_HPD_IMR);
- gen11_tc_hpd_detection_setup(dev_priv);
- gen11_tbt_hpd_detection_setup(dev_priv);
+ gen11_tc_hpd_detection_setup(display);
+ gen11_tbt_hpd_detection_setup(display);
if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
- icp_hpd_irq_setup(dev_priv);
+ icp_hpd_irq_setup(display);
}
static u32 mtp_ddi_hotplug_mask(enum hpd_pin hpd_pin)
@@ -1019,39 +1004,39 @@ static u32 mtp_tc_hotplug_enables(struct intel_encoder *encoder)
return mtp_tc_hotplug_mask(encoder->hpd_pin);
}
-static void mtp_ddi_hpd_detection_setup(struct drm_i915_private *i915)
+static void mtp_ddi_hpd_detection_setup(struct intel_display *display)
{
- intel_de_rmw(i915, SHOTPLUG_CTL_DDI,
- intel_hpd_hotplug_mask(i915, mtp_ddi_hotplug_mask),
- intel_hpd_hotplug_enables(i915, mtp_ddi_hotplug_enables));
+ intel_de_rmw(display, SHOTPLUG_CTL_DDI,
+ intel_hpd_hotplug_mask(display, mtp_ddi_hotplug_mask),
+ intel_hpd_hotplug_enables(display, mtp_ddi_hotplug_enables));
}
static void mtp_ddi_hpd_enable_detection(struct intel_encoder *encoder)
{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ struct intel_display *display = to_intel_display(encoder);
- intel_de_rmw(i915, SHOTPLUG_CTL_DDI,
+ intel_de_rmw(display, SHOTPLUG_CTL_DDI,
mtp_ddi_hotplug_mask(encoder->hpd_pin),
mtp_ddi_hotplug_enables(encoder));
}
-static void mtp_tc_hpd_detection_setup(struct drm_i915_private *i915)
+static void mtp_tc_hpd_detection_setup(struct intel_display *display)
{
- intel_de_rmw(i915, SHOTPLUG_CTL_TC,
- intel_hpd_hotplug_mask(i915, mtp_tc_hotplug_mask),
- intel_hpd_hotplug_enables(i915, mtp_tc_hotplug_enables));
+ intel_de_rmw(display, SHOTPLUG_CTL_TC,
+ intel_hpd_hotplug_mask(display, mtp_tc_hotplug_mask),
+ intel_hpd_hotplug_enables(display, mtp_tc_hotplug_enables));
}
static void mtp_tc_hpd_enable_detection(struct intel_encoder *encoder)
{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ struct intel_display *display = to_intel_display(encoder);
- intel_de_rmw(i915, SHOTPLUG_CTL_DDI,
+ intel_de_rmw(display, SHOTPLUG_CTL_DDI,
mtp_tc_hotplug_mask(encoder->hpd_pin),
mtp_tc_hotplug_enables(encoder));
}
-static void mtp_hpd_invert(struct drm_i915_private *i915)
+static void mtp_hpd_invert(struct intel_display *display)
{
u32 val = (INVERT_DDIA_HPD |
INVERT_DDIB_HPD |
@@ -1062,49 +1047,51 @@ static void mtp_hpd_invert(struct drm_i915_private *i915)
INVERT_TC4_HPD |
INVERT_DDID_HPD_MTP |
INVERT_DDIE_HPD);
- intel_de_rmw(i915, SOUTH_CHICKEN1, 0, val);
+ intel_de_rmw(display, SOUTH_CHICKEN1, 0, val);
}
static void mtp_hpd_enable_detection(struct intel_encoder *encoder)
{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ struct intel_display *display = to_intel_display(encoder);
- mtp_hpd_invert(i915);
+ mtp_hpd_invert(display);
mtp_ddi_hpd_enable_detection(encoder);
mtp_tc_hpd_enable_detection(encoder);
}
-static void mtp_hpd_irq_setup(struct drm_i915_private *i915)
+static void mtp_hpd_irq_setup(struct intel_display *display)
{
+ struct drm_i915_private *i915 = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
- enabled_irqs = intel_hpd_enabled_irqs(i915, i915->display.hotplug.pch_hpd);
- hotplug_irqs = intel_hpd_hotplug_irqs(i915, i915->display.hotplug.pch_hpd);
+ enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.pch_hpd);
+ hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
/*
* Use 250us here to align with the DP1.4a(Table 3-4) spec as to what the
* SHPD_FILTER_CNT value should be.
*/
- intel_de_write(i915, SHPD_FILTER_CNT, SHPD_FILTER_CNT_250);
+ intel_de_write(display, SHPD_FILTER_CNT, SHPD_FILTER_CNT_250);
- mtp_hpd_invert(i915);
+ mtp_hpd_invert(display);
ibx_display_interrupt_update(i915, hotplug_irqs, enabled_irqs);
- mtp_ddi_hpd_detection_setup(i915);
- mtp_tc_hpd_detection_setup(i915);
+ mtp_ddi_hpd_detection_setup(display);
+ mtp_tc_hpd_detection_setup(display);
}
-static void xe2lpd_sde_hpd_irq_setup(struct drm_i915_private *i915)
+static void xe2lpd_sde_hpd_irq_setup(struct intel_display *display)
{
+ struct drm_i915_private *i915 = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
- enabled_irqs = intel_hpd_enabled_irqs(i915, i915->display.hotplug.pch_hpd);
- hotplug_irqs = intel_hpd_hotplug_irqs(i915, i915->display.hotplug.pch_hpd);
+ enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.pch_hpd);
+ hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
ibx_display_interrupt_update(i915, hotplug_irqs, enabled_irqs);
- mtp_ddi_hpd_detection_setup(i915);
- mtp_tc_hpd_detection_setup(i915);
+ mtp_ddi_hpd_detection_setup(display);
+ mtp_tc_hpd_detection_setup(display);
}
static bool is_xelpdp_pica_hpd_pin(enum hpd_pin hpd_pin)
@@ -1112,7 +1099,7 @@ static bool is_xelpdp_pica_hpd_pin(enum hpd_pin hpd_pin)
return hpd_pin >= HPD_PORT_TC1 && hpd_pin <= HPD_PORT_TC4;
}
-static void _xelpdp_pica_hpd_detection_setup(struct drm_i915_private *i915,
+static void _xelpdp_pica_hpd_detection_setup(struct intel_display *display,
enum hpd_pin hpd_pin, bool enable)
{
u32 mask = XELPDP_TBT_HOTPLUG_ENABLE |
@@ -1121,18 +1108,18 @@ static void _xelpdp_pica_hpd_detection_setup(struct drm_i915_private *i915,
if (!is_xelpdp_pica_hpd_pin(hpd_pin))
return;
- intel_de_rmw(i915, XELPDP_PORT_HOTPLUG_CTL(hpd_pin),
+ intel_de_rmw(display, XELPDP_PORT_HOTPLUG_CTL(hpd_pin),
mask, enable ? mask : 0);
}
static void xelpdp_pica_hpd_enable_detection(struct intel_encoder *encoder)
{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ struct intel_display *display = to_intel_display(encoder);
- _xelpdp_pica_hpd_detection_setup(i915, encoder->hpd_pin, true);
+ _xelpdp_pica_hpd_detection_setup(display, encoder->hpd_pin, true);
}
-static void xelpdp_pica_hpd_detection_setup(struct drm_i915_private *i915)
+static void xelpdp_pica_hpd_detection_setup(struct intel_display *display)
{
struct intel_encoder *encoder;
u32 available_pins = 0;
@@ -1140,11 +1127,11 @@ static void xelpdp_pica_hpd_detection_setup(struct drm_i915_private *i915)
BUILD_BUG_ON(BITS_PER_TYPE(available_pins) < HPD_NUM_PINS);
- for_each_intel_encoder(&i915->drm, encoder)
+ for_each_intel_encoder(display->drm, encoder)
available_pins |= BIT(encoder->hpd_pin);
for_each_hpd_pin(pin)
- _xelpdp_pica_hpd_detection_setup(i915, pin, available_pins & BIT(pin));
+ _xelpdp_pica_hpd_detection_setup(display, pin, available_pins & BIT(pin));
}
static void xelpdp_hpd_enable_detection(struct intel_encoder *encoder)
@@ -1153,24 +1140,24 @@ static void xelpdp_hpd_enable_detection(struct intel_encoder *encoder)
mtp_hpd_enable_detection(encoder);
}
-static void xelpdp_hpd_irq_setup(struct drm_i915_private *i915)
+static void xelpdp_hpd_irq_setup(struct intel_display *display)
{
- struct intel_display *display = &i915->display;
+ struct drm_i915_private *i915 = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
- enabled_irqs = intel_hpd_enabled_irqs(i915, i915->display.hotplug.hpd);
- hotplug_irqs = intel_hpd_hotplug_irqs(i915, i915->display.hotplug.hpd);
+ enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.hpd);
+ hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.hpd);
- intel_de_rmw(i915, PICAINTERRUPT_IMR, hotplug_irqs,
+ intel_de_rmw(display, PICAINTERRUPT_IMR, hotplug_irqs,
~enabled_irqs & hotplug_irqs);
intel_de_posting_read(display, PICAINTERRUPT_IMR);
- xelpdp_pica_hpd_detection_setup(i915);
+ xelpdp_pica_hpd_detection_setup(display);
if (INTEL_PCH_TYPE(i915) >= PCH_LNL)
- xe2lpd_sde_hpd_irq_setup(i915);
+ xe2lpd_sde_hpd_irq_setup(display);
else if (INTEL_PCH_TYPE(i915) >= PCH_MTL)
- mtp_hpd_irq_setup(i915);
+ mtp_hpd_irq_setup(display);
}
static u32 spt_hotplug_mask(enum hpd_pin hpd_pin)
@@ -1209,9 +1196,9 @@ static u32 spt_hotplug2_enables(struct intel_encoder *encoder)
return spt_hotplug2_mask(encoder->hpd_pin);
}
-static void spt_hpd_detection_setup(struct drm_i915_private *dev_priv)
+static void spt_hpd_detection_setup(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
/* Display WA #1179 WaHardHangonHotPlug: cnp */
if (HAS_PCH_CNP(dev_priv)) {
@@ -1221,12 +1208,12 @@ static void spt_hpd_detection_setup(struct drm_i915_private *dev_priv)
/* Enable digital hotplug on the PCH */
intel_de_rmw(display, PCH_PORT_HOTPLUG,
- intel_hpd_hotplug_mask(dev_priv, spt_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, spt_hotplug_enables));
+ intel_hpd_hotplug_mask(display, spt_hotplug_mask),
+ intel_hpd_hotplug_enables(display, spt_hotplug_enables));
intel_de_rmw(display, PCH_PORT_HOTPLUG2,
- intel_hpd_hotplug_mask(dev_priv, spt_hotplug2_mask),
- intel_hpd_hotplug_enables(dev_priv, spt_hotplug2_enables));
+ intel_hpd_hotplug_mask(display, spt_hotplug2_mask),
+ intel_hpd_hotplug_enables(display, spt_hotplug2_enables));
}
static void spt_hpd_enable_detection(struct intel_encoder *encoder)
@@ -1250,20 +1237,20 @@ static void spt_hpd_enable_detection(struct intel_encoder *encoder)
spt_hotplug2_enables(encoder));
}
-static void spt_hpd_irq_setup(struct drm_i915_private *dev_priv)
+static void spt_hpd_irq_setup(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
if (INTEL_PCH_TYPE(dev_priv) >= PCH_CNP)
intel_de_write(display, SHPD_FILTER_CNT, SHPD_FILTER_CNT_500_ADJ);
- enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv->display.hotplug.pch_hpd);
- hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv->display.hotplug.pch_hpd);
+ enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.pch_hpd);
+ hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
- spt_hpd_detection_setup(dev_priv);
+ spt_hpd_detection_setup(display);
}
static u32 ilk_hotplug_mask(enum hpd_pin hpd_pin)
@@ -1288,18 +1275,16 @@ static u32 ilk_hotplug_enables(struct intel_encoder *encoder)
}
}
-static void ilk_hpd_detection_setup(struct drm_i915_private *dev_priv)
+static void ilk_hpd_detection_setup(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
-
/*
* Enable digital hotplug on the CPU, and configure the DP short pulse
* duration to 2ms (which is the minimum in the Display Port spec)
* The pulse duration bits are reserved on HSW+.
*/
intel_de_rmw(display, DIGITAL_PORT_HOTPLUG_CNTRL,
- intel_hpd_hotplug_mask(dev_priv, ilk_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, ilk_hotplug_enables));
+ intel_hpd_hotplug_mask(display, ilk_hotplug_mask),
+ intel_hpd_hotplug_enables(display, ilk_hotplug_enables));
}
static void ilk_hpd_enable_detection(struct intel_encoder *encoder)
@@ -1313,21 +1298,22 @@ static void ilk_hpd_enable_detection(struct intel_encoder *encoder)
ibx_hpd_enable_detection(encoder);
}
-static void ilk_hpd_irq_setup(struct drm_i915_private *dev_priv)
+static void ilk_hpd_irq_setup(struct intel_display *display)
{
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
- enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv->display.hotplug.hpd);
- hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv->display.hotplug.hpd);
+ enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.hpd);
+ hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.hpd);
- if (DISPLAY_VER(dev_priv) >= 8)
+ if (DISPLAY_VER(display) >= 8)
bdw_update_port_irq(dev_priv, hotplug_irqs, enabled_irqs);
else
ilk_update_display_irq(dev_priv, hotplug_irqs, enabled_irqs);
- ilk_hpd_detection_setup(dev_priv);
+ ilk_hpd_detection_setup(display);
- ibx_hpd_irq_setup(dev_priv);
+ ibx_hpd_irq_setup(display);
}
static u32 bxt_hotplug_mask(enum hpd_pin hpd_pin)
@@ -1369,13 +1355,11 @@ static u32 bxt_hotplug_enables(struct intel_encoder *encoder)
}
}
-static void bxt_hpd_detection_setup(struct drm_i915_private *dev_priv)
+static void bxt_hpd_detection_setup(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
-
intel_de_rmw(display, PCH_PORT_HOTPLUG,
- intel_hpd_hotplug_mask(dev_priv, bxt_hotplug_mask),
- intel_hpd_hotplug_enables(dev_priv, bxt_hotplug_enables));
+ intel_hpd_hotplug_mask(display, bxt_hotplug_mask),
+ intel_hpd_hotplug_enables(display, bxt_hotplug_enables));
}
static void bxt_hpd_enable_detection(struct intel_encoder *encoder)
@@ -1387,42 +1371,44 @@ static void bxt_hpd_enable_detection(struct intel_encoder *encoder)
bxt_hotplug_enables(encoder));
}
-static void bxt_hpd_irq_setup(struct drm_i915_private *dev_priv)
+static void bxt_hpd_irq_setup(struct intel_display *display)
{
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
- enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv->display.hotplug.hpd);
- hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv->display.hotplug.hpd);
+ enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.hpd);
+ hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.hpd);
bdw_update_port_irq(dev_priv, hotplug_irqs, enabled_irqs);
- bxt_hpd_detection_setup(dev_priv);
+ bxt_hpd_detection_setup(display);
}
-static void g45_hpd_peg_band_gap_wa(struct drm_i915_private *i915)
+static void g45_hpd_peg_band_gap_wa(struct intel_display *display)
{
/*
* For G4X desktop chip, PEG_BAND_GAP_DATA 3:0 must first be written
* 0xd. Failure to do so will result in spurious interrupts being
* generated on the port when a cable is not attached.
*/
- intel_de_rmw(i915, PEG_BAND_GAP_DATA, 0xf, 0xd);
+ intel_de_rmw(display, PEG_BAND_GAP_DATA, 0xf, 0xd);
}
static void i915_hpd_enable_detection(struct intel_encoder *encoder)
{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ struct intel_display *display = to_intel_display(encoder);
u32 hotplug_en = hpd_mask_i915[encoder->hpd_pin];
- if (IS_G45(i915))
- g45_hpd_peg_band_gap_wa(i915);
+ if (display->platform.g45)
+ g45_hpd_peg_band_gap_wa(display);
/* HPD sense and interrupt enable are one and the same */
- i915_hotplug_interrupt_update(i915, hotplug_en, hotplug_en);
+ i915_hotplug_interrupt_update(display, hotplug_en, hotplug_en);
}
-static void i915_hpd_irq_setup(struct drm_i915_private *dev_priv)
+static void i915_hpd_irq_setup(struct intel_display *display)
{
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 hotplug_en;
lockdep_assert_held(&dev_priv->irq_lock);
@@ -1431,20 +1417,20 @@ static void i915_hpd_irq_setup(struct drm_i915_private *dev_priv)
* Note HDMI and DP share hotplug bits. Enable bits are the same for all
* generations.
*/
- hotplug_en = intel_hpd_enabled_irqs(dev_priv, hpd_mask_i915);
+ hotplug_en = intel_hpd_enabled_irqs(display, hpd_mask_i915);
/*
* Programming the CRT detection parameters tends to generate a spurious
* hotplug event about three seconds later. So just do it once.
*/
- if (IS_G4X(dev_priv))
+ if (display->platform.g4x)
hotplug_en |= CRT_HOTPLUG_ACTIVATION_PERIOD_64;
hotplug_en |= CRT_HOTPLUG_VOLTAGE_COMPARE_50;
- if (IS_G45(dev_priv))
- g45_hpd_peg_band_gap_wa(dev_priv);
+ if (display->platform.g45)
+ g45_hpd_peg_band_gap_wa(display);
/* Ignore TV since it's buggy */
- i915_hotplug_interrupt_update_locked(dev_priv,
+ i915_hotplug_interrupt_update_locked(display,
HOTPLUG_INT_EN_MASK |
CRT_HOTPLUG_VOLTAGE_COMPARE_MASK |
CRT_HOTPLUG_ACTIVATION_PERIOD_64,
@@ -1453,7 +1439,7 @@ static void i915_hpd_irq_setup(struct drm_i915_private *dev_priv)
struct intel_hotplug_funcs {
/* Enable HPD sense and interrupts for all present encoders */
- void (*hpd_irq_setup)(struct drm_i915_private *i915);
+ void (*hpd_irq_setup)(struct intel_display *display);
/* Enable HPD sense for a single encoder */
void (*hpd_enable_detection)(struct intel_encoder *encoder);
};
@@ -1476,49 +1462,49 @@ HPD_FUNCS(ilk);
void intel_hpd_enable_detection(struct intel_encoder *encoder)
{
- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+ struct intel_display *display = to_intel_display(encoder);
- if (i915->display.funcs.hotplug)
- i915->display.funcs.hotplug->hpd_enable_detection(encoder);
+ if (display->funcs.hotplug)
+ display->funcs.hotplug->hpd_enable_detection(encoder);
}
-void intel_hpd_irq_setup(struct drm_i915_private *i915)
+void intel_hpd_irq_setup(struct intel_display *display)
{
- if ((IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) &&
- !i915->display.irq.vlv_display_irqs_enabled)
+ if ((display->platform.valleyview || display->platform.cherryview) &&
+ !display->irq.vlv_display_irqs_enabled)
return;
- if (i915->display.funcs.hotplug)
- i915->display.funcs.hotplug->hpd_irq_setup(i915);
+ if (display->funcs.hotplug)
+ display->funcs.hotplug->hpd_irq_setup(display);
}
-void intel_hotplug_irq_init(struct drm_i915_private *i915)
+void intel_hotplug_irq_init(struct intel_display *display)
{
- struct intel_display *display = &i915->display;
+ struct drm_i915_private *i915 = to_i915(display->drm);
- intel_hpd_init_pins(i915);
+ intel_hpd_init_pins(display);
intel_hpd_init_early(display);
- if (HAS_GMCH(i915)) {
- if (I915_HAS_HOTPLUG(i915))
- i915->display.funcs.hotplug = &i915_hpd_funcs;
+ if (HAS_GMCH(display)) {
+ if (I915_HAS_HOTPLUG(display))
+ display->funcs.hotplug = &i915_hpd_funcs;
} else {
if (HAS_PCH_DG2(i915))
- i915->display.funcs.hotplug = &icp_hpd_funcs;
+ display->funcs.hotplug = &icp_hpd_funcs;
else if (HAS_PCH_DG1(i915))
- i915->display.funcs.hotplug = &dg1_hpd_funcs;
- else if (DISPLAY_VER(i915) >= 14)
- i915->display.funcs.hotplug = &xelpdp_hpd_funcs;
- else if (DISPLAY_VER(i915) >= 11)
- i915->display.funcs.hotplug = &gen11_hpd_funcs;
- else if (IS_GEMINILAKE(i915) || IS_BROXTON(i915))
- i915->display.funcs.hotplug = &bxt_hpd_funcs;
+ display->funcs.hotplug = &dg1_hpd_funcs;
+ else if (DISPLAY_VER(display) >= 14)
+ display->funcs.hotplug = &xelpdp_hpd_funcs;
+ else if (DISPLAY_VER(display) >= 11)
+ display->funcs.hotplug = &gen11_hpd_funcs;
+ else if (display->platform.geminilake || display->platform.broxton)
+ display->funcs.hotplug = &bxt_hpd_funcs;
else if (INTEL_PCH_TYPE(i915) >= PCH_ICP)
- i915->display.funcs.hotplug = &icp_hpd_funcs;
+ display->funcs.hotplug = &icp_hpd_funcs;
else if (INTEL_PCH_TYPE(i915) >= PCH_SPT)
- i915->display.funcs.hotplug = &spt_hpd_funcs;
+ display->funcs.hotplug = &spt_hpd_funcs;
else
- i915->display.funcs.hotplug = &ilk_hpd_funcs;
+ display->funcs.hotplug = &ilk_hpd_funcs;
}
}
diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.h b/drivers/gpu/drm/i915/display/intel_hotplug_irq.h
index e4db752df096..9063bb02a2e9 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.h
+++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.h
@@ -8,28 +8,28 @@
#include <linux/types.h>
-struct drm_i915_private;
+struct intel_display;
struct intel_encoder;
-u32 i9xx_hpd_irq_ack(struct drm_i915_private *i915);
+u32 i9xx_hpd_irq_ack(struct intel_display *display);
-void i9xx_hpd_irq_handler(struct drm_i915_private *i915, u32 hotplug_status);
-void ibx_hpd_irq_handler(struct drm_i915_private *i915, u32 hotplug_trigger);
-void ilk_hpd_irq_handler(struct drm_i915_private *i915, u32 hotplug_trigger);
-void gen11_hpd_irq_handler(struct drm_i915_private *i915, u32 iir);
-void bxt_hpd_irq_handler(struct drm_i915_private *i915, u32 hotplug_trigger);
-void xelpdp_pica_irq_handler(struct drm_i915_private *i915, u32 iir);
-void icp_irq_handler(struct drm_i915_private *i915, u32 pch_iir);
-void spt_irq_handler(struct drm_i915_private *i915, u32 pch_iir);
+void i9xx_hpd_irq_handler(struct intel_display *display, u32 hotplug_status);
+void ibx_hpd_irq_handler(struct intel_display *display, u32 hotplug_trigger);
+void ilk_hpd_irq_handler(struct intel_display *display, u32 hotplug_trigger);
+void gen11_hpd_irq_handler(struct intel_display *display, u32 iir);
+void bxt_hpd_irq_handler(struct intel_display *display, u32 hotplug_trigger);
+void xelpdp_pica_irq_handler(struct intel_display *display, u32 iir);
+void icp_irq_handler(struct intel_display *display, u32 pch_iir);
+void spt_irq_handler(struct intel_display *display, u32 pch_iir);
-void i915_hotplug_interrupt_update_locked(struct drm_i915_private *i915,
+void i915_hotplug_interrupt_update_locked(struct intel_display *display,
u32 mask, u32 bits);
-void i915_hotplug_interrupt_update(struct drm_i915_private *i915,
+void i915_hotplug_interrupt_update(struct intel_display *display,
u32 mask, u32 bits);
void intel_hpd_enable_detection(struct intel_encoder *encoder);
-void intel_hpd_irq_setup(struct drm_i915_private *i915);
+void intel_hpd_irq_setup(struct intel_display *display);
-void intel_hotplug_irq_init(struct drm_i915_private *i915);
+void intel_hotplug_irq_init(struct intel_display *display);
#endif /* __INTEL_HOTPLUG_IRQ_H__ */
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index de53615571be..3b05eb3f9cbc 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -277,7 +277,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
intel_uncore_write(&dev_priv->uncore, GEN6_PMIIR, pm_iir);
if (iir & I915_DISPLAY_PORT_INTERRUPT)
- hotplug_status = i9xx_hpd_irq_ack(dev_priv);
+ hotplug_status = i9xx_hpd_irq_ack(display);
if (iir & I915_MASTER_ERROR_INTERRUPT)
vlv_display_error_irq_ack(display, &eir, &dpinvgtt);
@@ -306,7 +306,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
gen6_rps_irq_handler(&to_gt(dev_priv)->rps, pm_iir);
if (hotplug_status)
- i9xx_hpd_irq_handler(dev_priv, hotplug_status);
+ i9xx_hpd_irq_handler(display, hotplug_status);
if (iir & I915_MASTER_ERROR_INTERRUPT)
vlv_display_error_irq_handler(display, eir, dpinvgtt);
@@ -367,7 +367,7 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
gen8_gt_irq_handler(to_gt(dev_priv), master_ctl);
if (iir & I915_DISPLAY_PORT_INTERRUPT)
- hotplug_status = i9xx_hpd_irq_ack(dev_priv);
+ hotplug_status = i9xx_hpd_irq_ack(display);
if (iir & I915_MASTER_ERROR_INTERRUPT)
vlv_display_error_irq_ack(display, &eir, &dpinvgtt);
@@ -392,7 +392,7 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
intel_uncore_write(&dev_priv->uncore, GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL);
if (hotplug_status)
- i9xx_hpd_irq_handler(dev_priv, hotplug_status);
+ i9xx_hpd_irq_handler(display, hotplug_status);
if (iir & I915_MASTER_ERROR_INTERRUPT)
vlv_display_error_irq_handler(display, eir, dpinvgtt);
@@ -952,6 +952,7 @@ static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
static irqreturn_t i915_irq_handler(int irq, void *arg)
{
struct drm_i915_private *dev_priv = arg;
+ struct intel_display *display = &dev_priv->display;
irqreturn_t ret = IRQ_NONE;
if (!intel_irqs_enabled(dev_priv))
@@ -974,7 +975,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
if (I915_HAS_HOTPLUG(dev_priv) &&
iir & I915_DISPLAY_PORT_INTERRUPT)
- hotplug_status = i9xx_hpd_irq_ack(dev_priv);
+ hotplug_status = i9xx_hpd_irq_ack(display);
/* Call regardless, as some status bits might not be
* signalled in IIR */
@@ -992,7 +993,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
i9xx_error_irq_handler(dev_priv, eir, eir_stuck);
if (hotplug_status)
- i9xx_hpd_irq_handler(dev_priv, hotplug_status);
+ i9xx_hpd_irq_handler(display, hotplug_status);
i915_pipestat_irq_handler(dev_priv, iir, pipe_stats);
} while (0);
@@ -1075,6 +1076,7 @@ static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
static irqreturn_t i965_irq_handler(int irq, void *arg)
{
struct drm_i915_private *dev_priv = arg;
+ struct intel_display *display = &dev_priv->display;
irqreturn_t ret = IRQ_NONE;
if (!intel_irqs_enabled(dev_priv))
@@ -1096,7 +1098,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
ret = IRQ_HANDLED;
if (iir & I915_DISPLAY_PORT_INTERRUPT)
- hotplug_status = i9xx_hpd_irq_ack(dev_priv);
+ hotplug_status = i9xx_hpd_irq_ack(display);
/* Call regardless, as some status bits might not be
* signalled in IIR */
@@ -1119,7 +1121,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
i9xx_error_irq_handler(dev_priv, eir, eir_stuck);
if (hotplug_status)
- i9xx_hpd_irq_handler(dev_priv, hotplug_status);
+ i9xx_hpd_irq_handler(display, hotplug_status);
i965_pipestat_irq_handler(dev_priv, iir, pipe_stats);
} while (0);
--
2.39.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* RE: [PATCH 6/9] drm/i915/hotplug: convert intel_hotplug_irq.[ch] to struct intel_display
2025-03-11 18:00 ` [PATCH 6/9] drm/i915/hotplug: convert intel_hotplug_irq.[ch] to struct intel_display Jani Nikula
@ 2025-03-12 5:33 ` Shankar, Uma
0 siblings, 0 replies; 31+ messages in thread
From: Shankar, Uma @ 2025-03-12 5:33 UTC (permalink / raw)
To: Nikula, Jani, intel-gfx@lists.freedesktop.org,
intel-xe@lists.freedesktop.org
Cc: Nikula, Jani
> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jani
> Nikula
> Sent: Tuesday, March 11, 2025 11:31 PM
> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nikula@intel.com>
> Subject: [PATCH 6/9] drm/i915/hotplug: convert intel_hotplug_irq.[ch] to struct
> intel_display
>
> Going forward, struct intel_display is the main display device data
> pointer. Convert as much as possible of intel_hotplug_irq.[ch] to struct
> intel_display.
Looks Good to me.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_crt.c | 4 +-
> .../gpu/drm/i915/display/intel_display_irq.c | 33 +-
> drivers/gpu/drm/i915/display/intel_hotplug.c | 6 +-
> .../gpu/drm/i915/display/intel_hotplug_irq.c | 474 +++++++++---------
> .../gpu/drm/i915/display/intel_hotplug_irq.h | 28 +-
> drivers/gpu/drm/i915/i915_irq.c | 18 +-
> 6 files changed, 276 insertions(+), 287 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_crt.c
> b/drivers/gpu/drm/i915/display/intel_crt.c
> index bca91d49cb96..a7f360f89410 100644
> --- a/drivers/gpu/drm/i915/display/intel_crt.c
> +++ b/drivers/gpu/drm/i915/display/intel_crt.c
> @@ -606,7 +606,7 @@ static bool intel_crt_detect_hotplug(struct
> drm_connector *connector)
>
> for (i = 0; i < tries ; i++) {
> /* turn on the FORCE_DETECT */
> - i915_hotplug_interrupt_update(dev_priv,
> + i915_hotplug_interrupt_update(display,
> CRT_HOTPLUG_FORCE_DETECT,
> CRT_HOTPLUG_FORCE_DETECT);
> /* wait for FORCE_DETECT to go off */
> @@ -624,7 +624,7 @@ static bool intel_crt_detect_hotplug(struct
> drm_connector *connector)
> intel_de_write(display, PORT_HOTPLUG_STAT(display),
> CRT_HOTPLUG_INT_STATUS);
>
> - i915_hotplug_interrupt_update(dev_priv,
> CRT_HOTPLUG_FORCE_DETECT, 0);
> + i915_hotplug_interrupt_update(display, CRT_HOTPLUG_FORCE_DETECT,
> 0);
>
> return ret;
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c
> b/drivers/gpu/drm/i915/display/intel_display_irq.c
> index aa23bb817805..b37bcb8fb2e8 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_irq.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
> @@ -675,7 +675,7 @@ static void ibx_irq_handler(struct drm_i915_private
> *dev_priv, u32 pch_iir)
> enum pipe pipe;
> u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK;
>
> - ibx_hpd_irq_handler(dev_priv, hotplug_trigger);
> + ibx_hpd_irq_handler(display, hotplug_trigger);
>
> if (pch_iir & SDE_AUDIO_POWER_MASK) {
> int port = ffs((pch_iir & SDE_AUDIO_POWER_MASK) >>
> @@ -812,7 +812,7 @@ static void cpt_irq_handler(struct drm_i915_private
> *dev_priv, u32 pch_iir)
> enum pipe pipe;
> u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK_CPT;
>
> - ibx_hpd_irq_handler(dev_priv, hotplug_trigger);
> + ibx_hpd_irq_handler(display, hotplug_trigger);
>
> if (pch_iir & SDE_AUDIO_POWER_MASK_CPT) {
> int port = ffs((pch_iir & SDE_AUDIO_POWER_MASK_CPT) >>
> @@ -901,7 +901,7 @@ void ilk_display_irq_handler(struct drm_i915_private
> *dev_priv, u32 de_iir)
> u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG;
>
> if (hotplug_trigger)
> - ilk_hpd_irq_handler(dev_priv, hotplug_trigger);
> + ilk_hpd_irq_handler(display, hotplug_trigger);
>
> if (de_iir & DE_AUX_CHANNEL_A)
> intel_dp_aux_irq_handler(display);
> @@ -953,7 +953,7 @@ void ivb_display_irq_handler(struct drm_i915_private
> *dev_priv, u32 de_iir)
> u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG_IVB;
>
> if (hotplug_trigger)
> - ilk_hpd_irq_handler(dev_priv, hotplug_trigger);
> + ilk_hpd_irq_handler(display, hotplug_trigger);
>
> if (de_iir & DE_ERR_INT_IVB)
> ivb_err_int_handler(dev_priv);
> @@ -1382,7 +1382,7 @@ void gen8_de_irq_handler(struct drm_i915_private
> *dev_priv, u32 master_ctl)
> iir = intel_de_read(display, GEN11_DE_HPD_IIR);
> if (iir) {
> intel_de_write(display, GEN11_DE_HPD_IIR, iir);
> - gen11_hpd_irq_handler(dev_priv, iir);
> + gen11_hpd_irq_handler(display, iir);
> } else {
> drm_err_ratelimited(&dev_priv->drm,
> "The master control interrupt lied,
> (DE HPD)!\n");
> @@ -1405,14 +1405,14 @@ void gen8_de_irq_handler(struct drm_i915_private
> *dev_priv, u32 master_ctl)
> u32 hotplug_trigger = iir &
> BXT_DE_PORT_HOTPLUG_MASK;
>
> if (hotplug_trigger) {
> - bxt_hpd_irq_handler(dev_priv,
> hotplug_trigger);
> + bxt_hpd_irq_handler(display,
> hotplug_trigger);
> found = true;
> }
> } else if (IS_BROADWELL(dev_priv)) {
> u32 hotplug_trigger = iir &
> BDW_DE_PORT_HOTPLUG_MASK;
>
> if (hotplug_trigger) {
> - ilk_hpd_irq_handler(dev_priv,
> hotplug_trigger);
> + ilk_hpd_irq_handler(display,
> hotplug_trigger);
> found = true;
> }
> }
> @@ -1498,12 +1498,12 @@ void gen8_de_irq_handler(struct drm_i915_private
> *dev_priv, u32 master_ctl)
> gen8_read_and_ack_pch_irqs(dev_priv, &iir, &pica_iir);
> if (iir) {
> if (pica_iir)
> - xelpdp_pica_irq_handler(dev_priv, pica_iir);
> + xelpdp_pica_irq_handler(display, pica_iir);
>
> if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
> - icp_irq_handler(dev_priv, iir);
> + icp_irq_handler(display, iir);
> else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT)
> - spt_irq_handler(dev_priv, iir);
> + spt_irq_handler(display, iir);
> else
> cpt_irq_handler(dev_priv, iir);
> } else {
> @@ -1904,7 +1904,7 @@ static void _vlv_display_irq_reset(struct
> drm_i915_private *dev_priv)
> gen2_error_reset(to_intel_uncore(display->drm),
> VLV_ERROR_REGS);
>
> - i915_hotplug_interrupt_update_locked(dev_priv, 0xffffffff, 0);
> + i915_hotplug_interrupt_update_locked(display, 0xffffffff, 0);
> intel_de_rmw(display, PORT_HOTPLUG_STAT(dev_priv), 0, 0);
>
> i9xx_pipestat_irq_reset(dev_priv);
> @@ -1924,7 +1924,7 @@ void i9xx_display_irq_reset(struct drm_i915_private
> *i915)
> struct intel_display *display = &i915->display;
>
> if (I915_HAS_HOTPLUG(i915)) {
> - i915_hotplug_interrupt_update(i915, 0xffffffff, 0);
> + i915_hotplug_interrupt_update(display, 0xffffffff, 0);
> intel_de_rmw(display, PORT_HOTPLUG_STAT(i915), 0, 0);
> }
>
> @@ -2348,10 +2348,11 @@ void dg1_de_irq_postinstall(struct drm_i915_private
> *i915)
>
> void intel_display_irq_init(struct drm_i915_private *i915)
> {
> - i915->drm.vblank_disable_immediate = true;
> + struct intel_display *display = &i915->display;
> +
> + display->drm->vblank_disable_immediate = true;
>
> - intel_hotplug_irq_init(i915);
> + intel_hotplug_irq_init(display);
>
> - INIT_WORK(&i915->display.irq.vblank_dc_work,
> - intel_display_vblank_dc_work);
> + INIT_WORK(&display->irq.vblank_dc_work,
> intel_display_vblank_dc_work);
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c
> b/drivers/gpu/drm/i915/display/intel_hotplug.c
> index 7683b3ce124d..fcc3f546cb97 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug.c
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
> @@ -305,7 +305,7 @@ static void intel_hpd_irq_storm_reenable_work(struct
> work_struct *work)
> display->hotplug.stats[pin].state = HPD_ENABLED;
> }
>
> - intel_hpd_irq_setup(dev_priv);
> + intel_hpd_irq_setup(display);
>
> spin_unlock_irq(&dev_priv->irq_lock);
>
> @@ -696,7 +696,7 @@ void intel_hpd_irq_handler(struct intel_display *display,
> * happens later in our hotplug work.
> */
> if (storm_detected)
> - intel_hpd_irq_setup(dev_priv);
> + intel_hpd_irq_setup(display);
>
> /*
> * Our hotplug handler can grab modeset locks (by calling down into the
> @@ -745,7 +745,7 @@ void intel_hpd_init(struct intel_display *display)
> * just to make the assert_spin_locked checks happy.
> */
> spin_lock_irq(&dev_priv->irq_lock);
> - intel_hpd_irq_setup(dev_priv);
> + intel_hpd_irq_setup(display);
> spin_unlock_irq(&dev_priv->irq_lock);
> }
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> index f24c65478742..e44ae6acc55f 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> @@ -131,30 +131,31 @@ static const u32 hpd_mtp[HPD_NUM_PINS] = {
> [HPD_PORT_TC4] = SDE_TC_HOTPLUG_ICP(HPD_PORT_TC4),
> };
>
> -static void intel_hpd_init_pins(struct drm_i915_private *dev_priv)
> +static void intel_hpd_init_pins(struct intel_display *display)
> {
> - struct intel_hotplug *hpd = &dev_priv->display.hotplug;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> + struct intel_hotplug *hpd = &display->hotplug;
>
> - if (HAS_GMCH(dev_priv)) {
> - if (IS_G4X(dev_priv) || IS_VALLEYVIEW(dev_priv) ||
> - IS_CHERRYVIEW(dev_priv))
> + if (HAS_GMCH(display)) {
> + if (display->platform.g4x || display->platform.valleyview ||
> + display->platform.cherryview)
> hpd->hpd = hpd_status_g4x;
> else
> hpd->hpd = hpd_status_i915;
> return;
> }
>
> - if (DISPLAY_VER(dev_priv) >= 14)
> + if (DISPLAY_VER(display) >= 14)
> hpd->hpd = hpd_xelpdp;
> - else if (DISPLAY_VER(dev_priv) >= 11)
> + else if (DISPLAY_VER(display) >= 11)
> hpd->hpd = hpd_gen11;
> - else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv))
> + else if (display->platform.geminilake || display->platform.broxton)
> hpd->hpd = hpd_bxt;
> - else if (DISPLAY_VER(dev_priv) == 9)
> + else if (DISPLAY_VER(display) == 9)
> hpd->hpd = NULL; /* no north HPD on SKL */
> - else if (DISPLAY_VER(dev_priv) >= 8)
> + else if (DISPLAY_VER(display) >= 8)
> hpd->hpd = hpd_bdw;
> - else if (DISPLAY_VER(dev_priv) >= 7)
> + else if (DISPLAY_VER(display) >= 7)
> hpd->hpd = hpd_ivb;
> else
> hpd->hpd = hpd_ilk;
> @@ -180,20 +181,20 @@ static void intel_hpd_init_pins(struct drm_i915_private
> *dev_priv)
> }
>
> /* For display hotplug interrupt */
> -void i915_hotplug_interrupt_update_locked(struct drm_i915_private *dev_priv,
> +void i915_hotplug_interrupt_update_locked(struct intel_display *display,
> u32 mask, u32 bits)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
>
> lockdep_assert_held(&dev_priv->irq_lock);
> - drm_WARN_ON(&dev_priv->drm, bits & ~mask);
> + drm_WARN_ON(display->drm, bits & ~mask);
>
> intel_de_rmw(display, PORT_HOTPLUG_EN(display), mask, bits);
> }
>
> /**
> * i915_hotplug_interrupt_update - update hotplug interrupt enable
> - * @dev_priv: driver private
> + * @display: display device
> * @mask: bits to update
> * @bits: bits to enable
> * NOTE: the HPD enable bits are modified both inside and outside
> @@ -203,12 +204,14 @@ void i915_hotplug_interrupt_update_locked(struct
> drm_i915_private *dev_priv,
> * held already, this function acquires the lock itself. A non-locking
> * version is also available.
> */
> -void i915_hotplug_interrupt_update(struct drm_i915_private *dev_priv,
> +void i915_hotplug_interrupt_update(struct intel_display *display,
> u32 mask,
> u32 bits)
> {
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> +
> spin_lock_irq(&dev_priv->irq_lock);
> - i915_hotplug_interrupt_update_locked(dev_priv, mask, bits);
> + i915_hotplug_interrupt_update_locked(display, mask, bits);
> spin_unlock_irq(&dev_priv->irq_lock);
> }
>
> @@ -340,7 +343,7 @@ static bool i9xx_port_hotplug_long_detect(enum hpd_pin
> pin, u32 val)
> *
> * Note that the caller is expected to zero out the masks initially.
> */
> -static void intel_get_hpd_pins(struct drm_i915_private *dev_priv,
> +static void intel_get_hpd_pins(struct intel_display *display,
> u32 *pin_mask, u32 *long_mask,
> u32 hotplug_trigger, u32 dig_hotplug_reg,
> const u32 hpd[HPD_NUM_PINS],
> @@ -360,37 +363,37 @@ static void intel_get_hpd_pins(struct drm_i915_private
> *dev_priv,
> *long_mask |= BIT(pin);
> }
>
> - drm_dbg(&dev_priv->drm,
> - "hotplug event received, stat 0x%08x, dig 0x%08x, pins 0x%08x,
> long 0x%08x\n",
> - hotplug_trigger, dig_hotplug_reg, *pin_mask, *long_mask);
> + drm_dbg_kms(display->drm,
> + "hotplug event received, stat 0x%08x, dig 0x%08x, pins
> 0x%08x, long 0x%08x\n",
> + hotplug_trigger, dig_hotplug_reg, *pin_mask, *long_mask);
> }
>
> -static u32 intel_hpd_enabled_irqs(struct drm_i915_private *dev_priv,
> +static u32 intel_hpd_enabled_irqs(struct intel_display *display,
> const u32 hpd[HPD_NUM_PINS])
> {
> struct intel_encoder *encoder;
> u32 enabled_irqs = 0;
>
> - for_each_intel_encoder(&dev_priv->drm, encoder)
> - if (dev_priv->display.hotplug.stats[encoder->hpd_pin].state ==
> HPD_ENABLED)
> + for_each_intel_encoder(display->drm, encoder)
> + if (display->hotplug.stats[encoder->hpd_pin].state ==
> HPD_ENABLED)
> enabled_irqs |= hpd[encoder->hpd_pin];
>
> return enabled_irqs;
> }
>
> -static u32 intel_hpd_hotplug_irqs(struct drm_i915_private *dev_priv,
> +static u32 intel_hpd_hotplug_irqs(struct intel_display *display,
> const u32 hpd[HPD_NUM_PINS])
> {
> struct intel_encoder *encoder;
> u32 hotplug_irqs = 0;
>
> - for_each_intel_encoder(&dev_priv->drm, encoder)
> + for_each_intel_encoder(display->drm, encoder)
> hotplug_irqs |= hpd[encoder->hpd_pin];
>
> return hotplug_irqs;
> }
>
> -static u32 intel_hpd_hotplug_mask(struct drm_i915_private *i915,
> +static u32 intel_hpd_hotplug_mask(struct intel_display *display,
> hotplug_mask_func hotplug_mask)
> {
> enum hpd_pin pin;
> @@ -402,26 +405,25 @@ static u32 intel_hpd_hotplug_mask(struct
> drm_i915_private *i915,
> return hotplug;
> }
>
> -static u32 intel_hpd_hotplug_enables(struct drm_i915_private *i915,
> +static u32 intel_hpd_hotplug_enables(struct intel_display *display,
> hotplug_enables_func hotplug_enables)
> {
> struct intel_encoder *encoder;
> u32 hotplug = 0;
>
> - for_each_intel_encoder(&i915->drm, encoder)
> + for_each_intel_encoder(display->drm, encoder)
> hotplug |= hotplug_enables(encoder);
>
> return hotplug;
> }
>
> -u32 i9xx_hpd_irq_ack(struct drm_i915_private *dev_priv)
> +u32 i9xx_hpd_irq_ack(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> u32 hotplug_status = 0, hotplug_status_mask;
> int i;
>
> - if (IS_G4X(dev_priv) ||
> - IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
> + if (display->platform.g4x ||
> + display->platform.valleyview || display->platform.cherryview)
> hotplug_status_mask = HOTPLUG_INT_STATUS_G4X |
> DP_AUX_CHANNEL_MASK_INT_STATUS_G4X;
> else
> @@ -448,43 +450,41 @@ u32 i9xx_hpd_irq_ack(struct drm_i915_private
> *dev_priv)
> hotplug_status);
> }
>
> - drm_WARN_ONCE(&dev_priv->drm, 1,
> + drm_WARN_ONCE(display->drm, 1,
> "PORT_HOTPLUG_STAT did not clear (0x%08x)\n",
> intel_de_read(display, PORT_HOTPLUG_STAT(display)));
>
> return hotplug_status;
> }
>
> -void i9xx_hpd_irq_handler(struct drm_i915_private *dev_priv, u32
> hotplug_status)
> +void i9xx_hpd_irq_handler(struct intel_display *display, u32 hotplug_status)
> {
> - struct intel_display *display = &dev_priv->display;
> u32 pin_mask = 0, long_mask = 0;
> u32 hotplug_trigger;
>
> - if (IS_G4X(dev_priv) ||
> - IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
> + if (display->platform.g4x ||
> + display->platform.valleyview || display->platform.cherryview)
> hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_G4X;
> else
> hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_I915;
>
> if (hotplug_trigger) {
> - intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> + intel_get_hpd_pins(display, &pin_mask, &long_mask,
> hotplug_trigger, hotplug_trigger,
> - dev_priv->display.hotplug.hpd,
> + display->hotplug.hpd,
> i9xx_port_hotplug_long_detect);
>
> intel_hpd_irq_handler(display, pin_mask, long_mask);
> }
>
> - if ((IS_G4X(dev_priv) ||
> - IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) &&
> + if ((display->platform.g4x ||
> + display->platform.valleyview || display->platform.cherryview) &&
> hotplug_status & DP_AUX_CHANNEL_MASK_INT_STATUS_G4X)
> intel_dp_aux_irq_handler(display);
> }
>
> -void ibx_hpd_irq_handler(struct drm_i915_private *dev_priv, u32
> hotplug_trigger)
> +void ibx_hpd_irq_handler(struct intel_display *display, u32 hotplug_trigger)
> {
> - struct intel_display *display = &dev_priv->display;
> u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
>
> /*
> @@ -506,44 +506,43 @@ void ibx_hpd_irq_handler(struct drm_i915_private
> *dev_priv, u32 hotplug_trigger)
> if (!hotplug_trigger)
> return;
>
> - intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> + intel_get_hpd_pins(display, &pin_mask, &long_mask,
> hotplug_trigger, dig_hotplug_reg,
> - dev_priv->display.hotplug.pch_hpd,
> + display->hotplug.pch_hpd,
> pch_port_hotplug_long_detect);
>
> intel_hpd_irq_handler(display, pin_mask, long_mask);
> }
>
> -void xelpdp_pica_irq_handler(struct drm_i915_private *i915, u32 iir)
> +void xelpdp_pica_irq_handler(struct intel_display *display, u32 iir)
> {
> - struct intel_display *display = &i915->display;
> enum hpd_pin pin;
> u32 hotplug_trigger = iir & (XELPDP_DP_ALT_HOTPLUG_MASK |
> XELPDP_TBT_HOTPLUG_MASK);
> u32 trigger_aux = iir & XELPDP_AUX_TC_MASK;
> u32 pin_mask = 0, long_mask = 0;
>
> - if (DISPLAY_VER(i915) >= 20)
> + if (DISPLAY_VER(display) >= 20)
> trigger_aux |= iir & XE2LPD_AUX_DDI_MASK;
>
> for (pin = HPD_PORT_TC1; pin <= HPD_PORT_TC4; pin++) {
> u32 val;
>
> - if (!(i915->display.hotplug.hpd[pin] & hotplug_trigger))
> + if (!(display->hotplug.hpd[pin] & hotplug_trigger))
> continue;
>
> pin_mask |= BIT(pin);
>
> - val = intel_de_read(i915, XELPDP_PORT_HOTPLUG_CTL(pin));
> - intel_de_write(i915, XELPDP_PORT_HOTPLUG_CTL(pin), val);
> + val = intel_de_read(display, XELPDP_PORT_HOTPLUG_CTL(pin));
> + intel_de_write(display, XELPDP_PORT_HOTPLUG_CTL(pin), val);
>
> if (val & (XELPDP_DP_ALT_HPD_LONG_DETECT |
> XELPDP_TBT_HPD_LONG_DETECT))
> long_mask |= BIT(pin);
> }
>
> if (pin_mask) {
> - drm_dbg(&i915->drm,
> - "pica hotplug event received, stat 0x%08x, pins 0x%08x,
> long 0x%08x\n",
> - hotplug_trigger, pin_mask, long_mask);
> + drm_dbg_kms(display->drm,
> + "pica hotplug event received, stat 0x%08x, pins
> 0x%08x, long 0x%08x\n",
> + hotplug_trigger, pin_mask, long_mask);
>
> intel_hpd_irq_handler(display, pin_mask, long_mask);
> }
> @@ -552,13 +551,13 @@ void xelpdp_pica_irq_handler(struct drm_i915_private
> *i915, u32 iir)
> intel_dp_aux_irq_handler(display);
>
> if (!pin_mask && !trigger_aux)
> - drm_err(&i915->drm,
> + drm_err(display->drm,
> "Unexpected DE HPD/AUX interrupt 0x%08x\n", iir);
> }
>
> -void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
> +void icp_irq_handler(struct intel_display *display, u32 pch_iir)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 ddi_hotplug_trigger = pch_iir & SDE_DDI_HOTPLUG_MASK_ICP;
> u32 tc_hotplug_trigger = pch_iir & SDE_TC_HOTPLUG_MASK_ICP;
> u32 pin_mask = 0, long_mask = 0;
> @@ -571,9 +570,9 @@ void icp_irq_handler(struct drm_i915_private *dev_priv,
> u32 pch_iir)
> dig_hotplug_reg = intel_de_rmw(display, SHOTPLUG_CTL_DDI, 0,
> 0);
> spin_unlock(&dev_priv->irq_lock);
>
> - intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> + intel_get_hpd_pins(display, &pin_mask, &long_mask,
> ddi_hotplug_trigger, dig_hotplug_reg,
> - dev_priv->display.hotplug.pch_hpd,
> + display->hotplug.pch_hpd,
> icp_ddi_port_hotplug_long_detect);
> }
>
> @@ -582,9 +581,9 @@ void icp_irq_handler(struct drm_i915_private *dev_priv,
> u32 pch_iir)
>
> dig_hotplug_reg = intel_de_rmw(display, SHOTPLUG_CTL_TC, 0,
> 0);
>
> - intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> + intel_get_hpd_pins(display, &pin_mask, &long_mask,
> tc_hotplug_trigger, dig_hotplug_reg,
> - dev_priv->display.hotplug.pch_hpd,
> + display->hotplug.pch_hpd,
> icp_tc_port_hotplug_long_detect);
> }
>
> @@ -595,9 +594,8 @@ void icp_irq_handler(struct drm_i915_private *dev_priv,
> u32 pch_iir)
> intel_gmbus_irq_handler(display);
> }
>
> -void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
> +void spt_irq_handler(struct intel_display *display, u32 pch_iir)
> {
> - struct intel_display *display = &dev_priv->display;
> u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK_SPT &
> ~SDE_PORTE_HOTPLUG_SPT;
> u32 hotplug2_trigger = pch_iir & SDE_PORTE_HOTPLUG_SPT;
> @@ -608,9 +606,9 @@ void spt_irq_handler(struct drm_i915_private *dev_priv,
> u32 pch_iir)
>
> dig_hotplug_reg = intel_de_rmw(display, PCH_PORT_HOTPLUG,
> 0, 0);
>
> - intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> + intel_get_hpd_pins(display, &pin_mask, &long_mask,
> hotplug_trigger, dig_hotplug_reg,
> - dev_priv->display.hotplug.pch_hpd,
> + display->hotplug.pch_hpd,
> spt_port_hotplug_long_detect);
> }
>
> @@ -619,9 +617,9 @@ void spt_irq_handler(struct drm_i915_private *dev_priv,
> u32 pch_iir)
>
> dig_hotplug_reg = intel_de_rmw(display, PCH_PORT_HOTPLUG2,
> 0, 0);
>
> - intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> + intel_get_hpd_pins(display, &pin_mask, &long_mask,
> hotplug2_trigger, dig_hotplug_reg,
> - dev_priv->display.hotplug.pch_hpd,
> + display->hotplug.pch_hpd,
> spt_port_hotplug2_long_detect);
> }
>
> @@ -632,39 +630,36 @@ void spt_irq_handler(struct drm_i915_private
> *dev_priv, u32 pch_iir)
> intel_gmbus_irq_handler(display);
> }
>
> -void ilk_hpd_irq_handler(struct drm_i915_private *dev_priv, u32
> hotplug_trigger)
> +void ilk_hpd_irq_handler(struct intel_display *display, u32 hotplug_trigger)
> {
> - struct intel_display *display = &dev_priv->display;
> u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
>
> dig_hotplug_reg = intel_de_rmw(display,
> DIGITAL_PORT_HOTPLUG_CNTRL, 0, 0);
>
> - intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> + intel_get_hpd_pins(display, &pin_mask, &long_mask,
> hotplug_trigger, dig_hotplug_reg,
> - dev_priv->display.hotplug.hpd,
> + display->hotplug.hpd,
> ilk_port_hotplug_long_detect);
>
> intel_hpd_irq_handler(display, pin_mask, long_mask);
> }
>
> -void bxt_hpd_irq_handler(struct drm_i915_private *dev_priv, u32
> hotplug_trigger)
> +void bxt_hpd_irq_handler(struct intel_display *display, u32 hotplug_trigger)
> {
> - struct intel_display *display = &dev_priv->display;
> u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
>
> dig_hotplug_reg = intel_de_rmw(display, PCH_PORT_HOTPLUG, 0, 0);
>
> - intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> + intel_get_hpd_pins(display, &pin_mask, &long_mask,
> hotplug_trigger, dig_hotplug_reg,
> - dev_priv->display.hotplug.hpd,
> + display->hotplug.hpd,
> bxt_port_hotplug_long_detect);
>
> intel_hpd_irq_handler(display, pin_mask, long_mask);
> }
>
> -void gen11_hpd_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
> +void gen11_hpd_irq_handler(struct intel_display *display, u32 iir)
> {
> - struct intel_display *display = &dev_priv->display;
> u32 pin_mask = 0, long_mask = 0;
> u32 trigger_tc = iir & GEN11_DE_TC_HOTPLUG_MASK;
> u32 trigger_tbt = iir & GEN11_DE_TBT_HOTPLUG_MASK;
> @@ -674,9 +669,9 @@ void gen11_hpd_irq_handler(struct drm_i915_private
> *dev_priv, u32 iir)
>
> dig_hotplug_reg = intel_de_rmw(display,
> GEN11_TC_HOTPLUG_CTL, 0, 0);
>
> - intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> + intel_get_hpd_pins(display, &pin_mask, &long_mask,
> trigger_tc, dig_hotplug_reg,
> - dev_priv->display.hotplug.hpd,
> + display->hotplug.hpd,
> gen11_port_hotplug_long_detect);
> }
>
> @@ -685,16 +680,16 @@ void gen11_hpd_irq_handler(struct drm_i915_private
> *dev_priv, u32 iir)
>
> dig_hotplug_reg = intel_de_rmw(display,
> GEN11_TBT_HOTPLUG_CTL, 0, 0);
>
> - intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask,
> + intel_get_hpd_pins(display, &pin_mask, &long_mask,
> trigger_tbt, dig_hotplug_reg,
> - dev_priv->display.hotplug.hpd,
> + display->hotplug.hpd,
> gen11_port_hotplug_long_detect);
> }
>
> if (pin_mask)
> intel_hpd_irq_handler(display, pin_mask, long_mask);
> else
> - drm_err(&dev_priv->drm,
> + drm_err(display->drm,
> "Unexpected DE HPD interrupt 0x%08x\n", iir);
> }
>
> @@ -740,18 +735,16 @@ static u32 ibx_hotplug_enables(struct intel_encoder
> *encoder)
> }
> }
>
> -static void ibx_hpd_detection_setup(struct drm_i915_private *dev_priv)
> +static void ibx_hpd_detection_setup(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> -
> /*
> * Enable digital hotplug on the PCH, and configure the DP short pulse
> * duration to 2ms (which is the minimum in the Display Port spec).
> * The pulse duration bits are reserved on LPT+.
> */
> intel_de_rmw(display, PCH_PORT_HOTPLUG,
> - intel_hpd_hotplug_mask(dev_priv, ibx_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv, ibx_hotplug_enables));
> + intel_hpd_hotplug_mask(display, ibx_hotplug_mask),
> + intel_hpd_hotplug_enables(display, ibx_hotplug_enables));
> }
>
> static void ibx_hpd_enable_detection(struct intel_encoder *encoder)
> @@ -763,16 +756,17 @@ static void ibx_hpd_enable_detection(struct
> intel_encoder *encoder)
> ibx_hotplug_enables(encoder));
> }
>
> -static void ibx_hpd_irq_setup(struct drm_i915_private *dev_priv)
> +static void ibx_hpd_irq_setup(struct intel_display *display)
> {
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> - enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv-
> >display.hotplug.pch_hpd);
> - hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv-
> >display.hotplug.pch_hpd);
> + enabled_irqs = intel_hpd_enabled_irqs(display, display-
> >hotplug.pch_hpd);
> + hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
>
> ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
>
> - ibx_hpd_detection_setup(dev_priv);
> + ibx_hpd_detection_setup(display);
> }
>
> static u32 icp_ddi_hotplug_mask(enum hpd_pin hpd_pin)
> @@ -813,13 +807,11 @@ static u32 icp_tc_hotplug_enables(struct
> intel_encoder *encoder)
> return icp_tc_hotplug_mask(encoder->hpd_pin);
> }
>
> -static void icp_ddi_hpd_detection_setup(struct drm_i915_private *dev_priv)
> +static void icp_ddi_hpd_detection_setup(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> -
> intel_de_rmw(display, SHOTPLUG_CTL_DDI,
> - intel_hpd_hotplug_mask(dev_priv, icp_ddi_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv,
> icp_ddi_hotplug_enables));
> + intel_hpd_hotplug_mask(display, icp_ddi_hotplug_mask),
> + intel_hpd_hotplug_enables(display,
> icp_ddi_hotplug_enables));
> }
>
> static void icp_ddi_hpd_enable_detection(struct intel_encoder *encoder)
> @@ -831,13 +823,11 @@ static void icp_ddi_hpd_enable_detection(struct
> intel_encoder *encoder)
> icp_ddi_hotplug_enables(encoder));
> }
>
> -static void icp_tc_hpd_detection_setup(struct drm_i915_private *dev_priv)
> +static void icp_tc_hpd_detection_setup(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> -
> intel_de_rmw(display, SHOTPLUG_CTL_TC,
> - intel_hpd_hotplug_mask(dev_priv, icp_tc_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv,
> icp_tc_hotplug_enables));
> + intel_hpd_hotplug_mask(display, icp_tc_hotplug_mask),
> + intel_hpd_hotplug_enables(display, icp_tc_hotplug_enables));
> }
>
> static void icp_tc_hpd_enable_detection(struct intel_encoder *encoder)
> @@ -855,13 +845,13 @@ static void icp_hpd_enable_detection(struct
> intel_encoder *encoder)
> icp_tc_hpd_enable_detection(encoder);
> }
>
> -static void icp_hpd_irq_setup(struct drm_i915_private *dev_priv)
> +static void icp_hpd_irq_setup(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> - enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv-
> >display.hotplug.pch_hpd);
> - hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv-
> >display.hotplug.pch_hpd);
> + enabled_irqs = intel_hpd_enabled_irqs(display, display-
> >hotplug.pch_hpd);
> + hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
>
> /*
> * We reduce the value to 250us to be able to detect SHPD when an
> external display
> @@ -871,8 +861,8 @@ static void icp_hpd_irq_setup(struct drm_i915_private
> *dev_priv)
>
> ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
>
> - icp_ddi_hpd_detection_setup(dev_priv);
> - icp_tc_hpd_detection_setup(dev_priv);
> + icp_ddi_hpd_detection_setup(display);
> + icp_tc_hpd_detection_setup(display);
> }
>
> static u32 gen11_hotplug_mask(enum hpd_pin hpd_pin)
> @@ -895,9 +885,8 @@ static u32 gen11_hotplug_enables(struct intel_encoder
> *encoder)
> return gen11_hotplug_mask(encoder->hpd_pin);
> }
>
> -static void dg1_hpd_invert(struct drm_i915_private *i915)
> +static void dg1_hpd_invert(struct intel_display *display)
> {
> - struct intel_display *display = &i915->display;
> u32 val = (INVERT_DDIA_HPD |
> INVERT_DDIB_HPD |
> INVERT_DDIC_HPD |
> @@ -907,25 +896,23 @@ static void dg1_hpd_invert(struct drm_i915_private
> *i915)
>
> static void dg1_hpd_enable_detection(struct intel_encoder *encoder)
> {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
>
> - dg1_hpd_invert(i915);
> + dg1_hpd_invert(display);
> icp_hpd_enable_detection(encoder);
> }
>
> -static void dg1_hpd_irq_setup(struct drm_i915_private *dev_priv)
> +static void dg1_hpd_irq_setup(struct intel_display *display)
> {
> - dg1_hpd_invert(dev_priv);
> - icp_hpd_irq_setup(dev_priv);
> + dg1_hpd_invert(display);
> + icp_hpd_irq_setup(display);
> }
>
> -static void gen11_tc_hpd_detection_setup(struct drm_i915_private *dev_priv)
> +static void gen11_tc_hpd_detection_setup(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> -
> intel_de_rmw(display, GEN11_TC_HOTPLUG_CTL,
> - intel_hpd_hotplug_mask(dev_priv, gen11_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv,
> gen11_hotplug_enables));
> + intel_hpd_hotplug_mask(display, gen11_hotplug_mask),
> + intel_hpd_hotplug_enables(display, gen11_hotplug_enables));
> }
>
> static void gen11_tc_hpd_enable_detection(struct intel_encoder *encoder)
> @@ -937,13 +924,11 @@ static void gen11_tc_hpd_enable_detection(struct
> intel_encoder *encoder)
> gen11_hotplug_enables(encoder));
> }
>
> -static void gen11_tbt_hpd_detection_setup(struct drm_i915_private *dev_priv)
> +static void gen11_tbt_hpd_detection_setup(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> -
> intel_de_rmw(display, GEN11_TBT_HOTPLUG_CTL,
> - intel_hpd_hotplug_mask(dev_priv, gen11_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv,
> gen11_hotplug_enables));
> + intel_hpd_hotplug_mask(display, gen11_hotplug_mask),
> + intel_hpd_hotplug_enables(display, gen11_hotplug_enables));
> }
>
> static void gen11_tbt_hpd_enable_detection(struct intel_encoder *encoder)
> @@ -966,23 +951,23 @@ static void gen11_hpd_enable_detection(struct
> intel_encoder *encoder)
> icp_hpd_enable_detection(encoder);
> }
>
> -static void gen11_hpd_irq_setup(struct drm_i915_private *dev_priv)
> +static void gen11_hpd_irq_setup(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> - enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv-
> >display.hotplug.hpd);
> - hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv-
> >display.hotplug.hpd);
> + enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.hpd);
> + hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.hpd);
>
> intel_de_rmw(display, GEN11_DE_HPD_IMR, hotplug_irqs,
> ~enabled_irqs & hotplug_irqs);
> intel_de_posting_read(display, GEN11_DE_HPD_IMR);
>
> - gen11_tc_hpd_detection_setup(dev_priv);
> - gen11_tbt_hpd_detection_setup(dev_priv);
> + gen11_tc_hpd_detection_setup(display);
> + gen11_tbt_hpd_detection_setup(display);
>
> if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
> - icp_hpd_irq_setup(dev_priv);
> + icp_hpd_irq_setup(display);
> }
>
> static u32 mtp_ddi_hotplug_mask(enum hpd_pin hpd_pin)
> @@ -1019,39 +1004,39 @@ static u32 mtp_tc_hotplug_enables(struct
> intel_encoder *encoder)
> return mtp_tc_hotplug_mask(encoder->hpd_pin);
> }
>
> -static void mtp_ddi_hpd_detection_setup(struct drm_i915_private *i915)
> +static void mtp_ddi_hpd_detection_setup(struct intel_display *display)
> {
> - intel_de_rmw(i915, SHOTPLUG_CTL_DDI,
> - intel_hpd_hotplug_mask(i915, mtp_ddi_hotplug_mask),
> - intel_hpd_hotplug_enables(i915, mtp_ddi_hotplug_enables));
> + intel_de_rmw(display, SHOTPLUG_CTL_DDI,
> + intel_hpd_hotplug_mask(display, mtp_ddi_hotplug_mask),
> + intel_hpd_hotplug_enables(display,
> mtp_ddi_hotplug_enables));
> }
>
> static void mtp_ddi_hpd_enable_detection(struct intel_encoder *encoder)
> {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
>
> - intel_de_rmw(i915, SHOTPLUG_CTL_DDI,
> + intel_de_rmw(display, SHOTPLUG_CTL_DDI,
> mtp_ddi_hotplug_mask(encoder->hpd_pin),
> mtp_ddi_hotplug_enables(encoder));
> }
>
> -static void mtp_tc_hpd_detection_setup(struct drm_i915_private *i915)
> +static void mtp_tc_hpd_detection_setup(struct intel_display *display)
> {
> - intel_de_rmw(i915, SHOTPLUG_CTL_TC,
> - intel_hpd_hotplug_mask(i915, mtp_tc_hotplug_mask),
> - intel_hpd_hotplug_enables(i915, mtp_tc_hotplug_enables));
> + intel_de_rmw(display, SHOTPLUG_CTL_TC,
> + intel_hpd_hotplug_mask(display, mtp_tc_hotplug_mask),
> + intel_hpd_hotplug_enables(display,
> mtp_tc_hotplug_enables));
> }
>
> static void mtp_tc_hpd_enable_detection(struct intel_encoder *encoder)
> {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
>
> - intel_de_rmw(i915, SHOTPLUG_CTL_DDI,
> + intel_de_rmw(display, SHOTPLUG_CTL_DDI,
> mtp_tc_hotplug_mask(encoder->hpd_pin),
> mtp_tc_hotplug_enables(encoder));
> }
>
> -static void mtp_hpd_invert(struct drm_i915_private *i915)
> +static void mtp_hpd_invert(struct intel_display *display)
> {
> u32 val = (INVERT_DDIA_HPD |
> INVERT_DDIB_HPD |
> @@ -1062,49 +1047,51 @@ static void mtp_hpd_invert(struct drm_i915_private
> *i915)
> INVERT_TC4_HPD |
> INVERT_DDID_HPD_MTP |
> INVERT_DDIE_HPD);
> - intel_de_rmw(i915, SOUTH_CHICKEN1, 0, val);
> + intel_de_rmw(display, SOUTH_CHICKEN1, 0, val);
> }
>
> static void mtp_hpd_enable_detection(struct intel_encoder *encoder)
> {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
>
> - mtp_hpd_invert(i915);
> + mtp_hpd_invert(display);
> mtp_ddi_hpd_enable_detection(encoder);
> mtp_tc_hpd_enable_detection(encoder);
> }
>
> -static void mtp_hpd_irq_setup(struct drm_i915_private *i915)
> +static void mtp_hpd_irq_setup(struct intel_display *display)
> {
> + struct drm_i915_private *i915 = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> - enabled_irqs = intel_hpd_enabled_irqs(i915, i915-
> >display.hotplug.pch_hpd);
> - hotplug_irqs = intel_hpd_hotplug_irqs(i915, i915-
> >display.hotplug.pch_hpd);
> + enabled_irqs = intel_hpd_enabled_irqs(display, display-
> >hotplug.pch_hpd);
> + hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
>
> /*
> * Use 250us here to align with the DP1.4a(Table 3-4) spec as to what the
> * SHPD_FILTER_CNT value should be.
> */
> - intel_de_write(i915, SHPD_FILTER_CNT, SHPD_FILTER_CNT_250);
> + intel_de_write(display, SHPD_FILTER_CNT, SHPD_FILTER_CNT_250);
>
> - mtp_hpd_invert(i915);
> + mtp_hpd_invert(display);
> ibx_display_interrupt_update(i915, hotplug_irqs, enabled_irqs);
>
> - mtp_ddi_hpd_detection_setup(i915);
> - mtp_tc_hpd_detection_setup(i915);
> + mtp_ddi_hpd_detection_setup(display);
> + mtp_tc_hpd_detection_setup(display);
> }
>
> -static void xe2lpd_sde_hpd_irq_setup(struct drm_i915_private *i915)
> +static void xe2lpd_sde_hpd_irq_setup(struct intel_display *display)
> {
> + struct drm_i915_private *i915 = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> - enabled_irqs = intel_hpd_enabled_irqs(i915, i915-
> >display.hotplug.pch_hpd);
> - hotplug_irqs = intel_hpd_hotplug_irqs(i915, i915-
> >display.hotplug.pch_hpd);
> + enabled_irqs = intel_hpd_enabled_irqs(display, display-
> >hotplug.pch_hpd);
> + hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
>
> ibx_display_interrupt_update(i915, hotplug_irqs, enabled_irqs);
>
> - mtp_ddi_hpd_detection_setup(i915);
> - mtp_tc_hpd_detection_setup(i915);
> + mtp_ddi_hpd_detection_setup(display);
> + mtp_tc_hpd_detection_setup(display);
> }
>
> static bool is_xelpdp_pica_hpd_pin(enum hpd_pin hpd_pin)
> @@ -1112,7 +1099,7 @@ static bool is_xelpdp_pica_hpd_pin(enum hpd_pin
> hpd_pin)
> return hpd_pin >= HPD_PORT_TC1 && hpd_pin <= HPD_PORT_TC4;
> }
>
> -static void _xelpdp_pica_hpd_detection_setup(struct drm_i915_private *i915,
> +static void _xelpdp_pica_hpd_detection_setup(struct intel_display *display,
> enum hpd_pin hpd_pin, bool enable)
> {
> u32 mask = XELPDP_TBT_HOTPLUG_ENABLE |
> @@ -1121,18 +1108,18 @@ static void
> _xelpdp_pica_hpd_detection_setup(struct drm_i915_private *i915,
> if (!is_xelpdp_pica_hpd_pin(hpd_pin))
> return;
>
> - intel_de_rmw(i915, XELPDP_PORT_HOTPLUG_CTL(hpd_pin),
> + intel_de_rmw(display, XELPDP_PORT_HOTPLUG_CTL(hpd_pin),
> mask, enable ? mask : 0);
> }
>
> static void xelpdp_pica_hpd_enable_detection(struct intel_encoder *encoder)
> {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
>
> - _xelpdp_pica_hpd_detection_setup(i915, encoder->hpd_pin, true);
> + _xelpdp_pica_hpd_detection_setup(display, encoder->hpd_pin, true);
> }
>
> -static void xelpdp_pica_hpd_detection_setup(struct drm_i915_private *i915)
> +static void xelpdp_pica_hpd_detection_setup(struct intel_display *display)
> {
> struct intel_encoder *encoder;
> u32 available_pins = 0;
> @@ -1140,11 +1127,11 @@ static void xelpdp_pica_hpd_detection_setup(struct
> drm_i915_private *i915)
>
> BUILD_BUG_ON(BITS_PER_TYPE(available_pins) < HPD_NUM_PINS);
>
> - for_each_intel_encoder(&i915->drm, encoder)
> + for_each_intel_encoder(display->drm, encoder)
> available_pins |= BIT(encoder->hpd_pin);
>
> for_each_hpd_pin(pin)
> - _xelpdp_pica_hpd_detection_setup(i915, pin, available_pins &
> BIT(pin));
> + _xelpdp_pica_hpd_detection_setup(display, pin, available_pins &
> BIT(pin));
> }
>
> static void xelpdp_hpd_enable_detection(struct intel_encoder *encoder)
> @@ -1153,24 +1140,24 @@ static void xelpdp_hpd_enable_detection(struct
> intel_encoder *encoder)
> mtp_hpd_enable_detection(encoder);
> }
>
> -static void xelpdp_hpd_irq_setup(struct drm_i915_private *i915)
> +static void xelpdp_hpd_irq_setup(struct intel_display *display)
> {
> - struct intel_display *display = &i915->display;
> + struct drm_i915_private *i915 = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> - enabled_irqs = intel_hpd_enabled_irqs(i915, i915->display.hotplug.hpd);
> - hotplug_irqs = intel_hpd_hotplug_irqs(i915, i915->display.hotplug.hpd);
> + enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.hpd);
> + hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.hpd);
>
> - intel_de_rmw(i915, PICAINTERRUPT_IMR, hotplug_irqs,
> + intel_de_rmw(display, PICAINTERRUPT_IMR, hotplug_irqs,
> ~enabled_irqs & hotplug_irqs);
> intel_de_posting_read(display, PICAINTERRUPT_IMR);
>
> - xelpdp_pica_hpd_detection_setup(i915);
> + xelpdp_pica_hpd_detection_setup(display);
>
> if (INTEL_PCH_TYPE(i915) >= PCH_LNL)
> - xe2lpd_sde_hpd_irq_setup(i915);
> + xe2lpd_sde_hpd_irq_setup(display);
> else if (INTEL_PCH_TYPE(i915) >= PCH_MTL)
> - mtp_hpd_irq_setup(i915);
> + mtp_hpd_irq_setup(display);
> }
>
> static u32 spt_hotplug_mask(enum hpd_pin hpd_pin)
> @@ -1209,9 +1196,9 @@ static u32 spt_hotplug2_enables(struct intel_encoder
> *encoder)
> return spt_hotplug2_mask(encoder->hpd_pin);
> }
>
> -static void spt_hpd_detection_setup(struct drm_i915_private *dev_priv)
> +static void spt_hpd_detection_setup(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
>
> /* Display WA #1179 WaHardHangonHotPlug: cnp */
> if (HAS_PCH_CNP(dev_priv)) {
> @@ -1221,12 +1208,12 @@ static void spt_hpd_detection_setup(struct
> drm_i915_private *dev_priv)
>
> /* Enable digital hotplug on the PCH */
> intel_de_rmw(display, PCH_PORT_HOTPLUG,
> - intel_hpd_hotplug_mask(dev_priv, spt_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv, spt_hotplug_enables));
> + intel_hpd_hotplug_mask(display, spt_hotplug_mask),
> + intel_hpd_hotplug_enables(display, spt_hotplug_enables));
>
> intel_de_rmw(display, PCH_PORT_HOTPLUG2,
> - intel_hpd_hotplug_mask(dev_priv, spt_hotplug2_mask),
> - intel_hpd_hotplug_enables(dev_priv, spt_hotplug2_enables));
> + intel_hpd_hotplug_mask(display, spt_hotplug2_mask),
> + intel_hpd_hotplug_enables(display, spt_hotplug2_enables));
> }
>
> static void spt_hpd_enable_detection(struct intel_encoder *encoder)
> @@ -1250,20 +1237,20 @@ static void spt_hpd_enable_detection(struct
> intel_encoder *encoder)
> spt_hotplug2_enables(encoder));
> }
>
> -static void spt_hpd_irq_setup(struct drm_i915_private *dev_priv)
> +static void spt_hpd_irq_setup(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> if (INTEL_PCH_TYPE(dev_priv) >= PCH_CNP)
> intel_de_write(display, SHPD_FILTER_CNT,
> SHPD_FILTER_CNT_500_ADJ);
>
> - enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv-
> >display.hotplug.pch_hpd);
> - hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv-
> >display.hotplug.pch_hpd);
> + enabled_irqs = intel_hpd_enabled_irqs(display, display-
> >hotplug.pch_hpd);
> + hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
>
> ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
>
> - spt_hpd_detection_setup(dev_priv);
> + spt_hpd_detection_setup(display);
> }
>
> static u32 ilk_hotplug_mask(enum hpd_pin hpd_pin)
> @@ -1288,18 +1275,16 @@ static u32 ilk_hotplug_enables(struct intel_encoder
> *encoder)
> }
> }
>
> -static void ilk_hpd_detection_setup(struct drm_i915_private *dev_priv)
> +static void ilk_hpd_detection_setup(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> -
> /*
> * Enable digital hotplug on the CPU, and configure the DP short pulse
> * duration to 2ms (which is the minimum in the Display Port spec)
> * The pulse duration bits are reserved on HSW+.
> */
> intel_de_rmw(display, DIGITAL_PORT_HOTPLUG_CNTRL,
> - intel_hpd_hotplug_mask(dev_priv, ilk_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv, ilk_hotplug_enables));
> + intel_hpd_hotplug_mask(display, ilk_hotplug_mask),
> + intel_hpd_hotplug_enables(display, ilk_hotplug_enables));
> }
>
> static void ilk_hpd_enable_detection(struct intel_encoder *encoder)
> @@ -1313,21 +1298,22 @@ static void ilk_hpd_enable_detection(struct
> intel_encoder *encoder)
> ibx_hpd_enable_detection(encoder);
> }
>
> -static void ilk_hpd_irq_setup(struct drm_i915_private *dev_priv)
> +static void ilk_hpd_irq_setup(struct intel_display *display)
> {
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> - enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv-
> >display.hotplug.hpd);
> - hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv-
> >display.hotplug.hpd);
> + enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.hpd);
> + hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.hpd);
>
> - if (DISPLAY_VER(dev_priv) >= 8)
> + if (DISPLAY_VER(display) >= 8)
> bdw_update_port_irq(dev_priv, hotplug_irqs, enabled_irqs);
> else
> ilk_update_display_irq(dev_priv, hotplug_irqs, enabled_irqs);
>
> - ilk_hpd_detection_setup(dev_priv);
> + ilk_hpd_detection_setup(display);
>
> - ibx_hpd_irq_setup(dev_priv);
> + ibx_hpd_irq_setup(display);
> }
>
> static u32 bxt_hotplug_mask(enum hpd_pin hpd_pin)
> @@ -1369,13 +1355,11 @@ static u32 bxt_hotplug_enables(struct intel_encoder
> *encoder)
> }
> }
>
> -static void bxt_hpd_detection_setup(struct drm_i915_private *dev_priv)
> +static void bxt_hpd_detection_setup(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> -
> intel_de_rmw(display, PCH_PORT_HOTPLUG,
> - intel_hpd_hotplug_mask(dev_priv, bxt_hotplug_mask),
> - intel_hpd_hotplug_enables(dev_priv, bxt_hotplug_enables));
> + intel_hpd_hotplug_mask(display, bxt_hotplug_mask),
> + intel_hpd_hotplug_enables(display, bxt_hotplug_enables));
> }
>
> static void bxt_hpd_enable_detection(struct intel_encoder *encoder)
> @@ -1387,42 +1371,44 @@ static void bxt_hpd_enable_detection(struct
> intel_encoder *encoder)
> bxt_hotplug_enables(encoder));
> }
>
> -static void bxt_hpd_irq_setup(struct drm_i915_private *dev_priv)
> +static void bxt_hpd_irq_setup(struct intel_display *display)
> {
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> - enabled_irqs = intel_hpd_enabled_irqs(dev_priv, dev_priv-
> >display.hotplug.hpd);
> - hotplug_irqs = intel_hpd_hotplug_irqs(dev_priv, dev_priv-
> >display.hotplug.hpd);
> + enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.hpd);
> + hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.hpd);
>
> bdw_update_port_irq(dev_priv, hotplug_irqs, enabled_irqs);
>
> - bxt_hpd_detection_setup(dev_priv);
> + bxt_hpd_detection_setup(display);
> }
>
> -static void g45_hpd_peg_band_gap_wa(struct drm_i915_private *i915)
> +static void g45_hpd_peg_band_gap_wa(struct intel_display *display)
> {
> /*
> * For G4X desktop chip, PEG_BAND_GAP_DATA 3:0 must first be written
> * 0xd. Failure to do so will result in spurious interrupts being
> * generated on the port when a cable is not attached.
> */
> - intel_de_rmw(i915, PEG_BAND_GAP_DATA, 0xf, 0xd);
> + intel_de_rmw(display, PEG_BAND_GAP_DATA, 0xf, 0xd);
> }
>
> static void i915_hpd_enable_detection(struct intel_encoder *encoder)
> {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
> u32 hotplug_en = hpd_mask_i915[encoder->hpd_pin];
>
> - if (IS_G45(i915))
> - g45_hpd_peg_band_gap_wa(i915);
> + if (display->platform.g45)
> + g45_hpd_peg_band_gap_wa(display);
>
> /* HPD sense and interrupt enable are one and the same */
> - i915_hotplug_interrupt_update(i915, hotplug_en, hotplug_en);
> + i915_hotplug_interrupt_update(display, hotplug_en, hotplug_en);
> }
>
> -static void i915_hpd_irq_setup(struct drm_i915_private *dev_priv)
> +static void i915_hpd_irq_setup(struct intel_display *display)
> {
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 hotplug_en;
>
> lockdep_assert_held(&dev_priv->irq_lock);
> @@ -1431,20 +1417,20 @@ static void i915_hpd_irq_setup(struct
> drm_i915_private *dev_priv)
> * Note HDMI and DP share hotplug bits. Enable bits are the same for all
> * generations.
> */
> - hotplug_en = intel_hpd_enabled_irqs(dev_priv, hpd_mask_i915);
> + hotplug_en = intel_hpd_enabled_irqs(display, hpd_mask_i915);
> /*
> * Programming the CRT detection parameters tends to generate a
> spurious
> * hotplug event about three seconds later. So just do it once.
> */
> - if (IS_G4X(dev_priv))
> + if (display->platform.g4x)
> hotplug_en |= CRT_HOTPLUG_ACTIVATION_PERIOD_64;
> hotplug_en |= CRT_HOTPLUG_VOLTAGE_COMPARE_50;
>
> - if (IS_G45(dev_priv))
> - g45_hpd_peg_band_gap_wa(dev_priv);
> + if (display->platform.g45)
> + g45_hpd_peg_band_gap_wa(display);
>
> /* Ignore TV since it's buggy */
> - i915_hotplug_interrupt_update_locked(dev_priv,
> + i915_hotplug_interrupt_update_locked(display,
> HOTPLUG_INT_EN_MASK |
>
> CRT_HOTPLUG_VOLTAGE_COMPARE_MASK |
>
> CRT_HOTPLUG_ACTIVATION_PERIOD_64,
> @@ -1453,7 +1439,7 @@ static void i915_hpd_irq_setup(struct
> drm_i915_private *dev_priv)
>
> struct intel_hotplug_funcs {
> /* Enable HPD sense and interrupts for all present encoders */
> - void (*hpd_irq_setup)(struct drm_i915_private *i915);
> + void (*hpd_irq_setup)(struct intel_display *display);
> /* Enable HPD sense for a single encoder */
> void (*hpd_enable_detection)(struct intel_encoder *encoder);
> };
> @@ -1476,49 +1462,49 @@ HPD_FUNCS(ilk);
>
> void intel_hpd_enable_detection(struct intel_encoder *encoder)
> {
> - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct intel_display *display = to_intel_display(encoder);
>
> - if (i915->display.funcs.hotplug)
> - i915->display.funcs.hotplug->hpd_enable_detection(encoder);
> + if (display->funcs.hotplug)
> + display->funcs.hotplug->hpd_enable_detection(encoder);
> }
>
> -void intel_hpd_irq_setup(struct drm_i915_private *i915)
> +void intel_hpd_irq_setup(struct intel_display *display)
> {
> - if ((IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) &&
> - !i915->display.irq.vlv_display_irqs_enabled)
> + if ((display->platform.valleyview || display->platform.cherryview) &&
> + !display->irq.vlv_display_irqs_enabled)
> return;
>
> - if (i915->display.funcs.hotplug)
> - i915->display.funcs.hotplug->hpd_irq_setup(i915);
> + if (display->funcs.hotplug)
> + display->funcs.hotplug->hpd_irq_setup(display);
> }
>
> -void intel_hotplug_irq_init(struct drm_i915_private *i915)
> +void intel_hotplug_irq_init(struct intel_display *display)
> {
> - struct intel_display *display = &i915->display;
> + struct drm_i915_private *i915 = to_i915(display->drm);
>
> - intel_hpd_init_pins(i915);
> + intel_hpd_init_pins(display);
>
> intel_hpd_init_early(display);
>
> - if (HAS_GMCH(i915)) {
> - if (I915_HAS_HOTPLUG(i915))
> - i915->display.funcs.hotplug = &i915_hpd_funcs;
> + if (HAS_GMCH(display)) {
> + if (I915_HAS_HOTPLUG(display))
> + display->funcs.hotplug = &i915_hpd_funcs;
> } else {
> if (HAS_PCH_DG2(i915))
> - i915->display.funcs.hotplug = &icp_hpd_funcs;
> + display->funcs.hotplug = &icp_hpd_funcs;
> else if (HAS_PCH_DG1(i915))
> - i915->display.funcs.hotplug = &dg1_hpd_funcs;
> - else if (DISPLAY_VER(i915) >= 14)
> - i915->display.funcs.hotplug = &xelpdp_hpd_funcs;
> - else if (DISPLAY_VER(i915) >= 11)
> - i915->display.funcs.hotplug = &gen11_hpd_funcs;
> - else if (IS_GEMINILAKE(i915) || IS_BROXTON(i915))
> - i915->display.funcs.hotplug = &bxt_hpd_funcs;
> + display->funcs.hotplug = &dg1_hpd_funcs;
> + else if (DISPLAY_VER(display) >= 14)
> + display->funcs.hotplug = &xelpdp_hpd_funcs;
> + else if (DISPLAY_VER(display) >= 11)
> + display->funcs.hotplug = &gen11_hpd_funcs;
> + else if (display->platform.geminilake || display-
> >platform.broxton)
> + display->funcs.hotplug = &bxt_hpd_funcs;
> else if (INTEL_PCH_TYPE(i915) >= PCH_ICP)
> - i915->display.funcs.hotplug = &icp_hpd_funcs;
> + display->funcs.hotplug = &icp_hpd_funcs;
> else if (INTEL_PCH_TYPE(i915) >= PCH_SPT)
> - i915->display.funcs.hotplug = &spt_hpd_funcs;
> + display->funcs.hotplug = &spt_hpd_funcs;
> else
> - i915->display.funcs.hotplug = &ilk_hpd_funcs;
> + display->funcs.hotplug = &ilk_hpd_funcs;
> }
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.h
> b/drivers/gpu/drm/i915/display/intel_hotplug_irq.h
> index e4db752df096..9063bb02a2e9 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.h
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.h
> @@ -8,28 +8,28 @@
>
> #include <linux/types.h>
>
> -struct drm_i915_private;
> +struct intel_display;
> struct intel_encoder;
>
> -u32 i9xx_hpd_irq_ack(struct drm_i915_private *i915);
> +u32 i9xx_hpd_irq_ack(struct intel_display *display);
>
> -void i9xx_hpd_irq_handler(struct drm_i915_private *i915, u32 hotplug_status);
> -void ibx_hpd_irq_handler(struct drm_i915_private *i915, u32 hotplug_trigger);
> -void ilk_hpd_irq_handler(struct drm_i915_private *i915, u32 hotplug_trigger);
> -void gen11_hpd_irq_handler(struct drm_i915_private *i915, u32 iir);
> -void bxt_hpd_irq_handler(struct drm_i915_private *i915, u32 hotplug_trigger);
> -void xelpdp_pica_irq_handler(struct drm_i915_private *i915, u32 iir);
> -void icp_irq_handler(struct drm_i915_private *i915, u32 pch_iir);
> -void spt_irq_handler(struct drm_i915_private *i915, u32 pch_iir);
> +void i9xx_hpd_irq_handler(struct intel_display *display, u32 hotplug_status);
> +void ibx_hpd_irq_handler(struct intel_display *display, u32 hotplug_trigger);
> +void ilk_hpd_irq_handler(struct intel_display *display, u32 hotplug_trigger);
> +void gen11_hpd_irq_handler(struct intel_display *display, u32 iir);
> +void bxt_hpd_irq_handler(struct intel_display *display, u32 hotplug_trigger);
> +void xelpdp_pica_irq_handler(struct intel_display *display, u32 iir);
> +void icp_irq_handler(struct intel_display *display, u32 pch_iir);
> +void spt_irq_handler(struct intel_display *display, u32 pch_iir);
>
> -void i915_hotplug_interrupt_update_locked(struct drm_i915_private *i915,
> +void i915_hotplug_interrupt_update_locked(struct intel_display *display,
> u32 mask, u32 bits);
> -void i915_hotplug_interrupt_update(struct drm_i915_private *i915,
> +void i915_hotplug_interrupt_update(struct intel_display *display,
> u32 mask, u32 bits);
>
> void intel_hpd_enable_detection(struct intel_encoder *encoder);
> -void intel_hpd_irq_setup(struct drm_i915_private *i915);
> +void intel_hpd_irq_setup(struct intel_display *display);
>
> -void intel_hotplug_irq_init(struct drm_i915_private *i915);
> +void intel_hotplug_irq_init(struct intel_display *display);
>
> #endif /* __INTEL_HOTPLUG_IRQ_H__ */
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index de53615571be..3b05eb3f9cbc 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -277,7 +277,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void
> *arg)
> intel_uncore_write(&dev_priv->uncore, GEN6_PMIIR,
> pm_iir);
>
> if (iir & I915_DISPLAY_PORT_INTERRUPT)
> - hotplug_status = i9xx_hpd_irq_ack(dev_priv);
> + hotplug_status = i9xx_hpd_irq_ack(display);
>
> if (iir & I915_MASTER_ERROR_INTERRUPT)
> vlv_display_error_irq_ack(display, &eir, &dpinvgtt);
> @@ -306,7 +306,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void
> *arg)
> gen6_rps_irq_handler(&to_gt(dev_priv)->rps, pm_iir);
>
> if (hotplug_status)
> - i9xx_hpd_irq_handler(dev_priv, hotplug_status);
> + i9xx_hpd_irq_handler(display, hotplug_status);
>
> if (iir & I915_MASTER_ERROR_INTERRUPT)
> vlv_display_error_irq_handler(display, eir, dpinvgtt);
> @@ -367,7 +367,7 @@ static irqreturn_t cherryview_irq_handler(int irq, void
> *arg)
> gen8_gt_irq_handler(to_gt(dev_priv), master_ctl);
>
> if (iir & I915_DISPLAY_PORT_INTERRUPT)
> - hotplug_status = i9xx_hpd_irq_ack(dev_priv);
> + hotplug_status = i9xx_hpd_irq_ack(display);
>
> if (iir & I915_MASTER_ERROR_INTERRUPT)
> vlv_display_error_irq_ack(display, &eir, &dpinvgtt);
> @@ -392,7 +392,7 @@ static irqreturn_t cherryview_irq_handler(int irq, void
> *arg)
> intel_uncore_write(&dev_priv->uncore, GEN8_MASTER_IRQ,
> GEN8_MASTER_IRQ_CONTROL);
>
> if (hotplug_status)
> - i9xx_hpd_irq_handler(dev_priv, hotplug_status);
> + i9xx_hpd_irq_handler(display, hotplug_status);
>
> if (iir & I915_MASTER_ERROR_INTERRUPT)
> vlv_display_error_irq_handler(display, eir, dpinvgtt);
> @@ -952,6 +952,7 @@ static void i915_irq_postinstall(struct drm_i915_private
> *dev_priv)
> static irqreturn_t i915_irq_handler(int irq, void *arg)
> {
> struct drm_i915_private *dev_priv = arg;
> + struct intel_display *display = &dev_priv->display;
> irqreturn_t ret = IRQ_NONE;
>
> if (!intel_irqs_enabled(dev_priv))
> @@ -974,7 +975,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
>
> if (I915_HAS_HOTPLUG(dev_priv) &&
> iir & I915_DISPLAY_PORT_INTERRUPT)
> - hotplug_status = i9xx_hpd_irq_ack(dev_priv);
> + hotplug_status = i9xx_hpd_irq_ack(display);
>
> /* Call regardless, as some status bits might not be
> * signalled in IIR */
> @@ -992,7 +993,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
> i9xx_error_irq_handler(dev_priv, eir, eir_stuck);
>
> if (hotplug_status)
> - i9xx_hpd_irq_handler(dev_priv, hotplug_status);
> + i9xx_hpd_irq_handler(display, hotplug_status);
>
> i915_pipestat_irq_handler(dev_priv, iir, pipe_stats);
> } while (0);
> @@ -1075,6 +1076,7 @@ static void i965_irq_postinstall(struct
> drm_i915_private *dev_priv)
> static irqreturn_t i965_irq_handler(int irq, void *arg)
> {
> struct drm_i915_private *dev_priv = arg;
> + struct intel_display *display = &dev_priv->display;
> irqreturn_t ret = IRQ_NONE;
>
> if (!intel_irqs_enabled(dev_priv))
> @@ -1096,7 +1098,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
> ret = IRQ_HANDLED;
>
> if (iir & I915_DISPLAY_PORT_INTERRUPT)
> - hotplug_status = i9xx_hpd_irq_ack(dev_priv);
> + hotplug_status = i9xx_hpd_irq_ack(display);
>
> /* Call regardless, as some status bits might not be
> * signalled in IIR */
> @@ -1119,7 +1121,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
> i9xx_error_irq_handler(dev_priv, eir, eir_stuck);
>
> if (hotplug_status)
> - i9xx_hpd_irq_handler(dev_priv, hotplug_status);
> + i9xx_hpd_irq_handler(display, hotplug_status);
>
> i965_pipestat_irq_handler(dev_priv, iir, pipe_stats);
> } while (0);
> --
> 2.39.5
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 7/9] drm/i915/irq: convert intel_display_irq.[ch] interfaces to struct intel_display
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (5 preceding siblings ...)
2025-03-11 18:00 ` [PATCH 6/9] drm/i915/hotplug: convert intel_hotplug_irq.[ch] to struct intel_display Jani Nikula
@ 2025-03-11 18:00 ` Jani Nikula
2025-03-11 19:15 ` Ville Syrjälä
2025-03-12 5:47 ` Shankar, Uma
2025-03-11 18:00 ` [PATCH 8/9] drm/i915/irq: convert rest of intel_display_irq.[ch] " Jani Nikula
` (10 subsequent siblings)
17 siblings, 2 replies; 31+ messages in thread
From: Jani Nikula @ 2025-03-11 18:00 UTC (permalink / raw)
To: intel-gfx, intel-xe; +Cc: jani.nikula
Going forward, struct intel_display is the main display device data
pointer. Convert the external interfaces of intel_display_irq.[ch] to
struct intel_display.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/i9xx_plane.c | 24 ++-
.../drm/i915/display/intel_display_driver.c | 2 +-
.../gpu/drm/i915/display/intel_display_irq.c | 204 +++++++++---------
.../gpu/drm/i915/display/intel_display_irq.h | 75 ++++---
.../i915/display/intel_display_power_well.c | 12 +-
.../drm/i915/display/intel_fifo_underrun.c | 27 +--
.../gpu/drm/i915/display/intel_hotplug_irq.c | 22 +-
drivers/gpu/drm/i915/display/intel_pipe_crc.c | 3 +-
drivers/gpu/drm/i915/display/intel_tv.c | 4 +-
.../drm/i915/display/skl_universal_plane.c | 6 +-
drivers/gpu/drm/i915/gt/intel_rps.c | 6 +-
drivers/gpu/drm/i915/i915_irq.c | 98 +++++----
drivers/gpu/drm/xe/display/xe_display.c | 12 +-
13 files changed, 263 insertions(+), 232 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
index 013295f66d56..5e8344fdfc28 100644
--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
@@ -630,84 +630,92 @@ vlv_primary_async_flip(struct intel_dsb *dsb,
static void
bdw_primary_enable_flip_done(struct intel_plane *plane)
{
+ struct intel_display *display = to_intel_display(plane);
struct drm_i915_private *i915 = to_i915(plane->base.dev);
enum pipe pipe = plane->pipe;
spin_lock_irq(&i915->irq_lock);
- bdw_enable_pipe_irq(i915, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);
+ bdw_enable_pipe_irq(display, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);
spin_unlock_irq(&i915->irq_lock);
}
static void
bdw_primary_disable_flip_done(struct intel_plane *plane)
{
+ struct intel_display *display = to_intel_display(plane);
struct drm_i915_private *i915 = to_i915(plane->base.dev);
enum pipe pipe = plane->pipe;
spin_lock_irq(&i915->irq_lock);
- bdw_disable_pipe_irq(i915, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);
+ bdw_disable_pipe_irq(display, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);
spin_unlock_irq(&i915->irq_lock);
}
static void
ivb_primary_enable_flip_done(struct intel_plane *plane)
{
+ struct intel_display *display = to_intel_display(plane);
struct drm_i915_private *i915 = to_i915(plane->base.dev);
spin_lock_irq(&i915->irq_lock);
- ilk_enable_display_irq(i915, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));
+ ilk_enable_display_irq(display, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));
spin_unlock_irq(&i915->irq_lock);
}
static void
ivb_primary_disable_flip_done(struct intel_plane *plane)
{
+ struct intel_display *display = to_intel_display(plane);
struct drm_i915_private *i915 = to_i915(plane->base.dev);
spin_lock_irq(&i915->irq_lock);
- ilk_disable_display_irq(i915, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));
+ ilk_disable_display_irq(display, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));
spin_unlock_irq(&i915->irq_lock);
}
static void
ilk_primary_enable_flip_done(struct intel_plane *plane)
{
+ struct intel_display *display = to_intel_display(plane);
struct drm_i915_private *i915 = to_i915(plane->base.dev);
spin_lock_irq(&i915->irq_lock);
- ilk_enable_display_irq(i915, DE_PLANE_FLIP_DONE(plane->i9xx_plane));
+ ilk_enable_display_irq(display, DE_PLANE_FLIP_DONE(plane->i9xx_plane));
spin_unlock_irq(&i915->irq_lock);
}
static void
ilk_primary_disable_flip_done(struct intel_plane *plane)
{
+ struct intel_display *display = to_intel_display(plane);
struct drm_i915_private *i915 = to_i915(plane->base.dev);
spin_lock_irq(&i915->irq_lock);
- ilk_disable_display_irq(i915, DE_PLANE_FLIP_DONE(plane->i9xx_plane));
+ ilk_disable_display_irq(display, DE_PLANE_FLIP_DONE(plane->i9xx_plane));
spin_unlock_irq(&i915->irq_lock);
}
static void
vlv_primary_enable_flip_done(struct intel_plane *plane)
{
+ struct intel_display *display = to_intel_display(plane);
struct drm_i915_private *i915 = to_i915(plane->base.dev);
enum pipe pipe = plane->pipe;
spin_lock_irq(&i915->irq_lock);
- i915_enable_pipestat(i915, pipe, PLANE_FLIP_DONE_INT_STATUS_VLV);
+ i915_enable_pipestat(display, pipe, PLANE_FLIP_DONE_INT_STATUS_VLV);
spin_unlock_irq(&i915->irq_lock);
}
static void
vlv_primary_disable_flip_done(struct intel_plane *plane)
{
+ struct intel_display *display = to_intel_display(plane);
struct drm_i915_private *i915 = to_i915(plane->base.dev);
enum pipe pipe = plane->pipe;
spin_lock_irq(&i915->irq_lock);
- i915_disable_pipestat(i915, pipe, PLANE_FLIP_DONE_INT_STATUS_VLV);
+ i915_disable_pipestat(display, pipe, PLANE_FLIP_DONE_INT_STATUS_VLV);
spin_unlock_irq(&i915->irq_lock);
}
diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index ae60ccb21520..f76a3a9d66b4 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -193,7 +193,7 @@ void intel_display_driver_early_probe(struct intel_display *display)
mutex_init(&display->pps.mutex);
mutex_init(&display->hdcp.hdcp_mutex);
- intel_display_irq_init(i915);
+ intel_display_irq_init(display);
intel_dkl_phy_init(display);
intel_color_init_hooks(display);
intel_init_cdclk_hooks(display);
diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
index b37bcb8fb2e8..68f903c35978 100644
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -125,14 +125,14 @@ intel_handle_vblank(struct drm_i915_private *dev_priv, enum pipe pipe)
/**
* ilk_update_display_irq - update DEIMR
- * @dev_priv: driver private
+ * @display: display device
* @interrupt_mask: mask of interrupt bits to update
* @enabled_irq_mask: mask of interrupt bits to enable
*/
-void ilk_update_display_irq(struct drm_i915_private *dev_priv,
+void ilk_update_display_irq(struct intel_display *display,
u32 interrupt_mask, u32 enabled_irq_mask)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 new_val;
lockdep_assert_held(&dev_priv->irq_lock);
@@ -150,26 +150,26 @@ void ilk_update_display_irq(struct drm_i915_private *dev_priv,
}
}
-void ilk_enable_display_irq(struct drm_i915_private *i915, u32 bits)
+void ilk_enable_display_irq(struct intel_display *display, u32 bits)
{
- ilk_update_display_irq(i915, bits, bits);
+ ilk_update_display_irq(display, bits, bits);
}
-void ilk_disable_display_irq(struct drm_i915_private *i915, u32 bits)
+void ilk_disable_display_irq(struct intel_display *display, u32 bits)
{
- ilk_update_display_irq(i915, bits, 0);
+ ilk_update_display_irq(display, bits, 0);
}
/**
* bdw_update_port_irq - update DE port interrupt
- * @dev_priv: driver private
+ * @display: display device
* @interrupt_mask: mask of interrupt bits to update
* @enabled_irq_mask: mask of interrupt bits to enable
*/
-void bdw_update_port_irq(struct drm_i915_private *dev_priv,
+void bdw_update_port_irq(struct intel_display *display,
u32 interrupt_mask, u32 enabled_irq_mask)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 new_val;
u32 old_val;
@@ -194,16 +194,16 @@ void bdw_update_port_irq(struct drm_i915_private *dev_priv,
/**
* bdw_update_pipe_irq - update DE pipe interrupt
- * @dev_priv: driver private
+ * @display: display device
* @pipe: pipe whose interrupt to update
* @interrupt_mask: mask of interrupt bits to update
* @enabled_irq_mask: mask of interrupt bits to enable
*/
-static void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,
+static void bdw_update_pipe_irq(struct intel_display *display,
enum pipe pipe, u32 interrupt_mask,
u32 enabled_irq_mask)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 new_val;
lockdep_assert_held(&dev_priv->irq_lock);
@@ -224,29 +224,29 @@ static void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,
}
}
-void bdw_enable_pipe_irq(struct drm_i915_private *i915,
+void bdw_enable_pipe_irq(struct intel_display *display,
enum pipe pipe, u32 bits)
{
- bdw_update_pipe_irq(i915, pipe, bits, bits);
+ bdw_update_pipe_irq(display, pipe, bits, bits);
}
-void bdw_disable_pipe_irq(struct drm_i915_private *i915,
+void bdw_disable_pipe_irq(struct intel_display *display,
enum pipe pipe, u32 bits)
{
- bdw_update_pipe_irq(i915, pipe, bits, 0);
+ bdw_update_pipe_irq(display, pipe, bits, 0);
}
/**
* ibx_display_interrupt_update - update SDEIMR
- * @dev_priv: driver private
+ * @display: display device
* @interrupt_mask: mask of interrupt bits to update
* @enabled_irq_mask: mask of interrupt bits to enable
*/
-void ibx_display_interrupt_update(struct drm_i915_private *dev_priv,
+void ibx_display_interrupt_update(struct intel_display *display,
u32 interrupt_mask,
u32 enabled_irq_mask)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 sdeimr = intel_de_read(display, SDEIMR);
sdeimr &= ~interrupt_mask;
@@ -263,14 +263,14 @@ void ibx_display_interrupt_update(struct drm_i915_private *dev_priv,
intel_de_posting_read(display, SDEIMR);
}
-void ibx_enable_display_interrupt(struct drm_i915_private *i915, u32 bits)
+void ibx_enable_display_interrupt(struct intel_display *display, u32 bits)
{
- ibx_display_interrupt_update(i915, bits, bits);
+ ibx_display_interrupt_update(display, bits, bits);
}
-void ibx_disable_display_interrupt(struct drm_i915_private *i915, u32 bits)
+void ibx_disable_display_interrupt(struct intel_display *display, u32 bits)
{
- ibx_display_interrupt_update(i915, bits, 0);
+ ibx_display_interrupt_update(display, bits, 0);
}
u32 i915_pipestat_enable_mask(struct intel_display *display,
@@ -318,10 +318,10 @@ u32 i915_pipestat_enable_mask(struct intel_display *display,
return enable_mask;
}
-void i915_enable_pipestat(struct drm_i915_private *dev_priv,
+void i915_enable_pipestat(struct intel_display *display,
enum pipe pipe, u32 status_mask)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
i915_reg_t reg = PIPESTAT(dev_priv, pipe);
u32 enable_mask;
@@ -342,10 +342,10 @@ void i915_enable_pipestat(struct drm_i915_private *dev_priv,
intel_de_posting_read(display, reg);
}
-void i915_disable_pipestat(struct drm_i915_private *dev_priv,
+void i915_disable_pipestat(struct intel_display *display,
enum pipe pipe, u32 status_mask)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
i915_reg_t reg = PIPESTAT(dev_priv, pipe);
u32 enable_mask;
@@ -381,11 +381,11 @@ static bool i915_has_legacy_blc_interrupt(struct intel_display *display)
/**
* i915_enable_asle_pipestat - enable ASLE pipestat for OpRegion
- * @dev_priv: i915 device private
+ * @display: display device
*/
-void i915_enable_asle_pipestat(struct drm_i915_private *dev_priv)
+void i915_enable_asle_pipestat(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
if (!intel_opregion_asle_present(display))
return;
@@ -395,9 +395,9 @@ void i915_enable_asle_pipestat(struct drm_i915_private *dev_priv)
spin_lock_irq(&dev_priv->irq_lock);
- i915_enable_pipestat(dev_priv, PIPE_B, PIPE_LEGACY_BLC_EVENT_STATUS);
+ i915_enable_pipestat(display, PIPE_B, PIPE_LEGACY_BLC_EVENT_STATUS);
if (DISPLAY_VER(dev_priv) >= 4)
- i915_enable_pipestat(dev_priv, PIPE_A,
+ i915_enable_pipestat(display, PIPE_A,
PIPE_LEGACY_BLC_EVENT_STATUS);
spin_unlock_irq(&dev_priv->irq_lock);
@@ -524,10 +524,10 @@ static void i9xx_pipestat_irq_reset(struct drm_i915_private *dev_priv)
}
}
-void i9xx_pipestat_irq_ack(struct drm_i915_private *dev_priv,
+void i9xx_pipestat_irq_ack(struct intel_display *display,
u32 iir, u32 pipe_stats[I915_MAX_PIPES])
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
enum pipe pipe;
spin_lock(&dev_priv->irq_lock);
@@ -592,10 +592,10 @@ void i9xx_pipestat_irq_ack(struct drm_i915_private *dev_priv,
spin_unlock(&dev_priv->irq_lock);
}
-void i915_pipestat_irq_handler(struct drm_i915_private *dev_priv,
+void i915_pipestat_irq_handler(struct intel_display *display,
u32 iir, u32 pipe_stats[I915_MAX_PIPES])
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
bool blc_event = false;
enum pipe pipe;
@@ -617,10 +617,10 @@ void i915_pipestat_irq_handler(struct drm_i915_private *dev_priv,
intel_opregion_asle_intr(display);
}
-void i965_pipestat_irq_handler(struct drm_i915_private *dev_priv,
+void i965_pipestat_irq_handler(struct intel_display *display,
u32 iir, u32 pipe_stats[I915_MAX_PIPES])
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
bool blc_event = false;
enum pipe pipe;
@@ -645,10 +645,10 @@ void i965_pipestat_irq_handler(struct drm_i915_private *dev_priv,
intel_gmbus_irq_handler(display);
}
-void valleyview_pipestat_irq_handler(struct drm_i915_private *dev_priv,
+void valleyview_pipestat_irq_handler(struct intel_display *display,
u32 pipe_stats[I915_MAX_PIPES])
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
enum pipe pipe;
for_each_pipe(dev_priv, pipe) {
@@ -894,9 +894,9 @@ static void ilk_gtt_fault_irq_handler(struct intel_display *display)
}
}
-void ilk_display_irq_handler(struct drm_i915_private *dev_priv, u32 de_iir)
+void ilk_display_irq_handler(struct intel_display *display, u32 de_iir)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
enum pipe pipe;
u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG;
@@ -946,9 +946,9 @@ void ilk_display_irq_handler(struct drm_i915_private *dev_priv, u32 de_iir)
gen5_rps_irq_handler(&to_gt(dev_priv)->rps);
}
-void ivb_display_irq_handler(struct drm_i915_private *dev_priv, u32 de_iir)
+void ivb_display_irq_handler(struct intel_display *display, u32 de_iir)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
enum pipe pipe;
u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG_IVB;
@@ -1359,9 +1359,9 @@ static void gen8_read_and_ack_pch_irqs(struct drm_i915_private *i915, u32 *pch_i
intel_de_write(display, PICAINTERRUPT_IER, pica_ier);
}
-void gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
+void gen8_de_irq_handler(struct intel_display *display, u32 master_ctl)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 iir;
enum pipe pipe;
@@ -1517,9 +1517,8 @@ void gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
}
}
-u32 gen11_gu_misc_irq_ack(struct drm_i915_private *i915, const u32 master_ctl)
+u32 gen11_gu_misc_irq_ack(struct intel_display *display, const u32 master_ctl)
{
- struct intel_display *display = &i915->display;
u32 iir;
if (!(master_ctl & GEN11_GU_MISC_IRQ))
@@ -1532,17 +1531,15 @@ u32 gen11_gu_misc_irq_ack(struct drm_i915_private *i915, const u32 master_ctl)
return iir;
}
-void gen11_gu_misc_irq_handler(struct drm_i915_private *i915, const u32 iir)
+void gen11_gu_misc_irq_handler(struct intel_display *display, const u32 iir)
{
- struct intel_display *display = &i915->display;
-
if (iir & GEN11_GU_MISC_GSE)
intel_opregion_asle_intr(display);
}
-void gen11_display_irq_handler(struct drm_i915_private *i915)
+void gen11_display_irq_handler(struct intel_display *display)
{
- struct intel_display *display = &i915->display;
+ struct drm_i915_private *i915 = to_i915(display->drm);
u32 disp_ctl;
disable_rpm_wakeref_asserts(&i915->runtime_pm);
@@ -1553,7 +1550,7 @@ void gen11_display_irq_handler(struct drm_i915_private *i915)
disp_ctl = intel_de_read(display, GEN11_DISPLAY_INT_CTL);
intel_de_write(display, GEN11_DISPLAY_INT_CTL, 0);
- gen8_de_irq_handler(i915, disp_ctl);
+ gen8_de_irq_handler(display, disp_ctl);
intel_de_write(display, GEN11_DISPLAY_INT_CTL, GEN11_DISPLAY_IRQ_ENABLE);
enable_rpm_wakeref_asserts(&i915->runtime_pm);
@@ -1585,8 +1582,10 @@ static void i915gm_irq_cstate_wa_disable(struct drm_i915_private *i915)
_MASKED_BIT_DISABLE(CSTATE_RENDER_CLOCK_GATE_DISABLE));
}
-void i915gm_irq_cstate_wa(struct drm_i915_private *i915, bool enable)
+void i915gm_irq_cstate_wa(struct intel_display *display, bool enable)
{
+ struct drm_i915_private *i915 = to_i915(display->drm);
+
spin_lock_irq(&i915->drm.vblank_time_lock);
if (enable)
@@ -1599,12 +1598,13 @@ void i915gm_irq_cstate_wa(struct drm_i915_private *i915, bool enable)
int i8xx_enable_vblank(struct drm_crtc *crtc)
{
+ struct intel_display *display = to_intel_display(crtc->dev);
struct drm_i915_private *dev_priv = to_i915(crtc->dev);
enum pipe pipe = to_intel_crtc(crtc)->pipe;
unsigned long irqflags;
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
- i915_enable_pipestat(dev_priv, pipe, PIPE_VBLANK_INTERRUPT_STATUS);
+ i915_enable_pipestat(display, pipe, PIPE_VBLANK_INTERRUPT_STATUS);
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
return 0;
@@ -1612,12 +1612,13 @@ int i8xx_enable_vblank(struct drm_crtc *crtc)
void i8xx_disable_vblank(struct drm_crtc *crtc)
{
+ struct intel_display *display = to_intel_display(crtc->dev);
struct drm_i915_private *dev_priv = to_i915(crtc->dev);
enum pipe pipe = to_intel_crtc(crtc)->pipe;
unsigned long irqflags;
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
- i915_disable_pipestat(dev_priv, pipe, PIPE_VBLANK_INTERRUPT_STATUS);
+ i915_disable_pipestat(display, pipe, PIPE_VBLANK_INTERRUPT_STATUS);
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
}
@@ -1641,12 +1642,13 @@ void i915gm_disable_vblank(struct drm_crtc *crtc)
int i965_enable_vblank(struct drm_crtc *crtc)
{
+ struct intel_display *display = to_intel_display(crtc->dev);
struct drm_i915_private *dev_priv = to_i915(crtc->dev);
enum pipe pipe = to_intel_crtc(crtc)->pipe;
unsigned long irqflags;
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
- i915_enable_pipestat(dev_priv, pipe,
+ i915_enable_pipestat(display, pipe,
PIPE_START_VBLANK_INTERRUPT_STATUS);
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
@@ -1655,18 +1657,20 @@ int i965_enable_vblank(struct drm_crtc *crtc)
void i965_disable_vblank(struct drm_crtc *crtc)
{
+ struct intel_display *display = to_intel_display(crtc->dev);
struct drm_i915_private *dev_priv = to_i915(crtc->dev);
enum pipe pipe = to_intel_crtc(crtc)->pipe;
unsigned long irqflags;
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
- i915_disable_pipestat(dev_priv, pipe,
+ i915_disable_pipestat(display, pipe,
PIPE_START_VBLANK_INTERRUPT_STATUS);
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
}
int ilk_enable_vblank(struct drm_crtc *crtc)
{
+ struct intel_display *display = to_intel_display(crtc->dev);
struct drm_i915_private *dev_priv = to_i915(crtc->dev);
enum pipe pipe = to_intel_crtc(crtc)->pipe;
unsigned long irqflags;
@@ -1674,7 +1678,7 @@ int ilk_enable_vblank(struct drm_crtc *crtc)
DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe);
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
- ilk_enable_display_irq(dev_priv, bit);
+ ilk_enable_display_irq(display, bit);
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
/* Even though there is no DMC, frame counter can get stuck when
@@ -1688,6 +1692,7 @@ int ilk_enable_vblank(struct drm_crtc *crtc)
void ilk_disable_vblank(struct drm_crtc *crtc)
{
+ struct intel_display *display = to_intel_display(crtc->dev);
struct drm_i915_private *dev_priv = to_i915(crtc->dev);
enum pipe pipe = to_intel_crtc(crtc)->pipe;
unsigned long irqflags;
@@ -1695,7 +1700,7 @@ void ilk_disable_vblank(struct drm_crtc *crtc)
DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe);
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
- ilk_disable_display_irq(dev_priv, bit);
+ ilk_disable_display_irq(display, bit);
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
}
@@ -1753,7 +1758,7 @@ int bdw_enable_vblank(struct drm_crtc *_crtc)
schedule_work(&display->irq.vblank_dc_work);
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
- bdw_enable_pipe_irq(dev_priv, pipe, GEN8_PIPE_VBLANK);
+ bdw_enable_pipe_irq(display, pipe, GEN8_PIPE_VBLANK);
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
/* Even if there is no DMC, frame counter can get stuck when
@@ -1777,7 +1782,7 @@ void bdw_disable_vblank(struct drm_crtc *_crtc)
return;
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
- bdw_disable_pipe_irq(dev_priv, pipe, GEN8_PIPE_VBLANK);
+ bdw_disable_pipe_irq(display, pipe, GEN8_PIPE_VBLANK);
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
if (crtc->block_dc_for_vblank && --display->irq.vblank_wa_num_pipes == 0)
@@ -1913,15 +1918,17 @@ static void _vlv_display_irq_reset(struct drm_i915_private *dev_priv)
dev_priv->irq_mask = ~0u;
}
-void vlv_display_irq_reset(struct drm_i915_private *dev_priv)
+void vlv_display_irq_reset(struct intel_display *display)
{
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
+
if (dev_priv->display.irq.vlv_display_irqs_enabled)
_vlv_display_irq_reset(dev_priv);
}
-void i9xx_display_irq_reset(struct drm_i915_private *i915)
+void i9xx_display_irq_reset(struct intel_display *display)
{
- struct intel_display *display = &i915->display;
+ struct drm_i915_private *i915 = to_i915(display->drm);
if (I915_HAS_HOTPLUG(i915)) {
i915_hotplug_interrupt_update(display, 0xffffffff, 0);
@@ -1937,9 +1944,9 @@ static u32 vlv_error_mask(void)
return VLV_ERROR_PAGE_TABLE;
}
-void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
+void vlv_display_irq_postinstall(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 pipestat_mask;
u32 enable_mask;
enum pipe pipe;
@@ -1961,9 +1968,9 @@ void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
pipestat_mask = PIPE_CRC_DONE_INTERRUPT_STATUS;
- i915_enable_pipestat(dev_priv, PIPE_A, PIPE_GMBUS_INTERRUPT_STATUS);
+ i915_enable_pipestat(display, PIPE_A, PIPE_GMBUS_INTERRUPT_STATUS);
for_each_pipe(dev_priv, pipe)
- i915_enable_pipestat(dev_priv, pipe, pipestat_mask);
+ i915_enable_pipestat(display, pipe, pipestat_mask);
enable_mask = I915_DISPLAY_PORT_INTERRUPT |
I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
@@ -1983,9 +1990,9 @@ void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
intel_display_irq_regs_init(display, VLV_IRQ_REGS, dev_priv->irq_mask, enable_mask);
}
-void gen8_display_irq_reset(struct drm_i915_private *dev_priv)
+void gen8_display_irq_reset(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
enum pipe pipe;
if (!HAS_DISPLAY(dev_priv))
@@ -2003,9 +2010,9 @@ void gen8_display_irq_reset(struct drm_i915_private *dev_priv)
intel_display_irq_regs_reset(display, GEN8_DE_MISC_IRQ_REGS);
}
-void gen11_display_irq_reset(struct drm_i915_private *dev_priv)
+void gen11_display_irq_reset(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
enum pipe pipe;
u32 trans_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) |
BIT(TRANSCODER_C) | BIT(TRANSCODER_D);
@@ -2054,10 +2061,10 @@ void gen11_display_irq_reset(struct drm_i915_private *dev_priv)
intel_display_irq_regs_reset(display, SDE_IRQ_REGS);
}
-void gen8_irq_power_well_post_enable(struct drm_i915_private *dev_priv,
+void gen8_irq_power_well_post_enable(struct intel_display *display,
u8 pipe_mask)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 extra_ier = GEN8_PIPE_VBLANK | GEN8_PIPE_FIFO_UNDERRUN |
gen8_de_pipe_flip_done_mask(dev_priv);
enum pipe pipe;
@@ -2077,10 +2084,10 @@ void gen8_irq_power_well_post_enable(struct drm_i915_private *dev_priv,
spin_unlock_irq(&dev_priv->irq_lock);
}
-void gen8_irq_power_well_pre_disable(struct drm_i915_private *dev_priv,
+void gen8_irq_power_well_pre_disable(struct intel_display *display,
u8 pipe_mask)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
enum pipe pipe;
spin_lock_irq(&dev_priv->irq_lock);
@@ -2128,8 +2135,10 @@ static void ibx_irq_postinstall(struct drm_i915_private *dev_priv)
intel_display_irq_regs_init(display, SDE_IRQ_REGS, ~mask, 0xffffffff);
}
-void valleyview_enable_display_irqs(struct drm_i915_private *dev_priv)
+void valleyview_enable_display_irqs(struct intel_display *display)
{
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
+
lockdep_assert_held(&dev_priv->irq_lock);
if (dev_priv->display.irq.vlv_display_irqs_enabled)
@@ -2139,12 +2148,14 @@ void valleyview_enable_display_irqs(struct drm_i915_private *dev_priv)
if (intel_irqs_enabled(dev_priv)) {
_vlv_display_irq_reset(dev_priv);
- vlv_display_irq_postinstall(dev_priv);
+ vlv_display_irq_postinstall(display);
}
}
-void valleyview_disable_display_irqs(struct drm_i915_private *dev_priv)
+void valleyview_disable_display_irqs(struct intel_display *display)
{
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
+
lockdep_assert_held(&dev_priv->irq_lock);
if (!dev_priv->display.irq.vlv_display_irqs_enabled)
@@ -2156,9 +2167,10 @@ void valleyview_disable_display_irqs(struct drm_i915_private *dev_priv)
_vlv_display_irq_reset(dev_priv);
}
-void ilk_de_irq_postinstall(struct drm_i915_private *i915)
+void ilk_de_irq_postinstall(struct intel_display *display)
{
- struct intel_display *display = &i915->display;
+ struct drm_i915_private *i915 = to_i915(display->drm);
+
u32 display_mask, extra_mask;
if (DISPLAY_VER(i915) >= 7) {
@@ -2201,9 +2213,9 @@ void ilk_de_irq_postinstall(struct drm_i915_private *i915)
static void mtp_irq_postinstall(struct drm_i915_private *i915);
static void icp_irq_postinstall(struct drm_i915_private *i915);
-void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
+void gen8_de_irq_postinstall(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 de_pipe_masked = gen8_de_pipe_fault_mask(dev_priv) |
GEN8_PIPE_CDCLK_CRC_DONE;
@@ -2323,33 +2335,27 @@ static void icp_irq_postinstall(struct drm_i915_private *dev_priv)
intel_display_irq_regs_init(display, SDE_IRQ_REGS, ~mask, 0xffffffff);
}
-void gen11_de_irq_postinstall(struct drm_i915_private *dev_priv)
+void gen11_de_irq_postinstall(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
-
- if (!HAS_DISPLAY(dev_priv))
+ if (!HAS_DISPLAY(display))
return;
- gen8_de_irq_postinstall(dev_priv);
+ gen8_de_irq_postinstall(display);
intel_de_write(display, GEN11_DISPLAY_INT_CTL, GEN11_DISPLAY_IRQ_ENABLE);
}
-void dg1_de_irq_postinstall(struct drm_i915_private *i915)
+void dg1_de_irq_postinstall(struct intel_display *display)
{
- struct intel_display *display = &i915->display;
-
- if (!HAS_DISPLAY(i915))
+ if (!HAS_DISPLAY(display))
return;
- gen8_de_irq_postinstall(i915);
+ gen8_de_irq_postinstall(display);
intel_de_write(display, GEN11_DISPLAY_INT_CTL, GEN11_DISPLAY_IRQ_ENABLE);
}
-void intel_display_irq_init(struct drm_i915_private *i915)
+void intel_display_irq_init(struct intel_display *display)
{
- struct intel_display *display = &i915->display;
-
display->drm->vblank_disable_immediate = true;
intel_hotplug_irq_init(display);
diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.h b/drivers/gpu/drm/i915/display/intel_display_irq.h
index d9867cd0a220..f72727768351 100644
--- a/drivers/gpu/drm/i915/display/intel_display_irq.h
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.h
@@ -12,28 +12,27 @@
enum pipe;
struct drm_crtc;
-struct drm_i915_private;
struct intel_display;
-void valleyview_enable_display_irqs(struct drm_i915_private *i915);
-void valleyview_disable_display_irqs(struct drm_i915_private *i915);
+void valleyview_enable_display_irqs(struct intel_display *display);
+void valleyview_disable_display_irqs(struct intel_display *display);
-void ilk_update_display_irq(struct drm_i915_private *i915,
+void ilk_update_display_irq(struct intel_display *display,
u32 interrupt_mask, u32 enabled_irq_mask);
-void ilk_enable_display_irq(struct drm_i915_private *i915, u32 bits);
-void ilk_disable_display_irq(struct drm_i915_private *i915, u32 bits);
+void ilk_enable_display_irq(struct intel_display *display, u32 bits);
+void ilk_disable_display_irq(struct intel_display *display, u32 bits);
-void bdw_update_port_irq(struct drm_i915_private *i915, u32 interrupt_mask, u32 enabled_irq_mask);
-void bdw_enable_pipe_irq(struct drm_i915_private *i915, enum pipe pipe, u32 bits);
-void bdw_disable_pipe_irq(struct drm_i915_private *i915, enum pipe pipe, u32 bits);
+void bdw_update_port_irq(struct intel_display *display, u32 interrupt_mask, u32 enabled_irq_mask);
+void bdw_enable_pipe_irq(struct intel_display *display, enum pipe pipe, u32 bits);
+void bdw_disable_pipe_irq(struct intel_display *display, enum pipe pipe, u32 bits);
-void ibx_display_interrupt_update(struct drm_i915_private *i915,
+void ibx_display_interrupt_update(struct intel_display *display,
u32 interrupt_mask, u32 enabled_irq_mask);
-void ibx_enable_display_interrupt(struct drm_i915_private *i915, u32 bits);
-void ibx_disable_display_interrupt(struct drm_i915_private *i915, u32 bits);
+void ibx_enable_display_interrupt(struct intel_display *display, u32 bits);
+void ibx_disable_display_interrupt(struct intel_display *display, u32 bits);
-void gen8_irq_power_well_post_enable(struct drm_i915_private *i915, u8 pipe_mask);
-void gen8_irq_power_well_pre_disable(struct drm_i915_private *i915, u8 pipe_mask);
+void gen8_irq_power_well_post_enable(struct intel_display *display, u8 pipe_mask);
+void gen8_irq_power_well_pre_disable(struct intel_display *display, u8 pipe_mask);
int i8xx_enable_vblank(struct drm_crtc *crtc);
int i915gm_enable_vblank(struct drm_crtc *crtc);
@@ -46,41 +45,41 @@ void i965_disable_vblank(struct drm_crtc *crtc);
void ilk_disable_vblank(struct drm_crtc *crtc);
void bdw_disable_vblank(struct drm_crtc *crtc);
-void ivb_display_irq_handler(struct drm_i915_private *i915, u32 de_iir);
-void ilk_display_irq_handler(struct drm_i915_private *i915, u32 de_iir);
-void gen8_de_irq_handler(struct drm_i915_private *i915, u32 master_ctl);
-void gen11_display_irq_handler(struct drm_i915_private *i915);
+void ivb_display_irq_handler(struct intel_display *display, u32 de_iir);
+void ilk_display_irq_handler(struct intel_display *display, u32 de_iir);
+void gen8_de_irq_handler(struct intel_display *display, u32 master_ctl);
+void gen11_display_irq_handler(struct intel_display *display);
-u32 gen11_gu_misc_irq_ack(struct drm_i915_private *i915, const u32 master_ctl);
-void gen11_gu_misc_irq_handler(struct drm_i915_private *i915, const u32 iir);
+u32 gen11_gu_misc_irq_ack(struct intel_display *display, const u32 master_ctl);
+void gen11_gu_misc_irq_handler(struct intel_display *display, const u32 iir);
-void i9xx_display_irq_reset(struct drm_i915_private *i915);
-void vlv_display_irq_reset(struct drm_i915_private *i915);
-void gen8_display_irq_reset(struct drm_i915_private *i915);
-void gen11_display_irq_reset(struct drm_i915_private *i915);
+void i9xx_display_irq_reset(struct intel_display *display);
+void vlv_display_irq_reset(struct intel_display *display);
+void gen8_display_irq_reset(struct intel_display *display);
+void gen11_display_irq_reset(struct intel_display *display);
-void vlv_display_irq_postinstall(struct drm_i915_private *i915);
-void ilk_de_irq_postinstall(struct drm_i915_private *i915);
-void gen8_de_irq_postinstall(struct drm_i915_private *i915);
-void gen11_de_irq_postinstall(struct drm_i915_private *i915);
-void dg1_de_irq_postinstall(struct drm_i915_private *i915);
+void vlv_display_irq_postinstall(struct intel_display *display);
+void ilk_de_irq_postinstall(struct intel_display *display);
+void gen8_de_irq_postinstall(struct intel_display *display);
+void gen11_de_irq_postinstall(struct intel_display *display);
+void dg1_de_irq_postinstall(struct intel_display *display);
u32 i915_pipestat_enable_mask(struct intel_display *display, enum pipe pipe);
-void i915_enable_pipestat(struct drm_i915_private *i915, enum pipe pipe, u32 status_mask);
-void i915_disable_pipestat(struct drm_i915_private *i915, enum pipe pipe, u32 status_mask);
-void i915_enable_asle_pipestat(struct drm_i915_private *i915);
+void i915_enable_pipestat(struct intel_display *display, enum pipe pipe, u32 status_mask);
+void i915_disable_pipestat(struct intel_display *display, enum pipe pipe, u32 status_mask);
+void i915_enable_asle_pipestat(struct intel_display *display);
-void i9xx_pipestat_irq_ack(struct drm_i915_private *i915, u32 iir, u32 pipe_stats[I915_MAX_PIPES]);
+void i9xx_pipestat_irq_ack(struct intel_display *display, u32 iir, u32 pipe_stats[I915_MAX_PIPES]);
-void i915_pipestat_irq_handler(struct drm_i915_private *i915, u32 iir, u32 pipe_stats[I915_MAX_PIPES]);
-void i965_pipestat_irq_handler(struct drm_i915_private *i915, u32 iir, u32 pipe_stats[I915_MAX_PIPES]);
-void valleyview_pipestat_irq_handler(struct drm_i915_private *i915, u32 pipe_stats[I915_MAX_PIPES]);
+void i915_pipestat_irq_handler(struct intel_display *display, u32 iir, u32 pipe_stats[I915_MAX_PIPES]);
+void i965_pipestat_irq_handler(struct intel_display *display, u32 iir, u32 pipe_stats[I915_MAX_PIPES]);
+void valleyview_pipestat_irq_handler(struct intel_display *display, u32 pipe_stats[I915_MAX_PIPES]);
void vlv_display_error_irq_ack(struct intel_display *display, u32 *eir, u32 *dpinvgtt);
void vlv_display_error_irq_handler(struct intel_display *display, u32 eir, u32 dpinvgtt);
-void intel_display_irq_init(struct drm_i915_private *i915);
+void intel_display_irq_init(struct intel_display *display);
-void i915gm_irq_cstate_wa(struct drm_i915_private *i915, bool enable);
+void i915gm_irq_cstate_wa(struct intel_display *display, bool enable);
#endif /* __INTEL_DISPLAY_IRQ_H__ */
diff --git a/drivers/gpu/drm/i915/display/intel_display_power_well.c b/drivers/gpu/drm/i915/display/intel_display_power_well.c
index daf2a0cbb157..b03a95ef64da 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
@@ -186,22 +186,18 @@ int intel_power_well_refcount(struct i915_power_well *power_well)
static void hsw_power_well_post_enable(struct intel_display *display,
u8 irq_pipe_mask, bool has_vga)
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
-
if (has_vga)
intel_vga_reset_io_mem(display);
if (irq_pipe_mask)
- gen8_irq_power_well_post_enable(dev_priv, irq_pipe_mask);
+ gen8_irq_power_well_post_enable(display, irq_pipe_mask);
}
static void hsw_power_well_pre_disable(struct intel_display *display,
u8 irq_pipe_mask)
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
-
if (irq_pipe_mask)
- gen8_irq_power_well_pre_disable(dev_priv, irq_pipe_mask);
+ gen8_irq_power_well_pre_disable(display, irq_pipe_mask);
}
#define ICL_AUX_PW_TO_PHY(pw_idx) \
@@ -1226,7 +1222,7 @@ static void vlv_display_power_well_init(struct intel_display *display)
vlv_init_display_clock_gating(display);
spin_lock_irq(&dev_priv->irq_lock);
- valleyview_enable_display_irqs(dev_priv);
+ valleyview_enable_display_irqs(display);
spin_unlock_irq(&dev_priv->irq_lock);
/*
@@ -1255,7 +1251,7 @@ static void vlv_display_power_well_deinit(struct intel_display *display)
struct drm_i915_private *dev_priv = to_i915(display->drm);
spin_lock_irq(&dev_priv->irq_lock);
- valleyview_disable_display_irqs(dev_priv);
+ valleyview_disable_display_irqs(display);
spin_unlock_irq(&dev_priv->irq_lock);
/* make sure we're done processing display irqs */
diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
index 7a8fbff39be0..3f47a3beb2e6 100644
--- a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
+++ b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
@@ -136,14 +136,13 @@ static void i9xx_set_fifo_underrun_reporting(struct intel_display *display,
static void ilk_set_fifo_underrun_reporting(struct intel_display *display,
enum pipe pipe, bool enable)
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 bit = (pipe == PIPE_A) ?
DE_PIPEA_FIFO_UNDERRUN : DE_PIPEB_FIFO_UNDERRUN;
if (enable)
- ilk_enable_display_irq(dev_priv, bit);
+ ilk_enable_display_irq(display, bit);
else
- ilk_disable_display_irq(dev_priv, bit);
+ ilk_disable_display_irq(display, bit);
}
static void ivb_check_fifo_underruns(struct intel_crtc *crtc)
@@ -169,7 +168,6 @@ static void ivb_set_fifo_underrun_reporting(struct intel_display *display,
enum pipe pipe, bool enable,
bool old)
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
if (enable) {
intel_de_write(display, GEN7_ERR_INT,
ERR_INT_FIFO_UNDERRUN(pipe));
@@ -177,9 +175,9 @@ static void ivb_set_fifo_underrun_reporting(struct intel_display *display,
if (!ivb_can_enable_err_int(display))
return;
- ilk_enable_display_irq(dev_priv, DE_ERR_INT_IVB);
+ ilk_enable_display_irq(display, DE_ERR_INT_IVB);
} else {
- ilk_disable_display_irq(dev_priv, DE_ERR_INT_IVB);
+ ilk_disable_display_irq(display, DE_ERR_INT_IVB);
if (old &&
intel_de_read(display, GEN7_ERR_INT) & ERR_INT_FIFO_UNDERRUN(pipe)) {
@@ -193,26 +191,23 @@ static void ivb_set_fifo_underrun_reporting(struct intel_display *display,
static void bdw_set_fifo_underrun_reporting(struct intel_display *display,
enum pipe pipe, bool enable)
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
-
if (enable)
- bdw_enable_pipe_irq(dev_priv, pipe, GEN8_PIPE_FIFO_UNDERRUN);
+ bdw_enable_pipe_irq(display, pipe, GEN8_PIPE_FIFO_UNDERRUN);
else
- bdw_disable_pipe_irq(dev_priv, pipe, GEN8_PIPE_FIFO_UNDERRUN);
+ bdw_disable_pipe_irq(display, pipe, GEN8_PIPE_FIFO_UNDERRUN);
}
static void ibx_set_fifo_underrun_reporting(struct intel_display *display,
enum pipe pch_transcoder,
bool enable)
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 bit = (pch_transcoder == PIPE_A) ?
SDE_TRANSA_FIFO_UNDER : SDE_TRANSB_FIFO_UNDER;
if (enable)
- ibx_enable_display_interrupt(dev_priv, bit);
+ ibx_enable_display_interrupt(display, bit);
else
- ibx_disable_display_interrupt(dev_priv, bit);
+ ibx_disable_display_interrupt(display, bit);
}
static void cpt_check_pch_fifo_underruns(struct intel_crtc *crtc)
@@ -240,8 +235,6 @@ static void cpt_set_fifo_underrun_reporting(struct intel_display *display,
enum pipe pch_transcoder,
bool enable, bool old)
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
-
if (enable) {
intel_de_write(display, SERR_INT,
SERR_INT_TRANS_FIFO_UNDERRUN(pch_transcoder));
@@ -249,9 +242,9 @@ static void cpt_set_fifo_underrun_reporting(struct intel_display *display,
if (!cpt_can_enable_serr_int(display))
return;
- ibx_enable_display_interrupt(dev_priv, SDE_ERROR_CPT);
+ ibx_enable_display_interrupt(display, SDE_ERROR_CPT);
} else {
- ibx_disable_display_interrupt(dev_priv, SDE_ERROR_CPT);
+ ibx_disable_display_interrupt(display, SDE_ERROR_CPT);
if (old && intel_de_read(display, SERR_INT) &
SERR_INT_TRANS_FIFO_UNDERRUN(pch_transcoder)) {
diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
index e44ae6acc55f..1bcff3a47745 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
@@ -758,13 +758,12 @@ static void ibx_hpd_enable_detection(struct intel_encoder *encoder)
static void ibx_hpd_irq_setup(struct intel_display *display)
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.pch_hpd);
hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
- ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
+ ibx_display_interrupt_update(display, hotplug_irqs, enabled_irqs);
ibx_hpd_detection_setup(display);
}
@@ -847,7 +846,6 @@ static void icp_hpd_enable_detection(struct intel_encoder *encoder)
static void icp_hpd_irq_setup(struct intel_display *display)
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.pch_hpd);
@@ -859,7 +857,7 @@ static void icp_hpd_irq_setup(struct intel_display *display)
*/
intel_de_write(display, SHPD_FILTER_CNT, SHPD_FILTER_CNT_250);
- ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
+ ibx_display_interrupt_update(display, hotplug_irqs, enabled_irqs);
icp_ddi_hpd_detection_setup(display);
icp_tc_hpd_detection_setup(display);
@@ -1061,7 +1059,6 @@ static void mtp_hpd_enable_detection(struct intel_encoder *encoder)
static void mtp_hpd_irq_setup(struct intel_display *display)
{
- struct drm_i915_private *i915 = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.pch_hpd);
@@ -1074,7 +1071,7 @@ static void mtp_hpd_irq_setup(struct intel_display *display)
intel_de_write(display, SHPD_FILTER_CNT, SHPD_FILTER_CNT_250);
mtp_hpd_invert(display);
- ibx_display_interrupt_update(i915, hotplug_irqs, enabled_irqs);
+ ibx_display_interrupt_update(display, hotplug_irqs, enabled_irqs);
mtp_ddi_hpd_detection_setup(display);
mtp_tc_hpd_detection_setup(display);
@@ -1082,13 +1079,12 @@ static void mtp_hpd_irq_setup(struct intel_display *display)
static void xe2lpd_sde_hpd_irq_setup(struct intel_display *display)
{
- struct drm_i915_private *i915 = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.pch_hpd);
hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
- ibx_display_interrupt_update(i915, hotplug_irqs, enabled_irqs);
+ ibx_display_interrupt_update(display, hotplug_irqs, enabled_irqs);
mtp_ddi_hpd_detection_setup(display);
mtp_tc_hpd_detection_setup(display);
@@ -1248,7 +1244,7 @@ static void spt_hpd_irq_setup(struct intel_display *display)
enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.pch_hpd);
hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
- ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
+ ibx_display_interrupt_update(display, hotplug_irqs, enabled_irqs);
spt_hpd_detection_setup(display);
}
@@ -1300,16 +1296,15 @@ static void ilk_hpd_enable_detection(struct intel_encoder *encoder)
static void ilk_hpd_irq_setup(struct intel_display *display)
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.hpd);
hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.hpd);
if (DISPLAY_VER(display) >= 8)
- bdw_update_port_irq(dev_priv, hotplug_irqs, enabled_irqs);
+ bdw_update_port_irq(display, hotplug_irqs, enabled_irqs);
else
- ilk_update_display_irq(dev_priv, hotplug_irqs, enabled_irqs);
+ ilk_update_display_irq(display, hotplug_irqs, enabled_irqs);
ilk_hpd_detection_setup(display);
@@ -1373,13 +1368,12 @@ static void bxt_hpd_enable_detection(struct intel_encoder *encoder)
static void bxt_hpd_irq_setup(struct intel_display *display)
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 hotplug_irqs, enabled_irqs;
enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.hpd);
hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.hpd);
- bdw_update_port_irq(dev_priv, hotplug_irqs, enabled_irqs);
+ bdw_update_port_irq(display, hotplug_irqs, enabled_irqs);
bxt_hpd_detection_setup(display);
}
diff --git a/drivers/gpu/drm/i915/display/intel_pipe_crc.c b/drivers/gpu/drm/i915/display/intel_pipe_crc.c
index 10e26c3db946..65f60615f387 100644
--- a/drivers/gpu/drm/i915/display/intel_pipe_crc.c
+++ b/drivers/gpu/drm/i915/display/intel_pipe_crc.c
@@ -281,6 +281,7 @@ static int ilk_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,
static void
intel_crtc_crc_setup_workarounds(struct intel_crtc *crtc, bool enable)
{
+ struct intel_display *display = to_intel_display(crtc);
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
struct intel_crtc_state *pipe_config;
struct drm_atomic_state *state;
@@ -288,7 +289,7 @@ intel_crtc_crc_setup_workarounds(struct intel_crtc *crtc, bool enable)
int ret;
if (IS_I945GM(dev_priv) || IS_I915GM(dev_priv))
- i915gm_irq_cstate_wa(dev_priv, enable);
+ i915gm_irq_cstate_wa(display, enable);
drm_modeset_acquire_init(&ctx, 0);
diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c
index 5dbe857ea85b..2e3f3f0207e8 100644
--- a/drivers/gpu/drm/i915/display/intel_tv.c
+++ b/drivers/gpu/drm/i915/display/intel_tv.c
@@ -1594,7 +1594,7 @@ intel_tv_detect_type(struct intel_tv *intel_tv,
/* Disable TV interrupts around load detect or we'll recurse */
if (connector->polled & DRM_CONNECTOR_POLL_HPD) {
spin_lock_irq(&dev_priv->irq_lock);
- i915_disable_pipestat(dev_priv, 0,
+ i915_disable_pipestat(display, 0,
PIPE_HOTPLUG_INTERRUPT_STATUS |
PIPE_HOTPLUG_TV_INTERRUPT_STATUS);
spin_unlock_irq(&dev_priv->irq_lock);
@@ -1669,7 +1669,7 @@ intel_tv_detect_type(struct intel_tv *intel_tv,
/* Restore interrupt config */
if (connector->polled & DRM_CONNECTOR_POLL_HPD) {
spin_lock_irq(&dev_priv->irq_lock);
- i915_enable_pipestat(dev_priv, 0,
+ i915_enable_pipestat(display, 0,
PIPE_HOTPLUG_INTERRUPT_STATUS |
PIPE_HOTPLUG_TV_INTERRUPT_STATUS);
spin_unlock_irq(&dev_priv->irq_lock);
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 70e550539bb2..8739195aba69 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -2689,22 +2689,24 @@ static const struct drm_plane_funcs tgl_plane_funcs = {
static void
skl_plane_enable_flip_done(struct intel_plane *plane)
{
+ struct intel_display *display = to_intel_display(plane);
struct drm_i915_private *i915 = to_i915(plane->base.dev);
enum pipe pipe = plane->pipe;
spin_lock_irq(&i915->irq_lock);
- bdw_enable_pipe_irq(i915, pipe, GEN9_PIPE_PLANE_FLIP_DONE(plane->id));
+ bdw_enable_pipe_irq(display, pipe, GEN9_PIPE_PLANE_FLIP_DONE(plane->id));
spin_unlock_irq(&i915->irq_lock);
}
static void
skl_plane_disable_flip_done(struct intel_plane *plane)
{
+ struct intel_display *display = to_intel_display(plane);
struct drm_i915_private *i915 = to_i915(plane->base.dev);
enum pipe pipe = plane->pipe;
spin_lock_irq(&i915->irq_lock);
- bdw_disable_pipe_irq(i915, pipe, GEN9_PIPE_PLANE_FLIP_DONE(plane->id));
+ bdw_disable_pipe_irq(display, pipe, GEN9_PIPE_PLANE_FLIP_DONE(plane->id));
spin_unlock_irq(&i915->irq_lock);
}
diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c
index 2cfaedb04876..4b46c59588b8 100644
--- a/drivers/gpu/drm/i915/gt/intel_rps.c
+++ b/drivers/gpu/drm/i915/gt/intel_rps.c
@@ -550,6 +550,7 @@ static unsigned int init_emon(struct intel_uncore *uncore)
static bool gen5_rps_enable(struct intel_rps *rps)
{
struct drm_i915_private *i915 = rps_to_i915(rps);
+ struct intel_display *display = &i915->display;
struct intel_uncore *uncore = rps_to_uncore(rps);
u8 fstart, vstart;
u32 rgvmodectl;
@@ -608,7 +609,7 @@ static bool gen5_rps_enable(struct intel_rps *rps)
rps->ips.last_time2 = ktime_get_raw_ns();
spin_lock(&i915->irq_lock);
- ilk_enable_display_irq(i915, DE_PCU_EVENT);
+ ilk_enable_display_irq(display, DE_PCU_EVENT);
spin_unlock(&i915->irq_lock);
spin_unlock_irq(&mchdev_lock);
@@ -621,13 +622,14 @@ static bool gen5_rps_enable(struct intel_rps *rps)
static void gen5_rps_disable(struct intel_rps *rps)
{
struct drm_i915_private *i915 = rps_to_i915(rps);
+ struct intel_display *display = &i915->display;
struct intel_uncore *uncore = rps_to_uncore(rps);
u16 rgvswctl;
spin_lock_irq(&mchdev_lock);
spin_lock(&i915->irq_lock);
- ilk_disable_display_irq(i915, DE_PCU_EVENT);
+ ilk_disable_display_irq(display, DE_PCU_EVENT);
spin_unlock(&i915->irq_lock);
rgvswctl = intel_uncore_read16(uncore, MEMSWCTL);
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 3b05eb3f9cbc..ba3afc7e38ac 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -284,7 +284,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
/* Call regardless, as some status bits might not be
* signalled in IIR */
- i9xx_pipestat_irq_ack(dev_priv, iir, pipe_stats);
+ i9xx_pipestat_irq_ack(display, iir, pipe_stats);
if (iir & (I915_LPE_PIPE_A_INTERRUPT |
I915_LPE_PIPE_B_INTERRUPT))
@@ -311,7 +311,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
if (iir & I915_MASTER_ERROR_INTERRUPT)
vlv_display_error_irq_handler(display, eir, dpinvgtt);
- valleyview_pipestat_irq_handler(dev_priv, pipe_stats);
+ valleyview_pipestat_irq_handler(display, pipe_stats);
} while (0);
pmu_irq_stats(dev_priv, ret);
@@ -374,7 +374,7 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
/* Call regardless, as some status bits might not be
* signalled in IIR */
- i9xx_pipestat_irq_ack(dev_priv, iir, pipe_stats);
+ i9xx_pipestat_irq_ack(display, iir, pipe_stats);
if (iir & (I915_LPE_PIPE_A_INTERRUPT |
I915_LPE_PIPE_B_INTERRUPT |
@@ -397,7 +397,7 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
if (iir & I915_MASTER_ERROR_INTERRUPT)
vlv_display_error_irq_handler(display, eir, dpinvgtt);
- valleyview_pipestat_irq_handler(dev_priv, pipe_stats);
+ valleyview_pipestat_irq_handler(display, pipe_stats);
} while (0);
pmu_irq_stats(dev_priv, ret);
@@ -418,6 +418,7 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
static irqreturn_t ilk_irq_handler(int irq, void *arg)
{
struct drm_i915_private *i915 = arg;
+ struct intel_display *display = &i915->display;
void __iomem * const regs = intel_uncore_regs(&i915->uncore);
u32 de_iir, gt_iir, de_ier, sde_ier = 0;
irqreturn_t ret = IRQ_NONE;
@@ -458,9 +459,9 @@ static irqreturn_t ilk_irq_handler(int irq, void *arg)
if (de_iir) {
raw_reg_write(regs, DEIIR, de_iir);
if (DISPLAY_VER(i915) >= 7)
- ivb_display_irq_handler(i915, de_iir);
+ ivb_display_irq_handler(display, de_iir);
else
- ilk_display_irq_handler(i915, de_iir);
+ ilk_display_irq_handler(display, de_iir);
ret = IRQ_HANDLED;
}
@@ -506,6 +507,7 @@ static inline void gen8_master_intr_enable(void __iomem * const regs)
static irqreturn_t gen8_irq_handler(int irq, void *arg)
{
struct drm_i915_private *dev_priv = arg;
+ struct intel_display *display = &dev_priv->display;
void __iomem * const regs = intel_uncore_regs(&dev_priv->uncore);
u32 master_ctl;
@@ -524,7 +526,7 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
/* IRQs are synced during runtime_suspend, we don't require a wakeref */
if (master_ctl & ~GEN8_GT_IRQS) {
disable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
- gen8_de_irq_handler(dev_priv, master_ctl);
+ gen8_de_irq_handler(display, master_ctl);
enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
}
@@ -556,6 +558,7 @@ static inline void gen11_master_intr_enable(void __iomem * const regs)
static irqreturn_t gen11_irq_handler(int irq, void *arg)
{
struct drm_i915_private *i915 = arg;
+ struct intel_display *display = &i915->display;
void __iomem * const regs = intel_uncore_regs(&i915->uncore);
struct intel_gt *gt = to_gt(i915);
u32 master_ctl;
@@ -575,13 +578,13 @@ static irqreturn_t gen11_irq_handler(int irq, void *arg)
/* IRQs are synced during runtime_suspend, we don't require a wakeref */
if (master_ctl & GEN11_DISPLAY_IRQ)
- gen11_display_irq_handler(i915);
+ gen11_display_irq_handler(display);
- gu_misc_iir = gen11_gu_misc_irq_ack(i915, master_ctl);
+ gu_misc_iir = gen11_gu_misc_irq_ack(display, master_ctl);
gen11_master_intr_enable(regs);
- gen11_gu_misc_irq_handler(i915, gu_misc_iir);
+ gen11_gu_misc_irq_handler(display, gu_misc_iir);
pmu_irq_stats(i915, IRQ_HANDLED);
@@ -613,6 +616,7 @@ static inline void dg1_master_intr_enable(void __iomem * const regs)
static irqreturn_t dg1_irq_handler(int irq, void *arg)
{
struct drm_i915_private * const i915 = arg;
+ struct intel_display *display = &i915->display;
struct intel_gt *gt = to_gt(i915);
void __iomem * const regs = intel_uncore_regs(gt->uncore);
u32 master_tile_ctl, master_ctl;
@@ -641,13 +645,13 @@ static irqreturn_t dg1_irq_handler(int irq, void *arg)
gen11_gt_irq_handler(gt, master_ctl);
if (master_ctl & GEN11_DISPLAY_IRQ)
- gen11_display_irq_handler(i915);
+ gen11_display_irq_handler(display);
- gu_misc_iir = gen11_gu_misc_irq_ack(i915, master_ctl);
+ gu_misc_iir = gen11_gu_misc_irq_ack(display, master_ctl);
dg1_master_intr_enable(regs);
- gen11_gu_misc_irq_handler(i915, gu_misc_iir);
+ gen11_gu_misc_irq_handler(display, gu_misc_iir);
pmu_irq_stats(i915, IRQ_HANDLED);
@@ -691,24 +695,27 @@ static void ilk_irq_reset(struct drm_i915_private *dev_priv)
static void valleyview_irq_reset(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
+
intel_uncore_write(&dev_priv->uncore, VLV_MASTER_IER, 0);
intel_uncore_posting_read(&dev_priv->uncore, VLV_MASTER_IER);
gen5_gt_irq_reset(to_gt(dev_priv));
spin_lock_irq(&dev_priv->irq_lock);
- vlv_display_irq_reset(dev_priv);
+ vlv_display_irq_reset(display);
spin_unlock_irq(&dev_priv->irq_lock);
}
static void gen8_irq_reset(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
struct intel_uncore *uncore = &dev_priv->uncore;
gen8_master_intr_disable(intel_uncore_regs(uncore));
gen8_gt_irq_reset(to_gt(dev_priv));
- gen8_display_irq_reset(dev_priv);
+ gen8_display_irq_reset(display);
gen2_irq_reset(uncore, GEN8_PCU_IRQ_REGS);
if (HAS_PCH_SPLIT(dev_priv))
@@ -718,13 +725,14 @@ static void gen8_irq_reset(struct drm_i915_private *dev_priv)
static void gen11_irq_reset(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
struct intel_gt *gt = to_gt(dev_priv);
struct intel_uncore *uncore = gt->uncore;
gen11_master_intr_disable(intel_uncore_regs(&dev_priv->uncore));
gen11_gt_irq_reset(gt);
- gen11_display_irq_reset(dev_priv);
+ gen11_display_irq_reset(display);
gen2_irq_reset(uncore, GEN11_GU_MISC_IRQ_REGS);
gen2_irq_reset(uncore, GEN8_PCU_IRQ_REGS);
@@ -732,6 +740,7 @@ static void gen11_irq_reset(struct drm_i915_private *dev_priv)
static void dg1_irq_reset(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
struct intel_uncore *uncore = &dev_priv->uncore;
struct intel_gt *gt;
unsigned int i;
@@ -741,7 +750,7 @@ static void dg1_irq_reset(struct drm_i915_private *dev_priv)
for_each_gt(gt, dev_priv, i)
gen11_gt_irq_reset(gt);
- gen11_display_irq_reset(dev_priv);
+ gen11_display_irq_reset(display);
gen2_irq_reset(uncore, GEN11_GU_MISC_IRQ_REGS);
gen2_irq_reset(uncore, GEN8_PCU_IRQ_REGS);
@@ -751,6 +760,7 @@ static void dg1_irq_reset(struct drm_i915_private *dev_priv)
static void cherryview_irq_reset(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
struct intel_uncore *uncore = &dev_priv->uncore;
intel_uncore_write(uncore, GEN8_MASTER_IRQ, 0);
@@ -761,23 +771,27 @@ static void cherryview_irq_reset(struct drm_i915_private *dev_priv)
gen2_irq_reset(uncore, GEN8_PCU_IRQ_REGS);
spin_lock_irq(&dev_priv->irq_lock);
- vlv_display_irq_reset(dev_priv);
+ vlv_display_irq_reset(display);
spin_unlock_irq(&dev_priv->irq_lock);
}
static void ilk_irq_postinstall(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
+
gen5_gt_irq_postinstall(to_gt(dev_priv));
- ilk_de_irq_postinstall(dev_priv);
+ ilk_de_irq_postinstall(display);
}
static void valleyview_irq_postinstall(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
+
gen5_gt_irq_postinstall(to_gt(dev_priv));
spin_lock_irq(&dev_priv->irq_lock);
- vlv_display_irq_postinstall(dev_priv);
+ vlv_display_irq_postinstall(display);
spin_unlock_irq(&dev_priv->irq_lock);
intel_uncore_write(&dev_priv->uncore, VLV_MASTER_IER, MASTER_INTERRUPT_ENABLE);
@@ -786,20 +800,23 @@ static void valleyview_irq_postinstall(struct drm_i915_private *dev_priv)
static void gen8_irq_postinstall(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
+
gen8_gt_irq_postinstall(to_gt(dev_priv));
- gen8_de_irq_postinstall(dev_priv);
+ gen8_de_irq_postinstall(display);
gen8_master_intr_enable(intel_uncore_regs(&dev_priv->uncore));
}
static void gen11_irq_postinstall(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
struct intel_gt *gt = to_gt(dev_priv);
struct intel_uncore *uncore = gt->uncore;
u32 gu_misc_masked = GEN11_GU_MISC_GSE;
gen11_gt_irq_postinstall(gt);
- gen11_de_irq_postinstall(dev_priv);
+ gen11_de_irq_postinstall(display);
gen2_irq_init(uncore, GEN11_GU_MISC_IRQ_REGS, ~gu_misc_masked, gu_misc_masked);
@@ -809,6 +826,7 @@ static void gen11_irq_postinstall(struct drm_i915_private *dev_priv)
static void dg1_irq_postinstall(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
struct intel_uncore *uncore = &dev_priv->uncore;
u32 gu_misc_masked = GEN11_GU_MISC_GSE;
struct intel_gt *gt;
@@ -819,7 +837,7 @@ static void dg1_irq_postinstall(struct drm_i915_private *dev_priv)
gen2_irq_init(uncore, GEN11_GU_MISC_IRQ_REGS, ~gu_misc_masked, gu_misc_masked);
- dg1_de_irq_postinstall(dev_priv);
+ dg1_de_irq_postinstall(display);
dg1_master_intr_enable(intel_uncore_regs(uncore));
intel_uncore_posting_read(uncore, DG1_MSTR_TILE_INTR);
@@ -827,10 +845,12 @@ static void dg1_irq_postinstall(struct drm_i915_private *dev_priv)
static void cherryview_irq_postinstall(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
+
gen8_gt_irq_postinstall(to_gt(dev_priv));
spin_lock_irq(&dev_priv->irq_lock);
- vlv_display_irq_postinstall(dev_priv);
+ vlv_display_irq_postinstall(display);
spin_unlock_irq(&dev_priv->irq_lock);
intel_uncore_write(&dev_priv->uncore, GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL);
@@ -900,9 +920,10 @@ static void i9xx_error_irq_handler(struct drm_i915_private *dev_priv,
static void i915_irq_reset(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
struct intel_uncore *uncore = &dev_priv->uncore;
- i9xx_display_irq_reset(dev_priv);
+ i9xx_display_irq_reset(display);
gen2_error_reset(uncore, GEN2_ERROR_REGS);
gen2_irq_reset(uncore, GEN2_IRQ_REGS);
@@ -911,6 +932,7 @@ static void i915_irq_reset(struct drm_i915_private *dev_priv)
static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
struct intel_uncore *uncore = &dev_priv->uncore;
u32 enable_mask;
@@ -942,11 +964,11 @@ static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
/* Interrupt setup is already guaranteed to be single-threaded, this is
* just to make the assert_spin_locked check happy. */
spin_lock_irq(&dev_priv->irq_lock);
- i915_enable_pipestat(dev_priv, PIPE_A, PIPE_CRC_DONE_INTERRUPT_STATUS);
- i915_enable_pipestat(dev_priv, PIPE_B, PIPE_CRC_DONE_INTERRUPT_STATUS);
+ i915_enable_pipestat(display, PIPE_A, PIPE_CRC_DONE_INTERRUPT_STATUS);
+ i915_enable_pipestat(display, PIPE_B, PIPE_CRC_DONE_INTERRUPT_STATUS);
spin_unlock_irq(&dev_priv->irq_lock);
- i915_enable_asle_pipestat(dev_priv);
+ i915_enable_asle_pipestat(display);
}
static irqreturn_t i915_irq_handler(int irq, void *arg)
@@ -979,7 +1001,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
/* Call regardless, as some status bits might not be
* signalled in IIR */
- i9xx_pipestat_irq_ack(dev_priv, iir, pipe_stats);
+ i9xx_pipestat_irq_ack(display, iir, pipe_stats);
if (iir & I915_MASTER_ERROR_INTERRUPT)
i9xx_error_irq_ack(dev_priv, &eir, &eir_stuck);
@@ -995,7 +1017,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
if (hotplug_status)
i9xx_hpd_irq_handler(display, hotplug_status);
- i915_pipestat_irq_handler(dev_priv, iir, pipe_stats);
+ i915_pipestat_irq_handler(display, iir, pipe_stats);
} while (0);
pmu_irq_stats(dev_priv, ret);
@@ -1007,9 +1029,10 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
static void i965_irq_reset(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
struct intel_uncore *uncore = &dev_priv->uncore;
- i9xx_display_irq_reset(dev_priv);
+ i9xx_display_irq_reset(display);
gen2_error_reset(uncore, GEN2_ERROR_REGS);
gen2_irq_reset(uncore, GEN2_IRQ_REGS);
@@ -1037,6 +1060,7 @@ static u32 i965_error_mask(struct drm_i915_private *i915)
static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
{
+ struct intel_display *display = &dev_priv->display;
struct intel_uncore *uncore = &dev_priv->uncore;
u32 enable_mask;
@@ -1065,12 +1089,12 @@ static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
/* Interrupt setup is already guaranteed to be single-threaded, this is
* just to make the assert_spin_locked check happy. */
spin_lock_irq(&dev_priv->irq_lock);
- i915_enable_pipestat(dev_priv, PIPE_A, PIPE_GMBUS_INTERRUPT_STATUS);
- i915_enable_pipestat(dev_priv, PIPE_A, PIPE_CRC_DONE_INTERRUPT_STATUS);
- i915_enable_pipestat(dev_priv, PIPE_B, PIPE_CRC_DONE_INTERRUPT_STATUS);
+ i915_enable_pipestat(display, PIPE_A, PIPE_GMBUS_INTERRUPT_STATUS);
+ i915_enable_pipestat(display, PIPE_A, PIPE_CRC_DONE_INTERRUPT_STATUS);
+ i915_enable_pipestat(display, PIPE_B, PIPE_CRC_DONE_INTERRUPT_STATUS);
spin_unlock_irq(&dev_priv->irq_lock);
- i915_enable_asle_pipestat(dev_priv);
+ i915_enable_asle_pipestat(display);
}
static irqreturn_t i965_irq_handler(int irq, void *arg)
@@ -1102,7 +1126,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
/* Call regardless, as some status bits might not be
* signalled in IIR */
- i9xx_pipestat_irq_ack(dev_priv, iir, pipe_stats);
+ i9xx_pipestat_irq_ack(display, iir, pipe_stats);
if (iir & I915_MASTER_ERROR_INTERRUPT)
i9xx_error_irq_ack(dev_priv, &eir, &eir_stuck);
@@ -1123,7 +1147,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
if (hotplug_status)
i9xx_hpd_irq_handler(display, hotplug_status);
- i965_pipestat_irq_handler(dev_priv, iir, pipe_stats);
+ i965_pipestat_irq_handler(display, iir, pipe_stats);
} while (0);
pmu_irq_stats(dev_priv, IRQ_HANDLED);
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 263459323bf7..8e61cfa06647 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -220,11 +220,13 @@ void xe_display_unregister(struct xe_device *xe)
void xe_display_irq_handler(struct xe_device *xe, u32 master_ctl)
{
+ struct intel_display *display = &xe->display;
+
if (!xe->info.probe_display)
return;
if (master_ctl & DISPLAY_IRQ)
- gen11_display_irq_handler(xe);
+ gen11_display_irq_handler(display);
}
void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir)
@@ -240,19 +242,23 @@ void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir)
void xe_display_irq_reset(struct xe_device *xe)
{
+ struct intel_display *display = &xe->display;
+
if (!xe->info.probe_display)
return;
- gen11_display_irq_reset(xe);
+ gen11_display_irq_reset(display);
}
void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt)
{
+ struct intel_display *display = &xe->display;
+
if (!xe->info.probe_display)
return;
if (gt->info.id == XE_GT0)
- gen11_de_irq_postinstall(xe);
+ gen11_de_irq_postinstall(display);
}
static bool suspend_to_idle(void)
--
2.39.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* Re: [PATCH 7/9] drm/i915/irq: convert intel_display_irq.[ch] interfaces to struct intel_display
2025-03-11 18:00 ` [PATCH 7/9] drm/i915/irq: convert intel_display_irq.[ch] interfaces " Jani Nikula
@ 2025-03-11 19:15 ` Ville Syrjälä
2025-03-12 9:52 ` Jani Nikula
2025-03-12 5:47 ` Shankar, Uma
1 sibling, 1 reply; 31+ messages in thread
From: Ville Syrjälä @ 2025-03-11 19:15 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, intel-xe
On Tue, Mar 11, 2025 at 08:00:41PM +0200, Jani Nikula wrote:
> Going forward, struct intel_display is the main display device data
> pointer. Convert the external interfaces of intel_display_irq.[ch] to
> struct intel_display.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/i9xx_plane.c | 24 ++-
> .../drm/i915/display/intel_display_driver.c | 2 +-
> .../gpu/drm/i915/display/intel_display_irq.c | 204 +++++++++---------
> .../gpu/drm/i915/display/intel_display_irq.h | 75 ++++---
> .../i915/display/intel_display_power_well.c | 12 +-
> .../drm/i915/display/intel_fifo_underrun.c | 27 +--
> .../gpu/drm/i915/display/intel_hotplug_irq.c | 22 +-
> drivers/gpu/drm/i915/display/intel_pipe_crc.c | 3 +-
> drivers/gpu/drm/i915/display/intel_tv.c | 4 +-
> .../drm/i915/display/skl_universal_plane.c | 6 +-
> drivers/gpu/drm/i915/gt/intel_rps.c | 6 +-
> drivers/gpu/drm/i915/i915_irq.c | 98 +++++----
> drivers/gpu/drm/xe/display/xe_display.c | 12 +-
> 13 files changed, 263 insertions(+), 232 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
> index 013295f66d56..5e8344fdfc28 100644
> --- a/drivers/gpu/drm/i915/display/i9xx_plane.c
> +++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
> @@ -630,84 +630,92 @@ vlv_primary_async_flip(struct intel_dsb *dsb,
> static void
> bdw_primary_enable_flip_done(struct intel_plane *plane)
> {
> + struct intel_display *display = to_intel_display(plane);
> struct drm_i915_private *i915 = to_i915(plane->base.dev);
> enum pipe pipe = plane->pipe;
>
> spin_lock_irq(&i915->irq_lock);
> - bdw_enable_pipe_irq(i915, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);
> + bdw_enable_pipe_irq(display, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);
> spin_unlock_irq(&i915->irq_lock);
> }
>
> static void
> bdw_primary_disable_flip_done(struct intel_plane *plane)
> {
> + struct intel_display *display = to_intel_display(plane);
> struct drm_i915_private *i915 = to_i915(plane->base.dev);
> enum pipe pipe = plane->pipe;
>
> spin_lock_irq(&i915->irq_lock);
> - bdw_disable_pipe_irq(i915, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);
> + bdw_disable_pipe_irq(display, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);
> spin_unlock_irq(&i915->irq_lock);
> }
>
> static void
> ivb_primary_enable_flip_done(struct intel_plane *plane)
> {
> + struct intel_display *display = to_intel_display(plane);
> struct drm_i915_private *i915 = to_i915(plane->base.dev);
>
> spin_lock_irq(&i915->irq_lock);
> - ilk_enable_display_irq(i915, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));
> + ilk_enable_display_irq(display, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));
> spin_unlock_irq(&i915->irq_lock);
I was pondering if we could just suck the lock into these
guys. But at least the fifo underrun reporting code is using
some of these things and there there the lock is taken
further out. So sadly not as trivial as I was hoping.
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PATCH 7/9] drm/i915/irq: convert intel_display_irq.[ch] interfaces to struct intel_display
2025-03-11 19:15 ` Ville Syrjälä
@ 2025-03-12 9:52 ` Jani Nikula
2025-03-12 10:06 ` Ville Syrjälä
0 siblings, 1 reply; 31+ messages in thread
From: Jani Nikula @ 2025-03-12 9:52 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx, intel-xe
On Tue, 11 Mar 2025, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Tue, Mar 11, 2025 at 08:00:41PM +0200, Jani Nikula wrote:
>> static void
>> ivb_primary_enable_flip_done(struct intel_plane *plane)
>> {
>> + struct intel_display *display = to_intel_display(plane);
>> struct drm_i915_private *i915 = to_i915(plane->base.dev);
>>
>> spin_lock_irq(&i915->irq_lock);
>> - ilk_enable_display_irq(i915, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));
>> + ilk_enable_display_irq(display, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));
>> spin_unlock_irq(&i915->irq_lock);
>
> I was pondering if we could just suck the lock into these
> guys. But at least the fifo underrun reporting code is using
> some of these things and there there the lock is taken
> further out. So sadly not as trivial as I was hoping.
The whole i915->irq_lock (*) is a looming problem for display separation
from i915/xe core.
How do you abstract a spin lock? Is it okay to pass a spinlock_t * from
i915 core code to display, which would then store this pointer and use
it locally?
Wrapping it in a pair of function calls certainly sucks in a lot of
ways.
BR,
Jani.
*) xe->irq.lock on xe, with an ugly #define irq_lock irq.lock
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PATCH 7/9] drm/i915/irq: convert intel_display_irq.[ch] interfaces to struct intel_display
2025-03-12 9:52 ` Jani Nikula
@ 2025-03-12 10:06 ` Ville Syrjälä
0 siblings, 0 replies; 31+ messages in thread
From: Ville Syrjälä @ 2025-03-12 10:06 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, intel-xe
On Wed, Mar 12, 2025 at 11:52:33AM +0200, Jani Nikula wrote:
> On Tue, 11 Mar 2025, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> > On Tue, Mar 11, 2025 at 08:00:41PM +0200, Jani Nikula wrote:
> >> static void
> >> ivb_primary_enable_flip_done(struct intel_plane *plane)
> >> {
> >> + struct intel_display *display = to_intel_display(plane);
> >> struct drm_i915_private *i915 = to_i915(plane->base.dev);
> >>
> >> spin_lock_irq(&i915->irq_lock);
> >> - ilk_enable_display_irq(i915, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));
> >> + ilk_enable_display_irq(display, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));
> >> spin_unlock_irq(&i915->irq_lock);
> >
> > I was pondering if we could just suck the lock into these
> > guys. But at least the fifo underrun reporting code is using
> > some of these things and there there the lock is taken
> > further out. So sadly not as trivial as I was hoping.
>
> The whole i915->irq_lock (*) is a looming problem for display separation
> from i915/xe core.
>
> How do you abstract a spin lock? Is it okay to pass a spinlock_t * from
> i915 core code to display, which would then store this pointer and use
> it locally?
I think we should be able to just switch to our own display->irq_lock.
I don't think we're really protecting anything shared between gt and
display with this.
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 31+ messages in thread
* RE: [PATCH 7/9] drm/i915/irq: convert intel_display_irq.[ch] interfaces to struct intel_display
2025-03-11 18:00 ` [PATCH 7/9] drm/i915/irq: convert intel_display_irq.[ch] interfaces " Jani Nikula
2025-03-11 19:15 ` Ville Syrjälä
@ 2025-03-12 5:47 ` Shankar, Uma
1 sibling, 0 replies; 31+ messages in thread
From: Shankar, Uma @ 2025-03-12 5:47 UTC (permalink / raw)
To: Nikula, Jani, intel-gfx@lists.freedesktop.org,
intel-xe@lists.freedesktop.org
Cc: Nikula, Jani
> -----Original Message-----
> From: Intel-xe <intel-xe-bounces@lists.freedesktop.org> On Behalf Of Jani Nikula
> Sent: Tuesday, March 11, 2025 11:31 PM
> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nikula@intel.com>
> Subject: [PATCH 7/9] drm/i915/irq: convert intel_display_irq.[ch] interfaces to
> struct intel_display
>
> Going forward, struct intel_display is the main display device data
> pointer. Convert the external interfaces of intel_display_irq.[ch] to
> struct intel_display.
Looks Good to me.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/i9xx_plane.c | 24 ++-
> .../drm/i915/display/intel_display_driver.c | 2 +-
> .../gpu/drm/i915/display/intel_display_irq.c | 204 +++++++++---------
> .../gpu/drm/i915/display/intel_display_irq.h | 75 ++++---
> .../i915/display/intel_display_power_well.c | 12 +-
> .../drm/i915/display/intel_fifo_underrun.c | 27 +--
> .../gpu/drm/i915/display/intel_hotplug_irq.c | 22 +-
> drivers/gpu/drm/i915/display/intel_pipe_crc.c | 3 +-
> drivers/gpu/drm/i915/display/intel_tv.c | 4 +-
> .../drm/i915/display/skl_universal_plane.c | 6 +-
> drivers/gpu/drm/i915/gt/intel_rps.c | 6 +-
> drivers/gpu/drm/i915/i915_irq.c | 98 +++++----
> drivers/gpu/drm/xe/display/xe_display.c | 12 +-
> 13 files changed, 263 insertions(+), 232 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c
> b/drivers/gpu/drm/i915/display/i9xx_plane.c
> index 013295f66d56..5e8344fdfc28 100644
> --- a/drivers/gpu/drm/i915/display/i9xx_plane.c
> +++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
> @@ -630,84 +630,92 @@ vlv_primary_async_flip(struct intel_dsb *dsb,
> static void
> bdw_primary_enable_flip_done(struct intel_plane *plane)
> {
> + struct intel_display *display = to_intel_display(plane);
> struct drm_i915_private *i915 = to_i915(plane->base.dev);
> enum pipe pipe = plane->pipe;
>
> spin_lock_irq(&i915->irq_lock);
> - bdw_enable_pipe_irq(i915, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);
> + bdw_enable_pipe_irq(display, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);
> spin_unlock_irq(&i915->irq_lock);
> }
>
> static void
> bdw_primary_disable_flip_done(struct intel_plane *plane)
> {
> + struct intel_display *display = to_intel_display(plane);
> struct drm_i915_private *i915 = to_i915(plane->base.dev);
> enum pipe pipe = plane->pipe;
>
> spin_lock_irq(&i915->irq_lock);
> - bdw_disable_pipe_irq(i915, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);
> + bdw_disable_pipe_irq(display, pipe, GEN8_PIPE_PRIMARY_FLIP_DONE);
> spin_unlock_irq(&i915->irq_lock);
> }
>
> static void
> ivb_primary_enable_flip_done(struct intel_plane *plane)
> {
> + struct intel_display *display = to_intel_display(plane);
> struct drm_i915_private *i915 = to_i915(plane->base.dev);
>
> spin_lock_irq(&i915->irq_lock);
> - ilk_enable_display_irq(i915, DE_PLANE_FLIP_DONE_IVB(plane-
> >i9xx_plane));
> + ilk_enable_display_irq(display, DE_PLANE_FLIP_DONE_IVB(plane-
> >i9xx_plane));
> spin_unlock_irq(&i915->irq_lock);
> }
>
> static void
> ivb_primary_disable_flip_done(struct intel_plane *plane)
> {
> + struct intel_display *display = to_intel_display(plane);
> struct drm_i915_private *i915 = to_i915(plane->base.dev);
>
> spin_lock_irq(&i915->irq_lock);
> - ilk_disable_display_irq(i915, DE_PLANE_FLIP_DONE_IVB(plane-
> >i9xx_plane));
> + ilk_disable_display_irq(display, DE_PLANE_FLIP_DONE_IVB(plane-
> >i9xx_plane));
> spin_unlock_irq(&i915->irq_lock);
> }
>
> static void
> ilk_primary_enable_flip_done(struct intel_plane *plane)
> {
> + struct intel_display *display = to_intel_display(plane);
> struct drm_i915_private *i915 = to_i915(plane->base.dev);
>
> spin_lock_irq(&i915->irq_lock);
> - ilk_enable_display_irq(i915, DE_PLANE_FLIP_DONE(plane->i9xx_plane));
> + ilk_enable_display_irq(display, DE_PLANE_FLIP_DONE(plane-
> >i9xx_plane));
> spin_unlock_irq(&i915->irq_lock);
> }
>
> static void
> ilk_primary_disable_flip_done(struct intel_plane *plane)
> {
> + struct intel_display *display = to_intel_display(plane);
> struct drm_i915_private *i915 = to_i915(plane->base.dev);
>
> spin_lock_irq(&i915->irq_lock);
> - ilk_disable_display_irq(i915, DE_PLANE_FLIP_DONE(plane->i9xx_plane));
> + ilk_disable_display_irq(display, DE_PLANE_FLIP_DONE(plane-
> >i9xx_plane));
> spin_unlock_irq(&i915->irq_lock);
> }
>
> static void
> vlv_primary_enable_flip_done(struct intel_plane *plane)
> {
> + struct intel_display *display = to_intel_display(plane);
> struct drm_i915_private *i915 = to_i915(plane->base.dev);
> enum pipe pipe = plane->pipe;
>
> spin_lock_irq(&i915->irq_lock);
> - i915_enable_pipestat(i915, pipe, PLANE_FLIP_DONE_INT_STATUS_VLV);
> + i915_enable_pipestat(display, pipe,
> PLANE_FLIP_DONE_INT_STATUS_VLV);
> spin_unlock_irq(&i915->irq_lock);
> }
>
> static void
> vlv_primary_disable_flip_done(struct intel_plane *plane)
> {
> + struct intel_display *display = to_intel_display(plane);
> struct drm_i915_private *i915 = to_i915(plane->base.dev);
> enum pipe pipe = plane->pipe;
>
> spin_lock_irq(&i915->irq_lock);
> - i915_disable_pipestat(i915, pipe, PLANE_FLIP_DONE_INT_STATUS_VLV);
> + i915_disable_pipestat(display, pipe,
> PLANE_FLIP_DONE_INT_STATUS_VLV);
> spin_unlock_irq(&i915->irq_lock);
> }
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c
> b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index ae60ccb21520..f76a3a9d66b4 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -193,7 +193,7 @@ void intel_display_driver_early_probe(struct intel_display
> *display)
> mutex_init(&display->pps.mutex);
> mutex_init(&display->hdcp.hdcp_mutex);
>
> - intel_display_irq_init(i915);
> + intel_display_irq_init(display);
> intel_dkl_phy_init(display);
> intel_color_init_hooks(display);
> intel_init_cdclk_hooks(display);
> diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c
> b/drivers/gpu/drm/i915/display/intel_display_irq.c
> index b37bcb8fb2e8..68f903c35978 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_irq.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
> @@ -125,14 +125,14 @@ intel_handle_vblank(struct drm_i915_private
> *dev_priv, enum pipe pipe)
>
> /**
> * ilk_update_display_irq - update DEIMR
> - * @dev_priv: driver private
> + * @display: display device
> * @interrupt_mask: mask of interrupt bits to update
> * @enabled_irq_mask: mask of interrupt bits to enable
> */
> -void ilk_update_display_irq(struct drm_i915_private *dev_priv,
> +void ilk_update_display_irq(struct intel_display *display,
> u32 interrupt_mask, u32 enabled_irq_mask)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 new_val;
>
> lockdep_assert_held(&dev_priv->irq_lock);
> @@ -150,26 +150,26 @@ void ilk_update_display_irq(struct drm_i915_private
> *dev_priv,
> }
> }
>
> -void ilk_enable_display_irq(struct drm_i915_private *i915, u32 bits)
> +void ilk_enable_display_irq(struct intel_display *display, u32 bits)
> {
> - ilk_update_display_irq(i915, bits, bits);
> + ilk_update_display_irq(display, bits, bits);
> }
>
> -void ilk_disable_display_irq(struct drm_i915_private *i915, u32 bits)
> +void ilk_disable_display_irq(struct intel_display *display, u32 bits)
> {
> - ilk_update_display_irq(i915, bits, 0);
> + ilk_update_display_irq(display, bits, 0);
> }
>
> /**
> * bdw_update_port_irq - update DE port interrupt
> - * @dev_priv: driver private
> + * @display: display device
> * @interrupt_mask: mask of interrupt bits to update
> * @enabled_irq_mask: mask of interrupt bits to enable
> */
> -void bdw_update_port_irq(struct drm_i915_private *dev_priv,
> +void bdw_update_port_irq(struct intel_display *display,
> u32 interrupt_mask, u32 enabled_irq_mask)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 new_val;
> u32 old_val;
>
> @@ -194,16 +194,16 @@ void bdw_update_port_irq(struct drm_i915_private
> *dev_priv,
>
> /**
> * bdw_update_pipe_irq - update DE pipe interrupt
> - * @dev_priv: driver private
> + * @display: display device
> * @pipe: pipe whose interrupt to update
> * @interrupt_mask: mask of interrupt bits to update
> * @enabled_irq_mask: mask of interrupt bits to enable
> */
> -static void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,
> +static void bdw_update_pipe_irq(struct intel_display *display,
> enum pipe pipe, u32 interrupt_mask,
> u32 enabled_irq_mask)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 new_val;
>
> lockdep_assert_held(&dev_priv->irq_lock);
> @@ -224,29 +224,29 @@ static void bdw_update_pipe_irq(struct
> drm_i915_private *dev_priv,
> }
> }
>
> -void bdw_enable_pipe_irq(struct drm_i915_private *i915,
> +void bdw_enable_pipe_irq(struct intel_display *display,
> enum pipe pipe, u32 bits)
> {
> - bdw_update_pipe_irq(i915, pipe, bits, bits);
> + bdw_update_pipe_irq(display, pipe, bits, bits);
> }
>
> -void bdw_disable_pipe_irq(struct drm_i915_private *i915,
> +void bdw_disable_pipe_irq(struct intel_display *display,
> enum pipe pipe, u32 bits)
> {
> - bdw_update_pipe_irq(i915, pipe, bits, 0);
> + bdw_update_pipe_irq(display, pipe, bits, 0);
> }
>
> /**
> * ibx_display_interrupt_update - update SDEIMR
> - * @dev_priv: driver private
> + * @display: display device
> * @interrupt_mask: mask of interrupt bits to update
> * @enabled_irq_mask: mask of interrupt bits to enable
> */
> -void ibx_display_interrupt_update(struct drm_i915_private *dev_priv,
> +void ibx_display_interrupt_update(struct intel_display *display,
> u32 interrupt_mask,
> u32 enabled_irq_mask)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 sdeimr = intel_de_read(display, SDEIMR);
>
> sdeimr &= ~interrupt_mask;
> @@ -263,14 +263,14 @@ void ibx_display_interrupt_update(struct
> drm_i915_private *dev_priv,
> intel_de_posting_read(display, SDEIMR);
> }
>
> -void ibx_enable_display_interrupt(struct drm_i915_private *i915, u32 bits)
> +void ibx_enable_display_interrupt(struct intel_display *display, u32 bits)
> {
> - ibx_display_interrupt_update(i915, bits, bits);
> + ibx_display_interrupt_update(display, bits, bits);
> }
>
> -void ibx_disable_display_interrupt(struct drm_i915_private *i915, u32 bits)
> +void ibx_disable_display_interrupt(struct intel_display *display, u32 bits)
> {
> - ibx_display_interrupt_update(i915, bits, 0);
> + ibx_display_interrupt_update(display, bits, 0);
> }
>
> u32 i915_pipestat_enable_mask(struct intel_display *display,
> @@ -318,10 +318,10 @@ u32 i915_pipestat_enable_mask(struct intel_display
> *display,
> return enable_mask;
> }
>
> -void i915_enable_pipestat(struct drm_i915_private *dev_priv,
> +void i915_enable_pipestat(struct intel_display *display,
> enum pipe pipe, u32 status_mask)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> i915_reg_t reg = PIPESTAT(dev_priv, pipe);
> u32 enable_mask;
>
> @@ -342,10 +342,10 @@ void i915_enable_pipestat(struct drm_i915_private
> *dev_priv,
> intel_de_posting_read(display, reg);
> }
>
> -void i915_disable_pipestat(struct drm_i915_private *dev_priv,
> +void i915_disable_pipestat(struct intel_display *display,
> enum pipe pipe, u32 status_mask)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> i915_reg_t reg = PIPESTAT(dev_priv, pipe);
> u32 enable_mask;
>
> @@ -381,11 +381,11 @@ static bool i915_has_legacy_blc_interrupt(struct
> intel_display *display)
>
> /**
> * i915_enable_asle_pipestat - enable ASLE pipestat for OpRegion
> - * @dev_priv: i915 device private
> + * @display: display device
> */
> -void i915_enable_asle_pipestat(struct drm_i915_private *dev_priv)
> +void i915_enable_asle_pipestat(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
>
> if (!intel_opregion_asle_present(display))
> return;
> @@ -395,9 +395,9 @@ void i915_enable_asle_pipestat(struct drm_i915_private
> *dev_priv)
>
> spin_lock_irq(&dev_priv->irq_lock);
>
> - i915_enable_pipestat(dev_priv, PIPE_B,
> PIPE_LEGACY_BLC_EVENT_STATUS);
> + i915_enable_pipestat(display, PIPE_B,
> PIPE_LEGACY_BLC_EVENT_STATUS);
> if (DISPLAY_VER(dev_priv) >= 4)
> - i915_enable_pipestat(dev_priv, PIPE_A,
> + i915_enable_pipestat(display, PIPE_A,
> PIPE_LEGACY_BLC_EVENT_STATUS);
>
> spin_unlock_irq(&dev_priv->irq_lock);
> @@ -524,10 +524,10 @@ static void i9xx_pipestat_irq_reset(struct
> drm_i915_private *dev_priv)
> }
> }
>
> -void i9xx_pipestat_irq_ack(struct drm_i915_private *dev_priv,
> +void i9xx_pipestat_irq_ack(struct intel_display *display,
> u32 iir, u32 pipe_stats[I915_MAX_PIPES])
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> enum pipe pipe;
>
> spin_lock(&dev_priv->irq_lock);
> @@ -592,10 +592,10 @@ void i9xx_pipestat_irq_ack(struct drm_i915_private
> *dev_priv,
> spin_unlock(&dev_priv->irq_lock);
> }
>
> -void i915_pipestat_irq_handler(struct drm_i915_private *dev_priv,
> +void i915_pipestat_irq_handler(struct intel_display *display,
> u32 iir, u32 pipe_stats[I915_MAX_PIPES])
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> bool blc_event = false;
> enum pipe pipe;
>
> @@ -617,10 +617,10 @@ void i915_pipestat_irq_handler(struct
> drm_i915_private *dev_priv,
> intel_opregion_asle_intr(display);
> }
>
> -void i965_pipestat_irq_handler(struct drm_i915_private *dev_priv,
> +void i965_pipestat_irq_handler(struct intel_display *display,
> u32 iir, u32 pipe_stats[I915_MAX_PIPES])
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> bool blc_event = false;
> enum pipe pipe;
>
> @@ -645,10 +645,10 @@ void i965_pipestat_irq_handler(struct
> drm_i915_private *dev_priv,
> intel_gmbus_irq_handler(display);
> }
>
> -void valleyview_pipestat_irq_handler(struct drm_i915_private *dev_priv,
> +void valleyview_pipestat_irq_handler(struct intel_display *display,
> u32 pipe_stats[I915_MAX_PIPES])
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> enum pipe pipe;
>
> for_each_pipe(dev_priv, pipe) {
> @@ -894,9 +894,9 @@ static void ilk_gtt_fault_irq_handler(struct intel_display
> *display)
> }
> }
>
> -void ilk_display_irq_handler(struct drm_i915_private *dev_priv, u32 de_iir)
> +void ilk_display_irq_handler(struct intel_display *display, u32 de_iir)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> enum pipe pipe;
> u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG;
>
> @@ -946,9 +946,9 @@ void ilk_display_irq_handler(struct drm_i915_private
> *dev_priv, u32 de_iir)
> gen5_rps_irq_handler(&to_gt(dev_priv)->rps);
> }
>
> -void ivb_display_irq_handler(struct drm_i915_private *dev_priv, u32 de_iir)
> +void ivb_display_irq_handler(struct intel_display *display, u32 de_iir)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> enum pipe pipe;
> u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG_IVB;
>
> @@ -1359,9 +1359,9 @@ static void gen8_read_and_ack_pch_irqs(struct
> drm_i915_private *i915, u32 *pch_i
> intel_de_write(display, PICAINTERRUPT_IER, pica_ier);
> }
>
> -void gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
> +void gen8_de_irq_handler(struct intel_display *display, u32 master_ctl)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 iir;
> enum pipe pipe;
>
> @@ -1517,9 +1517,8 @@ void gen8_de_irq_handler(struct drm_i915_private
> *dev_priv, u32 master_ctl)
> }
> }
>
> -u32 gen11_gu_misc_irq_ack(struct drm_i915_private *i915, const u32
> master_ctl)
> +u32 gen11_gu_misc_irq_ack(struct intel_display *display, const u32 master_ctl)
> {
> - struct intel_display *display = &i915->display;
> u32 iir;
>
> if (!(master_ctl & GEN11_GU_MISC_IRQ))
> @@ -1532,17 +1531,15 @@ u32 gen11_gu_misc_irq_ack(struct
> drm_i915_private *i915, const u32 master_ctl)
> return iir;
> }
>
> -void gen11_gu_misc_irq_handler(struct drm_i915_private *i915, const u32 iir)
> +void gen11_gu_misc_irq_handler(struct intel_display *display, const u32 iir)
> {
> - struct intel_display *display = &i915->display;
> -
> if (iir & GEN11_GU_MISC_GSE)
> intel_opregion_asle_intr(display);
> }
>
> -void gen11_display_irq_handler(struct drm_i915_private *i915)
> +void gen11_display_irq_handler(struct intel_display *display)
> {
> - struct intel_display *display = &i915->display;
> + struct drm_i915_private *i915 = to_i915(display->drm);
> u32 disp_ctl;
>
> disable_rpm_wakeref_asserts(&i915->runtime_pm);
> @@ -1553,7 +1550,7 @@ void gen11_display_irq_handler(struct
> drm_i915_private *i915)
> disp_ctl = intel_de_read(display, GEN11_DISPLAY_INT_CTL);
>
> intel_de_write(display, GEN11_DISPLAY_INT_CTL, 0);
> - gen8_de_irq_handler(i915, disp_ctl);
> + gen8_de_irq_handler(display, disp_ctl);
> intel_de_write(display, GEN11_DISPLAY_INT_CTL,
> GEN11_DISPLAY_IRQ_ENABLE);
>
> enable_rpm_wakeref_asserts(&i915->runtime_pm);
> @@ -1585,8 +1582,10 @@ static void i915gm_irq_cstate_wa_disable(struct
> drm_i915_private *i915)
>
> _MASKED_BIT_DISABLE(CSTATE_RENDER_CLOCK_GATE_DISABLE));
> }
>
> -void i915gm_irq_cstate_wa(struct drm_i915_private *i915, bool enable)
> +void i915gm_irq_cstate_wa(struct intel_display *display, bool enable)
> {
> + struct drm_i915_private *i915 = to_i915(display->drm);
> +
> spin_lock_irq(&i915->drm.vblank_time_lock);
>
> if (enable)
> @@ -1599,12 +1598,13 @@ void i915gm_irq_cstate_wa(struct
> drm_i915_private *i915, bool enable)
>
> int i8xx_enable_vblank(struct drm_crtc *crtc)
> {
> + struct intel_display *display = to_intel_display(crtc->dev);
> struct drm_i915_private *dev_priv = to_i915(crtc->dev);
> enum pipe pipe = to_intel_crtc(crtc)->pipe;
> unsigned long irqflags;
>
> spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> - i915_enable_pipestat(dev_priv, pipe,
> PIPE_VBLANK_INTERRUPT_STATUS);
> + i915_enable_pipestat(display, pipe, PIPE_VBLANK_INTERRUPT_STATUS);
> spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
>
> return 0;
> @@ -1612,12 +1612,13 @@ int i8xx_enable_vblank(struct drm_crtc *crtc)
>
> void i8xx_disable_vblank(struct drm_crtc *crtc)
> {
> + struct intel_display *display = to_intel_display(crtc->dev);
> struct drm_i915_private *dev_priv = to_i915(crtc->dev);
> enum pipe pipe = to_intel_crtc(crtc)->pipe;
> unsigned long irqflags;
>
> spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> - i915_disable_pipestat(dev_priv, pipe,
> PIPE_VBLANK_INTERRUPT_STATUS);
> + i915_disable_pipestat(display, pipe, PIPE_VBLANK_INTERRUPT_STATUS);
> spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
> }
>
> @@ -1641,12 +1642,13 @@ void i915gm_disable_vblank(struct drm_crtc *crtc)
>
> int i965_enable_vblank(struct drm_crtc *crtc)
> {
> + struct intel_display *display = to_intel_display(crtc->dev);
> struct drm_i915_private *dev_priv = to_i915(crtc->dev);
> enum pipe pipe = to_intel_crtc(crtc)->pipe;
> unsigned long irqflags;
>
> spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> - i915_enable_pipestat(dev_priv, pipe,
> + i915_enable_pipestat(display, pipe,
> PIPE_START_VBLANK_INTERRUPT_STATUS);
> spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
>
> @@ -1655,18 +1657,20 @@ int i965_enable_vblank(struct drm_crtc *crtc)
>
> void i965_disable_vblank(struct drm_crtc *crtc)
> {
> + struct intel_display *display = to_intel_display(crtc->dev);
> struct drm_i915_private *dev_priv = to_i915(crtc->dev);
> enum pipe pipe = to_intel_crtc(crtc)->pipe;
> unsigned long irqflags;
>
> spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> - i915_disable_pipestat(dev_priv, pipe,
> + i915_disable_pipestat(display, pipe,
> PIPE_START_VBLANK_INTERRUPT_STATUS);
> spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
> }
>
> int ilk_enable_vblank(struct drm_crtc *crtc)
> {
> + struct intel_display *display = to_intel_display(crtc->dev);
> struct drm_i915_private *dev_priv = to_i915(crtc->dev);
> enum pipe pipe = to_intel_crtc(crtc)->pipe;
> unsigned long irqflags;
> @@ -1674,7 +1678,7 @@ int ilk_enable_vblank(struct drm_crtc *crtc)
> DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe);
>
> spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> - ilk_enable_display_irq(dev_priv, bit);
> + ilk_enable_display_irq(display, bit);
> spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
>
> /* Even though there is no DMC, frame counter can get stuck when
> @@ -1688,6 +1692,7 @@ int ilk_enable_vblank(struct drm_crtc *crtc)
>
> void ilk_disable_vblank(struct drm_crtc *crtc)
> {
> + struct intel_display *display = to_intel_display(crtc->dev);
> struct drm_i915_private *dev_priv = to_i915(crtc->dev);
> enum pipe pipe = to_intel_crtc(crtc)->pipe;
> unsigned long irqflags;
> @@ -1695,7 +1700,7 @@ void ilk_disable_vblank(struct drm_crtc *crtc)
> DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe);
>
> spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> - ilk_disable_display_irq(dev_priv, bit);
> + ilk_disable_display_irq(display, bit);
> spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
> }
>
> @@ -1753,7 +1758,7 @@ int bdw_enable_vblank(struct drm_crtc *_crtc)
> schedule_work(&display->irq.vblank_dc_work);
>
> spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> - bdw_enable_pipe_irq(dev_priv, pipe, GEN8_PIPE_VBLANK);
> + bdw_enable_pipe_irq(display, pipe, GEN8_PIPE_VBLANK);
> spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
>
> /* Even if there is no DMC, frame counter can get stuck when
> @@ -1777,7 +1782,7 @@ void bdw_disable_vblank(struct drm_crtc *_crtc)
> return;
>
> spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> - bdw_disable_pipe_irq(dev_priv, pipe, GEN8_PIPE_VBLANK);
> + bdw_disable_pipe_irq(display, pipe, GEN8_PIPE_VBLANK);
> spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
>
> if (crtc->block_dc_for_vblank && --display->irq.vblank_wa_num_pipes
> == 0)
> @@ -1913,15 +1918,17 @@ static void _vlv_display_irq_reset(struct
> drm_i915_private *dev_priv)
> dev_priv->irq_mask = ~0u;
> }
>
> -void vlv_display_irq_reset(struct drm_i915_private *dev_priv)
> +void vlv_display_irq_reset(struct intel_display *display)
> {
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> +
> if (dev_priv->display.irq.vlv_display_irqs_enabled)
> _vlv_display_irq_reset(dev_priv);
> }
>
> -void i9xx_display_irq_reset(struct drm_i915_private *i915)
> +void i9xx_display_irq_reset(struct intel_display *display)
> {
> - struct intel_display *display = &i915->display;
> + struct drm_i915_private *i915 = to_i915(display->drm);
>
> if (I915_HAS_HOTPLUG(i915)) {
> i915_hotplug_interrupt_update(display, 0xffffffff, 0);
> @@ -1937,9 +1944,9 @@ static u32 vlv_error_mask(void)
> return VLV_ERROR_PAGE_TABLE;
> }
>
> -void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
> +void vlv_display_irq_postinstall(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 pipestat_mask;
> u32 enable_mask;
> enum pipe pipe;
> @@ -1961,9 +1968,9 @@ void vlv_display_irq_postinstall(struct
> drm_i915_private *dev_priv)
>
> pipestat_mask = PIPE_CRC_DONE_INTERRUPT_STATUS;
>
> - i915_enable_pipestat(dev_priv, PIPE_A,
> PIPE_GMBUS_INTERRUPT_STATUS);
> + i915_enable_pipestat(display, PIPE_A,
> PIPE_GMBUS_INTERRUPT_STATUS);
> for_each_pipe(dev_priv, pipe)
> - i915_enable_pipestat(dev_priv, pipe, pipestat_mask);
> + i915_enable_pipestat(display, pipe, pipestat_mask);
>
> enable_mask = I915_DISPLAY_PORT_INTERRUPT |
> I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
> @@ -1983,9 +1990,9 @@ void vlv_display_irq_postinstall(struct
> drm_i915_private *dev_priv)
> intel_display_irq_regs_init(display, VLV_IRQ_REGS, dev_priv->irq_mask,
> enable_mask);
> }
>
> -void gen8_display_irq_reset(struct drm_i915_private *dev_priv)
> +void gen8_display_irq_reset(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> enum pipe pipe;
>
> if (!HAS_DISPLAY(dev_priv))
> @@ -2003,9 +2010,9 @@ void gen8_display_irq_reset(struct drm_i915_private
> *dev_priv)
> intel_display_irq_regs_reset(display, GEN8_DE_MISC_IRQ_REGS);
> }
>
> -void gen11_display_irq_reset(struct drm_i915_private *dev_priv)
> +void gen11_display_irq_reset(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> enum pipe pipe;
> u32 trans_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) |
> BIT(TRANSCODER_C) | BIT(TRANSCODER_D);
> @@ -2054,10 +2061,10 @@ void gen11_display_irq_reset(struct
> drm_i915_private *dev_priv)
> intel_display_irq_regs_reset(display, SDE_IRQ_REGS);
> }
>
> -void gen8_irq_power_well_post_enable(struct drm_i915_private *dev_priv,
> +void gen8_irq_power_well_post_enable(struct intel_display *display,
> u8 pipe_mask)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 extra_ier = GEN8_PIPE_VBLANK | GEN8_PIPE_FIFO_UNDERRUN |
> gen8_de_pipe_flip_done_mask(dev_priv);
> enum pipe pipe;
> @@ -2077,10 +2084,10 @@ void gen8_irq_power_well_post_enable(struct
> drm_i915_private *dev_priv,
> spin_unlock_irq(&dev_priv->irq_lock);
> }
>
> -void gen8_irq_power_well_pre_disable(struct drm_i915_private *dev_priv,
> +void gen8_irq_power_well_pre_disable(struct intel_display *display,
> u8 pipe_mask)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> enum pipe pipe;
>
> spin_lock_irq(&dev_priv->irq_lock);
> @@ -2128,8 +2135,10 @@ static void ibx_irq_postinstall(struct
> drm_i915_private *dev_priv)
> intel_display_irq_regs_init(display, SDE_IRQ_REGS, ~mask, 0xffffffff);
> }
>
> -void valleyview_enable_display_irqs(struct drm_i915_private *dev_priv)
> +void valleyview_enable_display_irqs(struct intel_display *display)
> {
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> +
> lockdep_assert_held(&dev_priv->irq_lock);
>
> if (dev_priv->display.irq.vlv_display_irqs_enabled)
> @@ -2139,12 +2148,14 @@ void valleyview_enable_display_irqs(struct
> drm_i915_private *dev_priv)
>
> if (intel_irqs_enabled(dev_priv)) {
> _vlv_display_irq_reset(dev_priv);
> - vlv_display_irq_postinstall(dev_priv);
> + vlv_display_irq_postinstall(display);
> }
> }
>
> -void valleyview_disable_display_irqs(struct drm_i915_private *dev_priv)
> +void valleyview_disable_display_irqs(struct intel_display *display)
> {
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> +
> lockdep_assert_held(&dev_priv->irq_lock);
>
> if (!dev_priv->display.irq.vlv_display_irqs_enabled)
> @@ -2156,9 +2167,10 @@ void valleyview_disable_display_irqs(struct
> drm_i915_private *dev_priv)
> _vlv_display_irq_reset(dev_priv);
> }
>
> -void ilk_de_irq_postinstall(struct drm_i915_private *i915)
> +void ilk_de_irq_postinstall(struct intel_display *display)
> {
> - struct intel_display *display = &i915->display;
> + struct drm_i915_private *i915 = to_i915(display->drm);
> +
> u32 display_mask, extra_mask;
>
> if (DISPLAY_VER(i915) >= 7) {
> @@ -2201,9 +2213,9 @@ void ilk_de_irq_postinstall(struct drm_i915_private
> *i915)
> static void mtp_irq_postinstall(struct drm_i915_private *i915);
> static void icp_irq_postinstall(struct drm_i915_private *i915);
>
> -void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
> +void gen8_de_irq_postinstall(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
>
> u32 de_pipe_masked = gen8_de_pipe_fault_mask(dev_priv) |
> GEN8_PIPE_CDCLK_CRC_DONE;
> @@ -2323,33 +2335,27 @@ static void icp_irq_postinstall(struct
> drm_i915_private *dev_priv)
> intel_display_irq_regs_init(display, SDE_IRQ_REGS, ~mask, 0xffffffff);
> }
>
> -void gen11_de_irq_postinstall(struct drm_i915_private *dev_priv)
> +void gen11_de_irq_postinstall(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> -
> - if (!HAS_DISPLAY(dev_priv))
> + if (!HAS_DISPLAY(display))
> return;
>
> - gen8_de_irq_postinstall(dev_priv);
> + gen8_de_irq_postinstall(display);
>
> intel_de_write(display, GEN11_DISPLAY_INT_CTL,
> GEN11_DISPLAY_IRQ_ENABLE);
> }
>
> -void dg1_de_irq_postinstall(struct drm_i915_private *i915)
> +void dg1_de_irq_postinstall(struct intel_display *display)
> {
> - struct intel_display *display = &i915->display;
> -
> - if (!HAS_DISPLAY(i915))
> + if (!HAS_DISPLAY(display))
> return;
>
> - gen8_de_irq_postinstall(i915);
> + gen8_de_irq_postinstall(display);
> intel_de_write(display, GEN11_DISPLAY_INT_CTL,
> GEN11_DISPLAY_IRQ_ENABLE);
> }
>
> -void intel_display_irq_init(struct drm_i915_private *i915)
> +void intel_display_irq_init(struct intel_display *display)
> {
> - struct intel_display *display = &i915->display;
> -
> display->drm->vblank_disable_immediate = true;
>
> intel_hotplug_irq_init(display);
> diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.h
> b/drivers/gpu/drm/i915/display/intel_display_irq.h
> index d9867cd0a220..f72727768351 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_irq.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_irq.h
> @@ -12,28 +12,27 @@
>
> enum pipe;
> struct drm_crtc;
> -struct drm_i915_private;
> struct intel_display;
>
> -void valleyview_enable_display_irqs(struct drm_i915_private *i915);
> -void valleyview_disable_display_irqs(struct drm_i915_private *i915);
> +void valleyview_enable_display_irqs(struct intel_display *display);
> +void valleyview_disable_display_irqs(struct intel_display *display);
>
> -void ilk_update_display_irq(struct drm_i915_private *i915,
> +void ilk_update_display_irq(struct intel_display *display,
> u32 interrupt_mask, u32 enabled_irq_mask);
> -void ilk_enable_display_irq(struct drm_i915_private *i915, u32 bits);
> -void ilk_disable_display_irq(struct drm_i915_private *i915, u32 bits);
> +void ilk_enable_display_irq(struct intel_display *display, u32 bits);
> +void ilk_disable_display_irq(struct intel_display *display, u32 bits);
>
> -void bdw_update_port_irq(struct drm_i915_private *i915, u32 interrupt_mask,
> u32 enabled_irq_mask);
> -void bdw_enable_pipe_irq(struct drm_i915_private *i915, enum pipe pipe, u32
> bits);
> -void bdw_disable_pipe_irq(struct drm_i915_private *i915, enum pipe pipe, u32
> bits);
> +void bdw_update_port_irq(struct intel_display *display, u32 interrupt_mask, u32
> enabled_irq_mask);
> +void bdw_enable_pipe_irq(struct intel_display *display, enum pipe pipe, u32
> bits);
> +void bdw_disable_pipe_irq(struct intel_display *display, enum pipe pipe, u32
> bits);
>
> -void ibx_display_interrupt_update(struct drm_i915_private *i915,
> +void ibx_display_interrupt_update(struct intel_display *display,
> u32 interrupt_mask, u32 enabled_irq_mask);
> -void ibx_enable_display_interrupt(struct drm_i915_private *i915, u32 bits);
> -void ibx_disable_display_interrupt(struct drm_i915_private *i915, u32 bits);
> +void ibx_enable_display_interrupt(struct intel_display *display, u32 bits);
> +void ibx_disable_display_interrupt(struct intel_display *display, u32 bits);
>
> -void gen8_irq_power_well_post_enable(struct drm_i915_private *i915, u8
> pipe_mask);
> -void gen8_irq_power_well_pre_disable(struct drm_i915_private *i915, u8
> pipe_mask);
> +void gen8_irq_power_well_post_enable(struct intel_display *display, u8
> pipe_mask);
> +void gen8_irq_power_well_pre_disable(struct intel_display *display, u8
> pipe_mask);
>
> int i8xx_enable_vblank(struct drm_crtc *crtc);
> int i915gm_enable_vblank(struct drm_crtc *crtc);
> @@ -46,41 +45,41 @@ void i965_disable_vblank(struct drm_crtc *crtc);
> void ilk_disable_vblank(struct drm_crtc *crtc);
> void bdw_disable_vblank(struct drm_crtc *crtc);
>
> -void ivb_display_irq_handler(struct drm_i915_private *i915, u32 de_iir);
> -void ilk_display_irq_handler(struct drm_i915_private *i915, u32 de_iir);
> -void gen8_de_irq_handler(struct drm_i915_private *i915, u32 master_ctl);
> -void gen11_display_irq_handler(struct drm_i915_private *i915);
> +void ivb_display_irq_handler(struct intel_display *display, u32 de_iir);
> +void ilk_display_irq_handler(struct intel_display *display, u32 de_iir);
> +void gen8_de_irq_handler(struct intel_display *display, u32 master_ctl);
> +void gen11_display_irq_handler(struct intel_display *display);
>
> -u32 gen11_gu_misc_irq_ack(struct drm_i915_private *i915, const u32
> master_ctl);
> -void gen11_gu_misc_irq_handler(struct drm_i915_private *i915, const u32 iir);
> +u32 gen11_gu_misc_irq_ack(struct intel_display *display, const u32 master_ctl);
> +void gen11_gu_misc_irq_handler(struct intel_display *display, const u32 iir);
>
> -void i9xx_display_irq_reset(struct drm_i915_private *i915);
> -void vlv_display_irq_reset(struct drm_i915_private *i915);
> -void gen8_display_irq_reset(struct drm_i915_private *i915);
> -void gen11_display_irq_reset(struct drm_i915_private *i915);
> +void i9xx_display_irq_reset(struct intel_display *display);
> +void vlv_display_irq_reset(struct intel_display *display);
> +void gen8_display_irq_reset(struct intel_display *display);
> +void gen11_display_irq_reset(struct intel_display *display);
>
> -void vlv_display_irq_postinstall(struct drm_i915_private *i915);
> -void ilk_de_irq_postinstall(struct drm_i915_private *i915);
> -void gen8_de_irq_postinstall(struct drm_i915_private *i915);
> -void gen11_de_irq_postinstall(struct drm_i915_private *i915);
> -void dg1_de_irq_postinstall(struct drm_i915_private *i915);
> +void vlv_display_irq_postinstall(struct intel_display *display);
> +void ilk_de_irq_postinstall(struct intel_display *display);
> +void gen8_de_irq_postinstall(struct intel_display *display);
> +void gen11_de_irq_postinstall(struct intel_display *display);
> +void dg1_de_irq_postinstall(struct intel_display *display);
>
> u32 i915_pipestat_enable_mask(struct intel_display *display, enum pipe pipe);
> -void i915_enable_pipestat(struct drm_i915_private *i915, enum pipe pipe, u32
> status_mask);
> -void i915_disable_pipestat(struct drm_i915_private *i915, enum pipe pipe, u32
> status_mask);
> -void i915_enable_asle_pipestat(struct drm_i915_private *i915);
> +void i915_enable_pipestat(struct intel_display *display, enum pipe pipe, u32
> status_mask);
> +void i915_disable_pipestat(struct intel_display *display, enum pipe pipe, u32
> status_mask);
> +void i915_enable_asle_pipestat(struct intel_display *display);
>
> -void i9xx_pipestat_irq_ack(struct drm_i915_private *i915, u32 iir, u32
> pipe_stats[I915_MAX_PIPES]);
> +void i9xx_pipestat_irq_ack(struct intel_display *display, u32 iir, u32
> pipe_stats[I915_MAX_PIPES]);
>
> -void i915_pipestat_irq_handler(struct drm_i915_private *i915, u32 iir, u32
> pipe_stats[I915_MAX_PIPES]);
> -void i965_pipestat_irq_handler(struct drm_i915_private *i915, u32 iir, u32
> pipe_stats[I915_MAX_PIPES]);
> -void valleyview_pipestat_irq_handler(struct drm_i915_private *i915, u32
> pipe_stats[I915_MAX_PIPES]);
> +void i915_pipestat_irq_handler(struct intel_display *display, u32 iir, u32
> pipe_stats[I915_MAX_PIPES]);
> +void i965_pipestat_irq_handler(struct intel_display *display, u32 iir, u32
> pipe_stats[I915_MAX_PIPES]);
> +void valleyview_pipestat_irq_handler(struct intel_display *display, u32
> pipe_stats[I915_MAX_PIPES]);
>
> void vlv_display_error_irq_ack(struct intel_display *display, u32 *eir, u32
> *dpinvgtt);
> void vlv_display_error_irq_handler(struct intel_display *display, u32 eir, u32
> dpinvgtt);
>
> -void intel_display_irq_init(struct drm_i915_private *i915);
> +void intel_display_irq_init(struct intel_display *display);
>
> -void i915gm_irq_cstate_wa(struct drm_i915_private *i915, bool enable);
> +void i915gm_irq_cstate_wa(struct intel_display *display, bool enable);
>
> #endif /* __INTEL_DISPLAY_IRQ_H__ */
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power_well.c
> b/drivers/gpu/drm/i915/display/intel_display_power_well.c
> index daf2a0cbb157..b03a95ef64da 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
> @@ -186,22 +186,18 @@ int intel_power_well_refcount(struct i915_power_well
> *power_well)
> static void hsw_power_well_post_enable(struct intel_display *display,
> u8 irq_pipe_mask, bool has_vga)
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> -
> if (has_vga)
> intel_vga_reset_io_mem(display);
>
> if (irq_pipe_mask)
> - gen8_irq_power_well_post_enable(dev_priv, irq_pipe_mask);
> + gen8_irq_power_well_post_enable(display, irq_pipe_mask);
> }
>
> static void hsw_power_well_pre_disable(struct intel_display *display,
> u8 irq_pipe_mask)
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> -
> if (irq_pipe_mask)
> - gen8_irq_power_well_pre_disable(dev_priv, irq_pipe_mask);
> + gen8_irq_power_well_pre_disable(display, irq_pipe_mask);
> }
>
> #define ICL_AUX_PW_TO_PHY(pw_idx) \
> @@ -1226,7 +1222,7 @@ static void vlv_display_power_well_init(struct
> intel_display *display)
> vlv_init_display_clock_gating(display);
>
> spin_lock_irq(&dev_priv->irq_lock);
> - valleyview_enable_display_irqs(dev_priv);
> + valleyview_enable_display_irqs(display);
> spin_unlock_irq(&dev_priv->irq_lock);
>
> /*
> @@ -1255,7 +1251,7 @@ static void vlv_display_power_well_deinit(struct
> intel_display *display)
> struct drm_i915_private *dev_priv = to_i915(display->drm);
>
> spin_lock_irq(&dev_priv->irq_lock);
> - valleyview_disable_display_irqs(dev_priv);
> + valleyview_disable_display_irqs(display);
> spin_unlock_irq(&dev_priv->irq_lock);
>
> /* make sure we're done processing display irqs */
> diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> index 7a8fbff39be0..3f47a3beb2e6 100644
> --- a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> +++ b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> @@ -136,14 +136,13 @@ static void i9xx_set_fifo_underrun_reporting(struct
> intel_display *display,
> static void ilk_set_fifo_underrun_reporting(struct intel_display *display,
> enum pipe pipe, bool enable)
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 bit = (pipe == PIPE_A) ?
> DE_PIPEA_FIFO_UNDERRUN : DE_PIPEB_FIFO_UNDERRUN;
>
> if (enable)
> - ilk_enable_display_irq(dev_priv, bit);
> + ilk_enable_display_irq(display, bit);
> else
> - ilk_disable_display_irq(dev_priv, bit);
> + ilk_disable_display_irq(display, bit);
> }
>
> static void ivb_check_fifo_underruns(struct intel_crtc *crtc)
> @@ -169,7 +168,6 @@ static void ivb_set_fifo_underrun_reporting(struct
> intel_display *display,
> enum pipe pipe, bool enable,
> bool old)
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> if (enable) {
> intel_de_write(display, GEN7_ERR_INT,
> ERR_INT_FIFO_UNDERRUN(pipe));
> @@ -177,9 +175,9 @@ static void ivb_set_fifo_underrun_reporting(struct
> intel_display *display,
> if (!ivb_can_enable_err_int(display))
> return;
>
> - ilk_enable_display_irq(dev_priv, DE_ERR_INT_IVB);
> + ilk_enable_display_irq(display, DE_ERR_INT_IVB);
> } else {
> - ilk_disable_display_irq(dev_priv, DE_ERR_INT_IVB);
> + ilk_disable_display_irq(display, DE_ERR_INT_IVB);
>
> if (old &&
> intel_de_read(display, GEN7_ERR_INT) &
> ERR_INT_FIFO_UNDERRUN(pipe)) {
> @@ -193,26 +191,23 @@ static void ivb_set_fifo_underrun_reporting(struct
> intel_display *display,
> static void bdw_set_fifo_underrun_reporting(struct intel_display *display,
> enum pipe pipe, bool enable)
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> -
> if (enable)
> - bdw_enable_pipe_irq(dev_priv, pipe,
> GEN8_PIPE_FIFO_UNDERRUN);
> + bdw_enable_pipe_irq(display, pipe,
> GEN8_PIPE_FIFO_UNDERRUN);
> else
> - bdw_disable_pipe_irq(dev_priv, pipe,
> GEN8_PIPE_FIFO_UNDERRUN);
> + bdw_disable_pipe_irq(display, pipe,
> GEN8_PIPE_FIFO_UNDERRUN);
> }
>
> static void ibx_set_fifo_underrun_reporting(struct intel_display *display,
> enum pipe pch_transcoder,
> bool enable)
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 bit = (pch_transcoder == PIPE_A) ?
> SDE_TRANSA_FIFO_UNDER : SDE_TRANSB_FIFO_UNDER;
>
> if (enable)
> - ibx_enable_display_interrupt(dev_priv, bit);
> + ibx_enable_display_interrupt(display, bit);
> else
> - ibx_disable_display_interrupt(dev_priv, bit);
> + ibx_disable_display_interrupt(display, bit);
> }
>
> static void cpt_check_pch_fifo_underruns(struct intel_crtc *crtc)
> @@ -240,8 +235,6 @@ static void cpt_set_fifo_underrun_reporting(struct
> intel_display *display,
> enum pipe pch_transcoder,
> bool enable, bool old)
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> -
> if (enable) {
> intel_de_write(display, SERR_INT,
>
> SERR_INT_TRANS_FIFO_UNDERRUN(pch_transcoder));
> @@ -249,9 +242,9 @@ static void cpt_set_fifo_underrun_reporting(struct
> intel_display *display,
> if (!cpt_can_enable_serr_int(display))
> return;
>
> - ibx_enable_display_interrupt(dev_priv, SDE_ERROR_CPT);
> + ibx_enable_display_interrupt(display, SDE_ERROR_CPT);
> } else {
> - ibx_disable_display_interrupt(dev_priv, SDE_ERROR_CPT);
> + ibx_disable_display_interrupt(display, SDE_ERROR_CPT);
>
> if (old && intel_de_read(display, SERR_INT) &
> SERR_INT_TRANS_FIFO_UNDERRUN(pch_transcoder)) {
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> index e44ae6acc55f..1bcff3a47745 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> @@ -758,13 +758,12 @@ static void ibx_hpd_enable_detection(struct
> intel_encoder *encoder)
>
> static void ibx_hpd_irq_setup(struct intel_display *display)
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> enabled_irqs = intel_hpd_enabled_irqs(display, display-
> >hotplug.pch_hpd);
> hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
>
> - ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
> + ibx_display_interrupt_update(display, hotplug_irqs, enabled_irqs);
>
> ibx_hpd_detection_setup(display);
> }
> @@ -847,7 +846,6 @@ static void icp_hpd_enable_detection(struct
> intel_encoder *encoder)
>
> static void icp_hpd_irq_setup(struct intel_display *display)
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> enabled_irqs = intel_hpd_enabled_irqs(display, display-
> >hotplug.pch_hpd);
> @@ -859,7 +857,7 @@ static void icp_hpd_irq_setup(struct intel_display
> *display)
> */
> intel_de_write(display, SHPD_FILTER_CNT, SHPD_FILTER_CNT_250);
>
> - ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
> + ibx_display_interrupt_update(display, hotplug_irqs, enabled_irqs);
>
> icp_ddi_hpd_detection_setup(display);
> icp_tc_hpd_detection_setup(display);
> @@ -1061,7 +1059,6 @@ static void mtp_hpd_enable_detection(struct
> intel_encoder *encoder)
>
> static void mtp_hpd_irq_setup(struct intel_display *display)
> {
> - struct drm_i915_private *i915 = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> enabled_irqs = intel_hpd_enabled_irqs(display, display-
> >hotplug.pch_hpd);
> @@ -1074,7 +1071,7 @@ static void mtp_hpd_irq_setup(struct intel_display
> *display)
> intel_de_write(display, SHPD_FILTER_CNT, SHPD_FILTER_CNT_250);
>
> mtp_hpd_invert(display);
> - ibx_display_interrupt_update(i915, hotplug_irqs, enabled_irqs);
> + ibx_display_interrupt_update(display, hotplug_irqs, enabled_irqs);
>
> mtp_ddi_hpd_detection_setup(display);
> mtp_tc_hpd_detection_setup(display);
> @@ -1082,13 +1079,12 @@ static void mtp_hpd_irq_setup(struct intel_display
> *display)
>
> static void xe2lpd_sde_hpd_irq_setup(struct intel_display *display)
> {
> - struct drm_i915_private *i915 = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> enabled_irqs = intel_hpd_enabled_irqs(display, display-
> >hotplug.pch_hpd);
> hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
>
> - ibx_display_interrupt_update(i915, hotplug_irqs, enabled_irqs);
> + ibx_display_interrupt_update(display, hotplug_irqs, enabled_irqs);
>
> mtp_ddi_hpd_detection_setup(display);
> mtp_tc_hpd_detection_setup(display);
> @@ -1248,7 +1244,7 @@ static void spt_hpd_irq_setup(struct intel_display
> *display)
> enabled_irqs = intel_hpd_enabled_irqs(display, display-
> >hotplug.pch_hpd);
> hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.pch_hpd);
>
> - ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
> + ibx_display_interrupt_update(display, hotplug_irqs, enabled_irqs);
>
> spt_hpd_detection_setup(display);
> }
> @@ -1300,16 +1296,15 @@ static void ilk_hpd_enable_detection(struct
> intel_encoder *encoder)
>
> static void ilk_hpd_irq_setup(struct intel_display *display)
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.hpd);
> hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.hpd);
>
> if (DISPLAY_VER(display) >= 8)
> - bdw_update_port_irq(dev_priv, hotplug_irqs, enabled_irqs);
> + bdw_update_port_irq(display, hotplug_irqs, enabled_irqs);
> else
> - ilk_update_display_irq(dev_priv, hotplug_irqs, enabled_irqs);
> + ilk_update_display_irq(display, hotplug_irqs, enabled_irqs);
>
> ilk_hpd_detection_setup(display);
>
> @@ -1373,13 +1368,12 @@ static void bxt_hpd_enable_detection(struct
> intel_encoder *encoder)
>
> static void bxt_hpd_irq_setup(struct intel_display *display)
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 hotplug_irqs, enabled_irqs;
>
> enabled_irqs = intel_hpd_enabled_irqs(display, display->hotplug.hpd);
> hotplug_irqs = intel_hpd_hotplug_irqs(display, display->hotplug.hpd);
>
> - bdw_update_port_irq(dev_priv, hotplug_irqs, enabled_irqs);
> + bdw_update_port_irq(display, hotplug_irqs, enabled_irqs);
>
> bxt_hpd_detection_setup(display);
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_pipe_crc.c
> b/drivers/gpu/drm/i915/display/intel_pipe_crc.c
> index 10e26c3db946..65f60615f387 100644
> --- a/drivers/gpu/drm/i915/display/intel_pipe_crc.c
> +++ b/drivers/gpu/drm/i915/display/intel_pipe_crc.c
> @@ -281,6 +281,7 @@ static int ilk_pipe_crc_ctl_reg(enum
> intel_pipe_crc_source *source,
> static void
> intel_crtc_crc_setup_workarounds(struct intel_crtc *crtc, bool enable)
> {
> + struct intel_display *display = to_intel_display(crtc);
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> struct intel_crtc_state *pipe_config;
> struct drm_atomic_state *state;
> @@ -288,7 +289,7 @@ intel_crtc_crc_setup_workarounds(struct intel_crtc
> *crtc, bool enable)
> int ret;
>
> if (IS_I945GM(dev_priv) || IS_I915GM(dev_priv))
> - i915gm_irq_cstate_wa(dev_priv, enable);
> + i915gm_irq_cstate_wa(display, enable);
>
> drm_modeset_acquire_init(&ctx, 0);
>
> diff --git a/drivers/gpu/drm/i915/display/intel_tv.c
> b/drivers/gpu/drm/i915/display/intel_tv.c
> index 5dbe857ea85b..2e3f3f0207e8 100644
> --- a/drivers/gpu/drm/i915/display/intel_tv.c
> +++ b/drivers/gpu/drm/i915/display/intel_tv.c
> @@ -1594,7 +1594,7 @@ intel_tv_detect_type(struct intel_tv *intel_tv,
> /* Disable TV interrupts around load detect or we'll recurse */
> if (connector->polled & DRM_CONNECTOR_POLL_HPD) {
> spin_lock_irq(&dev_priv->irq_lock);
> - i915_disable_pipestat(dev_priv, 0,
> + i915_disable_pipestat(display, 0,
> PIPE_HOTPLUG_INTERRUPT_STATUS |
> PIPE_HOTPLUG_TV_INTERRUPT_STATUS);
> spin_unlock_irq(&dev_priv->irq_lock);
> @@ -1669,7 +1669,7 @@ intel_tv_detect_type(struct intel_tv *intel_tv,
> /* Restore interrupt config */
> if (connector->polled & DRM_CONNECTOR_POLL_HPD) {
> spin_lock_irq(&dev_priv->irq_lock);
> - i915_enable_pipestat(dev_priv, 0,
> + i915_enable_pipestat(display, 0,
> PIPE_HOTPLUG_INTERRUPT_STATUS |
> PIPE_HOTPLUG_TV_INTERRUPT_STATUS);
> spin_unlock_irq(&dev_priv->irq_lock);
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 70e550539bb2..8739195aba69 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -2689,22 +2689,24 @@ static const struct drm_plane_funcs tgl_plane_funcs
> = {
> static void
> skl_plane_enable_flip_done(struct intel_plane *plane)
> {
> + struct intel_display *display = to_intel_display(plane);
> struct drm_i915_private *i915 = to_i915(plane->base.dev);
> enum pipe pipe = plane->pipe;
>
> spin_lock_irq(&i915->irq_lock);
> - bdw_enable_pipe_irq(i915, pipe, GEN9_PIPE_PLANE_FLIP_DONE(plane-
> >id));
> + bdw_enable_pipe_irq(display, pipe,
> GEN9_PIPE_PLANE_FLIP_DONE(plane->id));
> spin_unlock_irq(&i915->irq_lock);
> }
>
> static void
> skl_plane_disable_flip_done(struct intel_plane *plane)
> {
> + struct intel_display *display = to_intel_display(plane);
> struct drm_i915_private *i915 = to_i915(plane->base.dev);
> enum pipe pipe = plane->pipe;
>
> spin_lock_irq(&i915->irq_lock);
> - bdw_disable_pipe_irq(i915, pipe, GEN9_PIPE_PLANE_FLIP_DONE(plane-
> >id));
> + bdw_disable_pipe_irq(display, pipe,
> GEN9_PIPE_PLANE_FLIP_DONE(plane->id));
> spin_unlock_irq(&i915->irq_lock);
> }
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c
> b/drivers/gpu/drm/i915/gt/intel_rps.c
> index 2cfaedb04876..4b46c59588b8 100644
> --- a/drivers/gpu/drm/i915/gt/intel_rps.c
> +++ b/drivers/gpu/drm/i915/gt/intel_rps.c
> @@ -550,6 +550,7 @@ static unsigned int init_emon(struct intel_uncore
> *uncore)
> static bool gen5_rps_enable(struct intel_rps *rps)
> {
> struct drm_i915_private *i915 = rps_to_i915(rps);
> + struct intel_display *display = &i915->display;
> struct intel_uncore *uncore = rps_to_uncore(rps);
> u8 fstart, vstart;
> u32 rgvmodectl;
> @@ -608,7 +609,7 @@ static bool gen5_rps_enable(struct intel_rps *rps)
> rps->ips.last_time2 = ktime_get_raw_ns();
>
> spin_lock(&i915->irq_lock);
> - ilk_enable_display_irq(i915, DE_PCU_EVENT);
> + ilk_enable_display_irq(display, DE_PCU_EVENT);
> spin_unlock(&i915->irq_lock);
>
> spin_unlock_irq(&mchdev_lock);
> @@ -621,13 +622,14 @@ static bool gen5_rps_enable(struct intel_rps *rps)
> static void gen5_rps_disable(struct intel_rps *rps)
> {
> struct drm_i915_private *i915 = rps_to_i915(rps);
> + struct intel_display *display = &i915->display;
> struct intel_uncore *uncore = rps_to_uncore(rps);
> u16 rgvswctl;
>
> spin_lock_irq(&mchdev_lock);
>
> spin_lock(&i915->irq_lock);
> - ilk_disable_display_irq(i915, DE_PCU_EVENT);
> + ilk_disable_display_irq(display, DE_PCU_EVENT);
> spin_unlock(&i915->irq_lock);
>
> rgvswctl = intel_uncore_read16(uncore, MEMSWCTL);
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 3b05eb3f9cbc..ba3afc7e38ac 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -284,7 +284,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void
> *arg)
>
> /* Call regardless, as some status bits might not be
> * signalled in IIR */
> - i9xx_pipestat_irq_ack(dev_priv, iir, pipe_stats);
> + i9xx_pipestat_irq_ack(display, iir, pipe_stats);
>
> if (iir & (I915_LPE_PIPE_A_INTERRUPT |
> I915_LPE_PIPE_B_INTERRUPT))
> @@ -311,7 +311,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void
> *arg)
> if (iir & I915_MASTER_ERROR_INTERRUPT)
> vlv_display_error_irq_handler(display, eir, dpinvgtt);
>
> - valleyview_pipestat_irq_handler(dev_priv, pipe_stats);
> + valleyview_pipestat_irq_handler(display, pipe_stats);
> } while (0);
>
> pmu_irq_stats(dev_priv, ret);
> @@ -374,7 +374,7 @@ static irqreturn_t cherryview_irq_handler(int irq, void
> *arg)
>
> /* Call regardless, as some status bits might not be
> * signalled in IIR */
> - i9xx_pipestat_irq_ack(dev_priv, iir, pipe_stats);
> + i9xx_pipestat_irq_ack(display, iir, pipe_stats);
>
> if (iir & (I915_LPE_PIPE_A_INTERRUPT |
> I915_LPE_PIPE_B_INTERRUPT |
> @@ -397,7 +397,7 @@ static irqreturn_t cherryview_irq_handler(int irq, void
> *arg)
> if (iir & I915_MASTER_ERROR_INTERRUPT)
> vlv_display_error_irq_handler(display, eir, dpinvgtt);
>
> - valleyview_pipestat_irq_handler(dev_priv, pipe_stats);
> + valleyview_pipestat_irq_handler(display, pipe_stats);
> } while (0);
>
> pmu_irq_stats(dev_priv, ret);
> @@ -418,6 +418,7 @@ static irqreturn_t cherryview_irq_handler(int irq, void
> *arg)
> static irqreturn_t ilk_irq_handler(int irq, void *arg)
> {
> struct drm_i915_private *i915 = arg;
> + struct intel_display *display = &i915->display;
> void __iomem * const regs = intel_uncore_regs(&i915->uncore);
> u32 de_iir, gt_iir, de_ier, sde_ier = 0;
> irqreturn_t ret = IRQ_NONE;
> @@ -458,9 +459,9 @@ static irqreturn_t ilk_irq_handler(int irq, void *arg)
> if (de_iir) {
> raw_reg_write(regs, DEIIR, de_iir);
> if (DISPLAY_VER(i915) >= 7)
> - ivb_display_irq_handler(i915, de_iir);
> + ivb_display_irq_handler(display, de_iir);
> else
> - ilk_display_irq_handler(i915, de_iir);
> + ilk_display_irq_handler(display, de_iir);
> ret = IRQ_HANDLED;
> }
>
> @@ -506,6 +507,7 @@ static inline void gen8_master_intr_enable(void
> __iomem * const regs)
> static irqreturn_t gen8_irq_handler(int irq, void *arg)
> {
> struct drm_i915_private *dev_priv = arg;
> + struct intel_display *display = &dev_priv->display;
> void __iomem * const regs = intel_uncore_regs(&dev_priv->uncore);
> u32 master_ctl;
>
> @@ -524,7 +526,7 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
> /* IRQs are synced during runtime_suspend, we don't require a wakeref
> */
> if (master_ctl & ~GEN8_GT_IRQS) {
> disable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
> - gen8_de_irq_handler(dev_priv, master_ctl);
> + gen8_de_irq_handler(display, master_ctl);
> enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
> }
>
> @@ -556,6 +558,7 @@ static inline void gen11_master_intr_enable(void
> __iomem * const regs)
> static irqreturn_t gen11_irq_handler(int irq, void *arg)
> {
> struct drm_i915_private *i915 = arg;
> + struct intel_display *display = &i915->display;
> void __iomem * const regs = intel_uncore_regs(&i915->uncore);
> struct intel_gt *gt = to_gt(i915);
> u32 master_ctl;
> @@ -575,13 +578,13 @@ static irqreturn_t gen11_irq_handler(int irq, void *arg)
>
> /* IRQs are synced during runtime_suspend, we don't require a wakeref
> */
> if (master_ctl & GEN11_DISPLAY_IRQ)
> - gen11_display_irq_handler(i915);
> + gen11_display_irq_handler(display);
>
> - gu_misc_iir = gen11_gu_misc_irq_ack(i915, master_ctl);
> + gu_misc_iir = gen11_gu_misc_irq_ack(display, master_ctl);
>
> gen11_master_intr_enable(regs);
>
> - gen11_gu_misc_irq_handler(i915, gu_misc_iir);
> + gen11_gu_misc_irq_handler(display, gu_misc_iir);
>
> pmu_irq_stats(i915, IRQ_HANDLED);
>
> @@ -613,6 +616,7 @@ static inline void dg1_master_intr_enable(void __iomem
> * const regs)
> static irqreturn_t dg1_irq_handler(int irq, void *arg)
> {
> struct drm_i915_private * const i915 = arg;
> + struct intel_display *display = &i915->display;
> struct intel_gt *gt = to_gt(i915);
> void __iomem * const regs = intel_uncore_regs(gt->uncore);
> u32 master_tile_ctl, master_ctl;
> @@ -641,13 +645,13 @@ static irqreturn_t dg1_irq_handler(int irq, void *arg)
> gen11_gt_irq_handler(gt, master_ctl);
>
> if (master_ctl & GEN11_DISPLAY_IRQ)
> - gen11_display_irq_handler(i915);
> + gen11_display_irq_handler(display);
>
> - gu_misc_iir = gen11_gu_misc_irq_ack(i915, master_ctl);
> + gu_misc_iir = gen11_gu_misc_irq_ack(display, master_ctl);
>
> dg1_master_intr_enable(regs);
>
> - gen11_gu_misc_irq_handler(i915, gu_misc_iir);
> + gen11_gu_misc_irq_handler(display, gu_misc_iir);
>
> pmu_irq_stats(i915, IRQ_HANDLED);
>
> @@ -691,24 +695,27 @@ static void ilk_irq_reset(struct drm_i915_private
> *dev_priv)
>
> static void valleyview_irq_reset(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> +
> intel_uncore_write(&dev_priv->uncore, VLV_MASTER_IER, 0);
> intel_uncore_posting_read(&dev_priv->uncore, VLV_MASTER_IER);
>
> gen5_gt_irq_reset(to_gt(dev_priv));
>
> spin_lock_irq(&dev_priv->irq_lock);
> - vlv_display_irq_reset(dev_priv);
> + vlv_display_irq_reset(display);
> spin_unlock_irq(&dev_priv->irq_lock);
> }
>
> static void gen8_irq_reset(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> struct intel_uncore *uncore = &dev_priv->uncore;
>
> gen8_master_intr_disable(intel_uncore_regs(uncore));
>
> gen8_gt_irq_reset(to_gt(dev_priv));
> - gen8_display_irq_reset(dev_priv);
> + gen8_display_irq_reset(display);
> gen2_irq_reset(uncore, GEN8_PCU_IRQ_REGS);
>
> if (HAS_PCH_SPLIT(dev_priv))
> @@ -718,13 +725,14 @@ static void gen8_irq_reset(struct drm_i915_private
> *dev_priv)
>
> static void gen11_irq_reset(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> struct intel_gt *gt = to_gt(dev_priv);
> struct intel_uncore *uncore = gt->uncore;
>
> gen11_master_intr_disable(intel_uncore_regs(&dev_priv->uncore));
>
> gen11_gt_irq_reset(gt);
> - gen11_display_irq_reset(dev_priv);
> + gen11_display_irq_reset(display);
>
> gen2_irq_reset(uncore, GEN11_GU_MISC_IRQ_REGS);
> gen2_irq_reset(uncore, GEN8_PCU_IRQ_REGS);
> @@ -732,6 +740,7 @@ static void gen11_irq_reset(struct drm_i915_private
> *dev_priv)
>
> static void dg1_irq_reset(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> struct intel_uncore *uncore = &dev_priv->uncore;
> struct intel_gt *gt;
> unsigned int i;
> @@ -741,7 +750,7 @@ static void dg1_irq_reset(struct drm_i915_private
> *dev_priv)
> for_each_gt(gt, dev_priv, i)
> gen11_gt_irq_reset(gt);
>
> - gen11_display_irq_reset(dev_priv);
> + gen11_display_irq_reset(display);
>
> gen2_irq_reset(uncore, GEN11_GU_MISC_IRQ_REGS);
> gen2_irq_reset(uncore, GEN8_PCU_IRQ_REGS);
> @@ -751,6 +760,7 @@ static void dg1_irq_reset(struct drm_i915_private
> *dev_priv)
>
> static void cherryview_irq_reset(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> struct intel_uncore *uncore = &dev_priv->uncore;
>
> intel_uncore_write(uncore, GEN8_MASTER_IRQ, 0);
> @@ -761,23 +771,27 @@ static void cherryview_irq_reset(struct
> drm_i915_private *dev_priv)
> gen2_irq_reset(uncore, GEN8_PCU_IRQ_REGS);
>
> spin_lock_irq(&dev_priv->irq_lock);
> - vlv_display_irq_reset(dev_priv);
> + vlv_display_irq_reset(display);
> spin_unlock_irq(&dev_priv->irq_lock);
> }
>
> static void ilk_irq_postinstall(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> +
> gen5_gt_irq_postinstall(to_gt(dev_priv));
>
> - ilk_de_irq_postinstall(dev_priv);
> + ilk_de_irq_postinstall(display);
> }
>
> static void valleyview_irq_postinstall(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> +
> gen5_gt_irq_postinstall(to_gt(dev_priv));
>
> spin_lock_irq(&dev_priv->irq_lock);
> - vlv_display_irq_postinstall(dev_priv);
> + vlv_display_irq_postinstall(display);
> spin_unlock_irq(&dev_priv->irq_lock);
>
> intel_uncore_write(&dev_priv->uncore, VLV_MASTER_IER,
> MASTER_INTERRUPT_ENABLE);
> @@ -786,20 +800,23 @@ static void valleyview_irq_postinstall(struct
> drm_i915_private *dev_priv)
>
> static void gen8_irq_postinstall(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> +
> gen8_gt_irq_postinstall(to_gt(dev_priv));
> - gen8_de_irq_postinstall(dev_priv);
> + gen8_de_irq_postinstall(display);
>
> gen8_master_intr_enable(intel_uncore_regs(&dev_priv->uncore));
> }
>
> static void gen11_irq_postinstall(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> struct intel_gt *gt = to_gt(dev_priv);
> struct intel_uncore *uncore = gt->uncore;
> u32 gu_misc_masked = GEN11_GU_MISC_GSE;
>
> gen11_gt_irq_postinstall(gt);
> - gen11_de_irq_postinstall(dev_priv);
> + gen11_de_irq_postinstall(display);
>
> gen2_irq_init(uncore, GEN11_GU_MISC_IRQ_REGS, ~gu_misc_masked,
> gu_misc_masked);
>
> @@ -809,6 +826,7 @@ static void gen11_irq_postinstall(struct drm_i915_private
> *dev_priv)
>
> static void dg1_irq_postinstall(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> struct intel_uncore *uncore = &dev_priv->uncore;
> u32 gu_misc_masked = GEN11_GU_MISC_GSE;
> struct intel_gt *gt;
> @@ -819,7 +837,7 @@ static void dg1_irq_postinstall(struct drm_i915_private
> *dev_priv)
>
> gen2_irq_init(uncore, GEN11_GU_MISC_IRQ_REGS, ~gu_misc_masked,
> gu_misc_masked);
>
> - dg1_de_irq_postinstall(dev_priv);
> + dg1_de_irq_postinstall(display);
>
> dg1_master_intr_enable(intel_uncore_regs(uncore));
> intel_uncore_posting_read(uncore, DG1_MSTR_TILE_INTR);
> @@ -827,10 +845,12 @@ static void dg1_irq_postinstall(struct drm_i915_private
> *dev_priv)
>
> static void cherryview_irq_postinstall(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> +
> gen8_gt_irq_postinstall(to_gt(dev_priv));
>
> spin_lock_irq(&dev_priv->irq_lock);
> - vlv_display_irq_postinstall(dev_priv);
> + vlv_display_irq_postinstall(display);
> spin_unlock_irq(&dev_priv->irq_lock);
>
> intel_uncore_write(&dev_priv->uncore, GEN8_MASTER_IRQ,
> GEN8_MASTER_IRQ_CONTROL);
> @@ -900,9 +920,10 @@ static void i9xx_error_irq_handler(struct
> drm_i915_private *dev_priv,
>
> static void i915_irq_reset(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> struct intel_uncore *uncore = &dev_priv->uncore;
>
> - i9xx_display_irq_reset(dev_priv);
> + i9xx_display_irq_reset(display);
>
> gen2_error_reset(uncore, GEN2_ERROR_REGS);
> gen2_irq_reset(uncore, GEN2_IRQ_REGS);
> @@ -911,6 +932,7 @@ static void i915_irq_reset(struct drm_i915_private
> *dev_priv)
>
> static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> struct intel_uncore *uncore = &dev_priv->uncore;
> u32 enable_mask;
>
> @@ -942,11 +964,11 @@ static void i915_irq_postinstall(struct
> drm_i915_private *dev_priv)
> /* Interrupt setup is already guaranteed to be single-threaded, this is
> * just to make the assert_spin_locked check happy. */
> spin_lock_irq(&dev_priv->irq_lock);
> - i915_enable_pipestat(dev_priv, PIPE_A,
> PIPE_CRC_DONE_INTERRUPT_STATUS);
> - i915_enable_pipestat(dev_priv, PIPE_B,
> PIPE_CRC_DONE_INTERRUPT_STATUS);
> + i915_enable_pipestat(display, PIPE_A,
> PIPE_CRC_DONE_INTERRUPT_STATUS);
> + i915_enable_pipestat(display, PIPE_B,
> PIPE_CRC_DONE_INTERRUPT_STATUS);
> spin_unlock_irq(&dev_priv->irq_lock);
>
> - i915_enable_asle_pipestat(dev_priv);
> + i915_enable_asle_pipestat(display);
> }
>
> static irqreturn_t i915_irq_handler(int irq, void *arg)
> @@ -979,7 +1001,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
>
> /* Call regardless, as some status bits might not be
> * signalled in IIR */
> - i9xx_pipestat_irq_ack(dev_priv, iir, pipe_stats);
> + i9xx_pipestat_irq_ack(display, iir, pipe_stats);
>
> if (iir & I915_MASTER_ERROR_INTERRUPT)
> i9xx_error_irq_ack(dev_priv, &eir, &eir_stuck);
> @@ -995,7 +1017,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
> if (hotplug_status)
> i9xx_hpd_irq_handler(display, hotplug_status);
>
> - i915_pipestat_irq_handler(dev_priv, iir, pipe_stats);
> + i915_pipestat_irq_handler(display, iir, pipe_stats);
> } while (0);
>
> pmu_irq_stats(dev_priv, ret);
> @@ -1007,9 +1029,10 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
>
> static void i965_irq_reset(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> struct intel_uncore *uncore = &dev_priv->uncore;
>
> - i9xx_display_irq_reset(dev_priv);
> + i9xx_display_irq_reset(display);
>
> gen2_error_reset(uncore, GEN2_ERROR_REGS);
> gen2_irq_reset(uncore, GEN2_IRQ_REGS);
> @@ -1037,6 +1060,7 @@ static u32 i965_error_mask(struct drm_i915_private
> *i915)
>
> static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
> {
> + struct intel_display *display = &dev_priv->display;
> struct intel_uncore *uncore = &dev_priv->uncore;
> u32 enable_mask;
>
> @@ -1065,12 +1089,12 @@ static void i965_irq_postinstall(struct
> drm_i915_private *dev_priv)
> /* Interrupt setup is already guaranteed to be single-threaded, this is
> * just to make the assert_spin_locked check happy. */
> spin_lock_irq(&dev_priv->irq_lock);
> - i915_enable_pipestat(dev_priv, PIPE_A,
> PIPE_GMBUS_INTERRUPT_STATUS);
> - i915_enable_pipestat(dev_priv, PIPE_A,
> PIPE_CRC_DONE_INTERRUPT_STATUS);
> - i915_enable_pipestat(dev_priv, PIPE_B,
> PIPE_CRC_DONE_INTERRUPT_STATUS);
> + i915_enable_pipestat(display, PIPE_A,
> PIPE_GMBUS_INTERRUPT_STATUS);
> + i915_enable_pipestat(display, PIPE_A,
> PIPE_CRC_DONE_INTERRUPT_STATUS);
> + i915_enable_pipestat(display, PIPE_B,
> PIPE_CRC_DONE_INTERRUPT_STATUS);
> spin_unlock_irq(&dev_priv->irq_lock);
>
> - i915_enable_asle_pipestat(dev_priv);
> + i915_enable_asle_pipestat(display);
> }
>
> static irqreturn_t i965_irq_handler(int irq, void *arg)
> @@ -1102,7 +1126,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
>
> /* Call regardless, as some status bits might not be
> * signalled in IIR */
> - i9xx_pipestat_irq_ack(dev_priv, iir, pipe_stats);
> + i9xx_pipestat_irq_ack(display, iir, pipe_stats);
>
> if (iir & I915_MASTER_ERROR_INTERRUPT)
> i9xx_error_irq_ack(dev_priv, &eir, &eir_stuck);
> @@ -1123,7 +1147,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
> if (hotplug_status)
> i9xx_hpd_irq_handler(display, hotplug_status);
>
> - i965_pipestat_irq_handler(dev_priv, iir, pipe_stats);
> + i965_pipestat_irq_handler(display, iir, pipe_stats);
> } while (0);
>
> pmu_irq_stats(dev_priv, IRQ_HANDLED);
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c
> b/drivers/gpu/drm/xe/display/xe_display.c
> index 263459323bf7..8e61cfa06647 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -220,11 +220,13 @@ void xe_display_unregister(struct xe_device *xe)
>
> void xe_display_irq_handler(struct xe_device *xe, u32 master_ctl)
> {
> + struct intel_display *display = &xe->display;
> +
> if (!xe->info.probe_display)
> return;
>
> if (master_ctl & DISPLAY_IRQ)
> - gen11_display_irq_handler(xe);
> + gen11_display_irq_handler(display);
> }
>
> void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir)
> @@ -240,19 +242,23 @@ void xe_display_irq_enable(struct xe_device *xe, u32
> gu_misc_iir)
>
> void xe_display_irq_reset(struct xe_device *xe)
> {
> + struct intel_display *display = &xe->display;
> +
> if (!xe->info.probe_display)
> return;
>
> - gen11_display_irq_reset(xe);
> + gen11_display_irq_reset(display);
> }
>
> void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt)
> {
> + struct intel_display *display = &xe->display;
> +
> if (!xe->info.probe_display)
> return;
>
> if (gt->info.id == XE_GT0)
> - gen11_de_irq_postinstall(xe);
> + gen11_de_irq_postinstall(display);
> }
>
> static bool suspend_to_idle(void)
> --
> 2.39.5
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 8/9] drm/i915/irq: convert rest of intel_display_irq.[ch] to struct intel_display
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (6 preceding siblings ...)
2025-03-11 18:00 ` [PATCH 7/9] drm/i915/irq: convert intel_display_irq.[ch] interfaces " Jani Nikula
@ 2025-03-11 18:00 ` Jani Nikula
2025-03-12 5:53 ` Shankar, Uma
2025-03-11 18:00 ` [PATCH 9/9] drm/i915/display: rename I915_HAS_HOTPLUG() to HAS_HOTPLUG Jani Nikula
` (9 subsequent siblings)
17 siblings, 1 reply; 31+ messages in thread
From: Jani Nikula @ 2025-03-11 18:00 UTC (permalink / raw)
To: intel-gfx, intel-xe; +Cc: jani.nikula
Going forward, struct intel_display is the main display device data
pointer. Convert as much as possible of intel_display_irq.[ch] to struct
intel_display.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
.../gpu/drm/i915/display/intel_display_irq.c | 527 ++++++++----------
1 file changed, 247 insertions(+), 280 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
index 68f903c35978..6f78fe6de06a 100644
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -115,9 +115,8 @@ static void intel_pipe_fault_irq_handler(struct intel_display *display,
}
static void
-intel_handle_vblank(struct drm_i915_private *dev_priv, enum pipe pipe)
+intel_handle_vblank(struct intel_display *display, enum pipe pipe)
{
- struct intel_display *display = &dev_priv->display;
struct intel_crtc *crtc = intel_crtc_for_pipe(display, pipe);
drm_crtc_handle_vblank(&crtc->base);
@@ -136,14 +135,14 @@ void ilk_update_display_irq(struct intel_display *display,
u32 new_val;
lockdep_assert_held(&dev_priv->irq_lock);
- drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
+ drm_WARN_ON(display->drm, enabled_irq_mask & ~interrupt_mask);
new_val = dev_priv->irq_mask;
new_val &= ~interrupt_mask;
new_val |= (~enabled_irq_mask & interrupt_mask);
if (new_val != dev_priv->irq_mask &&
- !drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv))) {
+ !drm_WARN_ON(display->drm, !intel_irqs_enabled(dev_priv))) {
dev_priv->irq_mask = new_val;
intel_de_write(display, DEIMR, dev_priv->irq_mask);
intel_de_posting_read(display, DEIMR);
@@ -175,9 +174,9 @@ void bdw_update_port_irq(struct intel_display *display,
lockdep_assert_held(&dev_priv->irq_lock);
- drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
+ drm_WARN_ON(display->drm, enabled_irq_mask & ~interrupt_mask);
- if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
+ if (drm_WARN_ON(display->drm, !intel_irqs_enabled(dev_priv)))
return;
old_val = intel_de_read(display, GEN8_DE_PORT_IMR);
@@ -208,17 +207,17 @@ static void bdw_update_pipe_irq(struct intel_display *display,
lockdep_assert_held(&dev_priv->irq_lock);
- drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
+ drm_WARN_ON(display->drm, enabled_irq_mask & ~interrupt_mask);
- if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
+ if (drm_WARN_ON(display->drm, !intel_irqs_enabled(dev_priv)))
return;
- new_val = dev_priv->display.irq.de_irq_mask[pipe];
+ new_val = display->irq.de_irq_mask[pipe];
new_val &= ~interrupt_mask;
new_val |= (~enabled_irq_mask & interrupt_mask);
- if (new_val != dev_priv->display.irq.de_irq_mask[pipe]) {
- dev_priv->display.irq.de_irq_mask[pipe] = new_val;
+ if (new_val != display->irq.de_irq_mask[pipe]) {
+ display->irq.de_irq_mask[pipe] = new_val;
intel_de_write(display, GEN8_DE_PIPE_IMR(pipe), display->irq.de_irq_mask[pipe]);
intel_de_posting_read(display, GEN8_DE_PIPE_IMR(pipe));
}
@@ -252,11 +251,11 @@ void ibx_display_interrupt_update(struct intel_display *display,
sdeimr &= ~interrupt_mask;
sdeimr |= (~enabled_irq_mask & interrupt_mask);
- drm_WARN_ON(&dev_priv->drm, enabled_irq_mask & ~interrupt_mask);
+ drm_WARN_ON(display->drm, enabled_irq_mask & ~interrupt_mask);
lockdep_assert_held(&dev_priv->irq_lock);
- if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
+ if (drm_WARN_ON(display->drm, !intel_irqs_enabled(dev_priv)))
return;
intel_de_write(display, SDEIMR, sdeimr);
@@ -322,20 +321,20 @@ void i915_enable_pipestat(struct intel_display *display,
enum pipe pipe, u32 status_mask)
{
struct drm_i915_private *dev_priv = to_i915(display->drm);
- i915_reg_t reg = PIPESTAT(dev_priv, pipe);
+ i915_reg_t reg = PIPESTAT(display, pipe);
u32 enable_mask;
- drm_WARN_ONCE(&dev_priv->drm, status_mask & ~PIPESTAT_INT_STATUS_MASK,
+ drm_WARN_ONCE(display->drm, status_mask & ~PIPESTAT_INT_STATUS_MASK,
"pipe %c: status_mask=0x%x\n",
pipe_name(pipe), status_mask);
lockdep_assert_held(&dev_priv->irq_lock);
- drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv));
+ drm_WARN_ON(display->drm, !intel_irqs_enabled(dev_priv));
- if ((dev_priv->display.irq.pipestat_irq_mask[pipe] & status_mask) == status_mask)
+ if ((display->irq.pipestat_irq_mask[pipe] & status_mask) == status_mask)
return;
- dev_priv->display.irq.pipestat_irq_mask[pipe] |= status_mask;
+ display->irq.pipestat_irq_mask[pipe] |= status_mask;
enable_mask = i915_pipestat_enable_mask(display, pipe);
intel_de_write(display, reg, enable_mask | status_mask);
@@ -346,20 +345,20 @@ void i915_disable_pipestat(struct intel_display *display,
enum pipe pipe, u32 status_mask)
{
struct drm_i915_private *dev_priv = to_i915(display->drm);
- i915_reg_t reg = PIPESTAT(dev_priv, pipe);
+ i915_reg_t reg = PIPESTAT(display, pipe);
u32 enable_mask;
- drm_WARN_ONCE(&dev_priv->drm, status_mask & ~PIPESTAT_INT_STATUS_MASK,
+ drm_WARN_ONCE(display->drm, status_mask & ~PIPESTAT_INT_STATUS_MASK,
"pipe %c: status_mask=0x%x\n",
pipe_name(pipe), status_mask);
lockdep_assert_held(&dev_priv->irq_lock);
- drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv));
+ drm_WARN_ON(display->drm, !intel_irqs_enabled(dev_priv));
- if ((dev_priv->display.irq.pipestat_irq_mask[pipe] & status_mask) == 0)
+ if ((display->irq.pipestat_irq_mask[pipe] & status_mask) == 0)
return;
- dev_priv->display.irq.pipestat_irq_mask[pipe] &= ~status_mask;
+ display->irq.pipestat_irq_mask[pipe] &= ~status_mask;
enable_mask = i915_pipestat_enable_mask(display, pipe);
intel_de_write(display, reg, enable_mask | status_mask);
@@ -368,15 +367,13 @@ void i915_disable_pipestat(struct intel_display *display,
static bool i915_has_legacy_blc_interrupt(struct intel_display *display)
{
- struct drm_i915_private *i915 = to_i915(display->drm);
-
- if (IS_I85X(i915))
+ if (display->platform.i85x)
return true;
- if (IS_PINEVIEW(i915))
+ if (display->platform.pineview)
return true;
- return IS_DISPLAY_VER(display, 3, 4) && IS_MOBILE(i915);
+ return IS_DISPLAY_VER(display, 3, 4) && display->platform.mobile;
}
/**
@@ -396,7 +393,7 @@ void i915_enable_asle_pipestat(struct intel_display *display)
spin_lock_irq(&dev_priv->irq_lock);
i915_enable_pipestat(display, PIPE_B, PIPE_LEGACY_BLC_EVENT_STATUS);
- if (DISPLAY_VER(dev_priv) >= 4)
+ if (DISPLAY_VER(display) >= 4)
i915_enable_pipestat(display, PIPE_A,
PIPE_LEGACY_BLC_EVENT_STATUS);
@@ -404,13 +401,12 @@ void i915_enable_asle_pipestat(struct intel_display *display)
}
#if IS_ENABLED(CONFIG_DEBUG_FS)
-static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
+static void display_pipe_crc_irq_handler(struct intel_display *display,
enum pipe pipe,
u32 crc0, u32 crc1,
u32 crc2, u32 crc3,
u32 crc4)
{
- struct intel_display *display = &dev_priv->display;
struct intel_crtc *crtc = intel_crtc_for_pipe(display, pipe);
struct intel_pipe_crc *pipe_crc = &crtc->pipe_crc;
u32 crcs[5] = { crc0, crc1, crc2, crc3, crc4 };
@@ -427,7 +423,7 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
* don't trust that one either.
*/
if (pipe_crc->skipped <= 0 ||
- (DISPLAY_VER(dev_priv) >= 8 && pipe_crc->skipped == 1)) {
+ (DISPLAY_VER(display) >= 8 && pipe_crc->skipped == 1)) {
pipe_crc->skipped++;
spin_unlock(&pipe_crc->lock);
return;
@@ -440,20 +436,19 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
}
#else
static inline void
-display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
+display_pipe_crc_irq_handler(struct intel_display *display,
enum pipe pipe,
u32 crc0, u32 crc1,
u32 crc2, u32 crc3,
u32 crc4) {}
#endif
-static void flip_done_handler(struct drm_i915_private *i915,
+static void flip_done_handler(struct intel_display *display,
enum pipe pipe)
{
- struct intel_display *display = &i915->display;
struct intel_crtc *crtc = intel_crtc_for_pipe(display, pipe);
- spin_lock(&i915->drm.event_lock);
+ spin_lock(&display->drm->event_lock);
if (crtc->flip_done_event) {
trace_intel_crtc_flip_done(crtc);
@@ -461,25 +456,21 @@ static void flip_done_handler(struct drm_i915_private *i915,
crtc->flip_done_event = NULL;
}
- spin_unlock(&i915->drm.event_lock);
+ spin_unlock(&display->drm->event_lock);
}
-static void hsw_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
+static void hsw_pipe_crc_irq_handler(struct intel_display *display,
enum pipe pipe)
{
- struct intel_display *display = &dev_priv->display;
-
- display_pipe_crc_irq_handler(dev_priv, pipe,
+ display_pipe_crc_irq_handler(display, pipe,
intel_de_read(display, PIPE_CRC_RES_HSW(pipe)),
0, 0, 0, 0);
}
-static void ivb_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
+static void ivb_pipe_crc_irq_handler(struct intel_display *display,
enum pipe pipe)
{
- struct intel_display *display = &dev_priv->display;
-
- display_pipe_crc_irq_handler(dev_priv, pipe,
+ display_pipe_crc_irq_handler(display, pipe,
intel_de_read(display, PIPE_CRC_RES_1_IVB(pipe)),
intel_de_read(display, PIPE_CRC_RES_2_IVB(pipe)),
intel_de_read(display, PIPE_CRC_RES_3_IVB(pipe)),
@@ -487,40 +478,38 @@ static void ivb_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
intel_de_read(display, PIPE_CRC_RES_5_IVB(pipe)));
}
-static void i9xx_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
+static void i9xx_pipe_crc_irq_handler(struct intel_display *display,
enum pipe pipe)
{
- struct intel_display *display = &dev_priv->display;
u32 res1, res2;
- if (DISPLAY_VER(dev_priv) >= 3)
- res1 = intel_de_read(display, PIPE_CRC_RES_RES1_I915(dev_priv, pipe));
+ if (DISPLAY_VER(display) >= 3)
+ res1 = intel_de_read(display, PIPE_CRC_RES_RES1_I915(display, pipe));
else
res1 = 0;
- if (DISPLAY_VER(dev_priv) >= 5 || IS_G4X(dev_priv))
- res2 = intel_de_read(display, PIPE_CRC_RES_RES2_G4X(dev_priv, pipe));
+ if (DISPLAY_VER(display) >= 5 || display->platform.g4x)
+ res2 = intel_de_read(display, PIPE_CRC_RES_RES2_G4X(display, pipe));
else
res2 = 0;
- display_pipe_crc_irq_handler(dev_priv, pipe,
- intel_de_read(display, PIPE_CRC_RES_RED(dev_priv, pipe)),
- intel_de_read(display, PIPE_CRC_RES_GREEN(dev_priv, pipe)),
- intel_de_read(display, PIPE_CRC_RES_BLUE(dev_priv, pipe)),
+ display_pipe_crc_irq_handler(display, pipe,
+ intel_de_read(display, PIPE_CRC_RES_RED(display, pipe)),
+ intel_de_read(display, PIPE_CRC_RES_GREEN(display, pipe)),
+ intel_de_read(display, PIPE_CRC_RES_BLUE(display, pipe)),
res1, res2);
}
-static void i9xx_pipestat_irq_reset(struct drm_i915_private *dev_priv)
+static void i9xx_pipestat_irq_reset(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
enum pipe pipe;
- for_each_pipe(dev_priv, pipe) {
+ for_each_pipe(display, pipe) {
intel_de_write(display,
- PIPESTAT(dev_priv, pipe),
+ PIPESTAT(display, pipe),
PIPESTAT_INT_STATUS_MASK | PIPE_FIFO_UNDERRUN_STATUS);
- dev_priv->display.irq.pipestat_irq_mask[pipe] = 0;
+ display->irq.pipestat_irq_mask[pipe] = 0;
}
}
@@ -532,13 +521,13 @@ void i9xx_pipestat_irq_ack(struct intel_display *display,
spin_lock(&dev_priv->irq_lock);
- if ((IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) &&
- !dev_priv->display.irq.vlv_display_irqs_enabled) {
+ if ((display->platform.valleyview || display->platform.cherryview) &&
+ !display->irq.vlv_display_irqs_enabled) {
spin_unlock(&dev_priv->irq_lock);
return;
}
- for_each_pipe(dev_priv, pipe) {
+ for_each_pipe(display, pipe) {
i915_reg_t reg;
u32 status_mask, enable_mask, iir_bit = 0;
@@ -566,12 +555,12 @@ void i9xx_pipestat_irq_ack(struct intel_display *display,
break;
}
if (iir & iir_bit)
- status_mask |= dev_priv->display.irq.pipestat_irq_mask[pipe];
+ status_mask |= display->irq.pipestat_irq_mask[pipe];
if (!status_mask)
continue;
- reg = PIPESTAT(dev_priv, pipe);
+ reg = PIPESTAT(display, pipe);
pipe_stats[pipe] = intel_de_read(display, reg) & status_mask;
enable_mask = i915_pipestat_enable_mask(display, pipe);
@@ -595,19 +584,18 @@ void i9xx_pipestat_irq_ack(struct intel_display *display,
void i915_pipestat_irq_handler(struct intel_display *display,
u32 iir, u32 pipe_stats[I915_MAX_PIPES])
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
bool blc_event = false;
enum pipe pipe;
- for_each_pipe(dev_priv, pipe) {
+ for_each_pipe(display, pipe) {
if (pipe_stats[pipe] & PIPE_VBLANK_INTERRUPT_STATUS)
- intel_handle_vblank(dev_priv, pipe);
+ intel_handle_vblank(display, pipe);
if (pipe_stats[pipe] & PIPE_LEGACY_BLC_EVENT_STATUS)
blc_event = true;
if (pipe_stats[pipe] & PIPE_CRC_DONE_INTERRUPT_STATUS)
- i9xx_pipe_crc_irq_handler(dev_priv, pipe);
+ i9xx_pipe_crc_irq_handler(display, pipe);
if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS)
intel_cpu_fifo_underrun_irq_handler(display, pipe);
@@ -620,19 +608,18 @@ void i915_pipestat_irq_handler(struct intel_display *display,
void i965_pipestat_irq_handler(struct intel_display *display,
u32 iir, u32 pipe_stats[I915_MAX_PIPES])
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
bool blc_event = false;
enum pipe pipe;
- for_each_pipe(dev_priv, pipe) {
+ for_each_pipe(display, pipe) {
if (pipe_stats[pipe] & PIPE_START_VBLANK_INTERRUPT_STATUS)
- intel_handle_vblank(dev_priv, pipe);
+ intel_handle_vblank(display, pipe);
if (pipe_stats[pipe] & PIPE_LEGACY_BLC_EVENT_STATUS)
blc_event = true;
if (pipe_stats[pipe] & PIPE_CRC_DONE_INTERRUPT_STATUS)
- i9xx_pipe_crc_irq_handler(dev_priv, pipe);
+ i9xx_pipe_crc_irq_handler(display, pipe);
if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS)
intel_cpu_fifo_underrun_irq_handler(display, pipe);
@@ -648,18 +635,17 @@ void i965_pipestat_irq_handler(struct intel_display *display,
void valleyview_pipestat_irq_handler(struct intel_display *display,
u32 pipe_stats[I915_MAX_PIPES])
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
enum pipe pipe;
- for_each_pipe(dev_priv, pipe) {
+ for_each_pipe(display, pipe) {
if (pipe_stats[pipe] & PIPE_START_VBLANK_INTERRUPT_STATUS)
- intel_handle_vblank(dev_priv, pipe);
+ intel_handle_vblank(display, pipe);
if (pipe_stats[pipe] & PLANE_FLIP_DONE_INT_STATUS_VLV)
- flip_done_handler(dev_priv, pipe);
+ flip_done_handler(display, pipe);
if (pipe_stats[pipe] & PIPE_CRC_DONE_INTERRUPT_STATUS)
- i9xx_pipe_crc_irq_handler(dev_priv, pipe);
+ i9xx_pipe_crc_irq_handler(display, pipe);
if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS)
intel_cpu_fifo_underrun_irq_handler(display, pipe);
@@ -669,9 +655,8 @@ void valleyview_pipestat_irq_handler(struct intel_display *display,
intel_gmbus_irq_handler(display);
}
-static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
+static void ibx_irq_handler(struct intel_display *display, u32 pch_iir)
{
- struct intel_display *display = &dev_priv->display;
enum pipe pipe;
u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK;
@@ -680,7 +665,7 @@ static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
if (pch_iir & SDE_AUDIO_POWER_MASK) {
int port = ffs((pch_iir & SDE_AUDIO_POWER_MASK) >>
SDE_AUDIO_POWER_SHIFT);
- drm_dbg(&dev_priv->drm, "PCH audio power change on port %d\n",
+ drm_dbg(display->drm, "PCH audio power change on port %d\n",
port_name(port));
}
@@ -691,26 +676,26 @@ static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
intel_gmbus_irq_handler(display);
if (pch_iir & SDE_AUDIO_HDCP_MASK)
- drm_dbg(&dev_priv->drm, "PCH HDCP audio interrupt\n");
+ drm_dbg(display->drm, "PCH HDCP audio interrupt\n");
if (pch_iir & SDE_AUDIO_TRANS_MASK)
- drm_dbg(&dev_priv->drm, "PCH transcoder audio interrupt\n");
+ drm_dbg(display->drm, "PCH transcoder audio interrupt\n");
if (pch_iir & SDE_POISON)
- drm_err(&dev_priv->drm, "PCH poison interrupt\n");
+ drm_err(display->drm, "PCH poison interrupt\n");
if (pch_iir & SDE_FDI_MASK) {
- for_each_pipe(dev_priv, pipe)
- drm_dbg(&dev_priv->drm, " pipe %c FDI IIR: 0x%08x\n",
+ for_each_pipe(display, pipe)
+ drm_dbg(display->drm, " pipe %c FDI IIR: 0x%08x\n",
pipe_name(pipe),
intel_de_read(display, FDI_RX_IIR(pipe)));
}
if (pch_iir & (SDE_TRANSB_CRC_DONE | SDE_TRANSA_CRC_DONE))
- drm_dbg(&dev_priv->drm, "PCH transcoder CRC done interrupt\n");
+ drm_dbg(display->drm, "PCH transcoder CRC done interrupt\n");
if (pch_iir & (SDE_TRANSB_CRC_ERR | SDE_TRANSA_CRC_ERR))
- drm_dbg(&dev_priv->drm,
+ drm_dbg(display->drm,
"PCH transcoder CRC error interrupt\n");
if (pch_iir & SDE_TRANSA_FIFO_UNDER)
@@ -753,14 +738,13 @@ static const struct pipe_fault_handler ivb_pipe_fault_handlers[] = {
{}
};
-static void ivb_err_int_handler(struct drm_i915_private *dev_priv)
+static void ivb_err_int_handler(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
u32 err_int = intel_de_read(display, GEN7_ERR_INT);
enum pipe pipe;
if (err_int & ERR_INT_POISON)
- drm_err(&dev_priv->drm, "Poison interrupt\n");
+ drm_err(display->drm, "Poison interrupt\n");
if (err_int & ERR_INT_INVALID_GTT_PTE)
drm_err_ratelimited(display->drm, "Invalid GTT PTE\n");
@@ -768,17 +752,17 @@ static void ivb_err_int_handler(struct drm_i915_private *dev_priv)
if (err_int & ERR_INT_INVALID_PTE_DATA)
drm_err_ratelimited(display->drm, "Invalid PTE data\n");
- for_each_pipe(dev_priv, pipe) {
+ for_each_pipe(display, pipe) {
u32 fault_errors;
if (err_int & ERR_INT_FIFO_UNDERRUN(pipe))
intel_cpu_fifo_underrun_irq_handler(display, pipe);
if (err_int & ERR_INT_PIPE_CRC_DONE(pipe)) {
- if (IS_IVYBRIDGE(dev_priv))
- ivb_pipe_crc_irq_handler(dev_priv, pipe);
+ if (display->platform.ivybridge)
+ ivb_pipe_crc_irq_handler(display, pipe);
else
- hsw_pipe_crc_irq_handler(dev_priv, pipe);
+ hsw_pipe_crc_irq_handler(display, pipe);
}
fault_errors = err_int & ivb_err_int_pipe_fault_mask(pipe);
@@ -790,25 +774,23 @@ static void ivb_err_int_handler(struct drm_i915_private *dev_priv)
intel_de_write(display, GEN7_ERR_INT, err_int);
}
-static void cpt_serr_int_handler(struct drm_i915_private *dev_priv)
+static void cpt_serr_int_handler(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
u32 serr_int = intel_de_read(display, SERR_INT);
enum pipe pipe;
if (serr_int & SERR_INT_POISON)
- drm_err(&dev_priv->drm, "PCH poison interrupt\n");
+ drm_err(display->drm, "PCH poison interrupt\n");
- for_each_pipe(dev_priv, pipe)
+ for_each_pipe(display, pipe)
if (serr_int & SERR_INT_TRANS_FIFO_UNDERRUN(pipe))
intel_pch_fifo_underrun_irq_handler(display, pipe);
intel_de_write(display, SERR_INT, serr_int);
}
-static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
+static void cpt_irq_handler(struct intel_display *display, u32 pch_iir)
{
- struct intel_display *display = &dev_priv->display;
enum pipe pipe;
u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK_CPT;
@@ -817,7 +799,7 @@ static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
if (pch_iir & SDE_AUDIO_POWER_MASK_CPT) {
int port = ffs((pch_iir & SDE_AUDIO_POWER_MASK_CPT) >>
SDE_AUDIO_POWER_SHIFT_CPT);
- drm_dbg(&dev_priv->drm, "PCH audio power change on port %c\n",
+ drm_dbg(display->drm, "PCH audio power change on port %c\n",
port_name(port));
}
@@ -828,20 +810,20 @@ static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
intel_gmbus_irq_handler(display);
if (pch_iir & SDE_AUDIO_CP_REQ_CPT)
- drm_dbg(&dev_priv->drm, "Audio CP request interrupt\n");
+ drm_dbg(display->drm, "Audio CP request interrupt\n");
if (pch_iir & SDE_AUDIO_CP_CHG_CPT)
- drm_dbg(&dev_priv->drm, "Audio CP change interrupt\n");
+ drm_dbg(display->drm, "Audio CP change interrupt\n");
if (pch_iir & SDE_FDI_MASK_CPT) {
- for_each_pipe(dev_priv, pipe)
- drm_dbg(&dev_priv->drm, " pipe %c FDI IIR: 0x%08x\n",
+ for_each_pipe(display, pipe)
+ drm_dbg(display->drm, " pipe %c FDI IIR: 0x%08x\n",
pipe_name(pipe),
intel_de_read(display, FDI_RX_IIR(pipe)));
}
if (pch_iir & SDE_ERROR_CPT)
- cpt_serr_int_handler(dev_priv);
+ cpt_serr_int_handler(display);
}
static u32 ilk_gtt_fault_pipe_fault_mask(enum pipe pipe)
@@ -910,23 +892,23 @@ void ilk_display_irq_handler(struct intel_display *display, u32 de_iir)
intel_opregion_asle_intr(display);
if (de_iir & DE_POISON)
- drm_err(&dev_priv->drm, "Poison interrupt\n");
+ drm_err(display->drm, "Poison interrupt\n");
if (de_iir & DE_GTT_FAULT)
ilk_gtt_fault_irq_handler(display);
- for_each_pipe(dev_priv, pipe) {
+ for_each_pipe(display, pipe) {
if (de_iir & DE_PIPE_VBLANK(pipe))
- intel_handle_vblank(dev_priv, pipe);
+ intel_handle_vblank(display, pipe);
if (de_iir & DE_PLANE_FLIP_DONE(pipe))
- flip_done_handler(dev_priv, pipe);
+ flip_done_handler(display, pipe);
if (de_iir & DE_PIPE_FIFO_UNDERRUN(pipe))
intel_cpu_fifo_underrun_irq_handler(display, pipe);
if (de_iir & DE_PIPE_CRC_DONE(pipe))
- i9xx_pipe_crc_irq_handler(dev_priv, pipe);
+ i9xx_pipe_crc_irq_handler(display, pipe);
}
/* check event from PCH */
@@ -934,15 +916,15 @@ void ilk_display_irq_handler(struct intel_display *display, u32 de_iir)
u32 pch_iir = intel_de_read(display, SDEIIR);
if (HAS_PCH_CPT(dev_priv))
- cpt_irq_handler(dev_priv, pch_iir);
+ cpt_irq_handler(display, pch_iir);
else
- ibx_irq_handler(dev_priv, pch_iir);
+ ibx_irq_handler(display, pch_iir);
/* should clear PCH hotplug event before clear CPU irq */
intel_de_write(display, SDEIIR, pch_iir);
}
- if (DISPLAY_VER(dev_priv) == 5 && de_iir & DE_PCU_EVENT)
+ if (DISPLAY_VER(display) == 5 && de_iir & DE_PCU_EVENT)
gen5_rps_irq_handler(&to_gt(dev_priv)->rps);
}
@@ -956,12 +938,12 @@ void ivb_display_irq_handler(struct intel_display *display, u32 de_iir)
ilk_hpd_irq_handler(display, hotplug_trigger);
if (de_iir & DE_ERR_INT_IVB)
- ivb_err_int_handler(dev_priv);
+ ivb_err_int_handler(display);
if (de_iir & DE_EDP_PSR_INT_HSW) {
struct intel_encoder *encoder;
- for_each_intel_encoder_with_psr(&dev_priv->drm, encoder) {
+ for_each_intel_encoder_with_psr(display->drm, encoder) {
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
u32 psr_iir;
@@ -977,35 +959,35 @@ void ivb_display_irq_handler(struct intel_display *display, u32 de_iir)
if (de_iir & DE_GSE_IVB)
intel_opregion_asle_intr(display);
- for_each_pipe(dev_priv, pipe) {
+ for_each_pipe(display, pipe) {
if (de_iir & DE_PIPE_VBLANK_IVB(pipe))
- intel_handle_vblank(dev_priv, pipe);
+ intel_handle_vblank(display, pipe);
if (de_iir & DE_PLANE_FLIP_DONE_IVB(pipe))
- flip_done_handler(dev_priv, pipe);
+ flip_done_handler(display, pipe);
}
/* check event from PCH */
if (!HAS_PCH_NOP(dev_priv) && (de_iir & DE_PCH_EVENT_IVB)) {
u32 pch_iir = intel_de_read(display, SDEIIR);
- cpt_irq_handler(dev_priv, pch_iir);
+ cpt_irq_handler(display, pch_iir);
/* clear PCH hotplug event before clear CPU irq */
intel_de_write(display, SDEIIR, pch_iir);
}
}
-static u32 gen8_de_port_aux_mask(struct drm_i915_private *dev_priv)
+static u32 gen8_de_port_aux_mask(struct intel_display *display)
{
u32 mask;
- if (DISPLAY_VER(dev_priv) >= 20)
+ if (DISPLAY_VER(display) >= 20)
return 0;
- else if (DISPLAY_VER(dev_priv) >= 14)
+ else if (DISPLAY_VER(display) >= 14)
return TGL_DE_PORT_AUX_DDIA |
TGL_DE_PORT_AUX_DDIB;
- else if (DISPLAY_VER(dev_priv) >= 13)
+ else if (DISPLAY_VER(display) >= 13)
return TGL_DE_PORT_AUX_DDIA |
TGL_DE_PORT_AUX_DDIB |
TGL_DE_PORT_AUX_DDIC |
@@ -1015,7 +997,7 @@ static u32 gen8_de_port_aux_mask(struct drm_i915_private *dev_priv)
TGL_DE_PORT_AUX_USBC2 |
TGL_DE_PORT_AUX_USBC3 |
TGL_DE_PORT_AUX_USBC4;
- else if (DISPLAY_VER(dev_priv) >= 12)
+ else if (DISPLAY_VER(display) >= 12)
return TGL_DE_PORT_AUX_DDIA |
TGL_DE_PORT_AUX_DDIB |
TGL_DE_PORT_AUX_DDIC |
@@ -1027,12 +1009,12 @@ static u32 gen8_de_port_aux_mask(struct drm_i915_private *dev_priv)
TGL_DE_PORT_AUX_USBC6;
mask = GEN8_AUX_CHANNEL_A;
- if (DISPLAY_VER(dev_priv) >= 9)
+ if (DISPLAY_VER(display) >= 9)
mask |= GEN9_AUX_CHANNEL_B |
GEN9_AUX_CHANNEL_C |
GEN9_AUX_CHANNEL_D;
- if (DISPLAY_VER(dev_priv) == 11) {
+ if (DISPLAY_VER(display) == 11) {
mask |= ICL_AUX_CHANNEL_F;
mask |= ICL_AUX_CHANNEL_E;
}
@@ -1040,10 +1022,8 @@ static u32 gen8_de_port_aux_mask(struct drm_i915_private *dev_priv)
return mask;
}
-static u32 gen8_de_pipe_fault_mask(struct drm_i915_private *dev_priv)
+static u32 gen8_de_pipe_fault_mask(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
-
if (DISPLAY_VER(display) >= 14)
return MTL_PIPEDMC_ATS_FAULT |
MTL_PLANE_ATS_FAULT |
@@ -1195,15 +1175,14 @@ gen8_pipe_fault_handlers(struct intel_display *display)
return bdw_pipe_fault_handlers;
}
-static void intel_pmdemand_irq_handler(struct drm_i915_private *dev_priv)
+static void intel_pmdemand_irq_handler(struct intel_display *display)
{
- wake_up_all(&dev_priv->display.pmdemand.waitqueue);
+ wake_up_all(&display->pmdemand.waitqueue);
}
static void
-gen8_de_misc_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
+gen8_de_misc_irq_handler(struct intel_display *display, u32 iir)
{
- struct intel_display *display = &dev_priv->display;
bool found = false;
if (HAS_DBUF_OVERLAP_DETECTION(display)) {
@@ -1213,20 +1192,20 @@ gen8_de_misc_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
}
}
- if (DISPLAY_VER(dev_priv) >= 14) {
+ if (DISPLAY_VER(display) >= 14) {
if (iir & (XELPDP_PMDEMAND_RSP |
XELPDP_PMDEMAND_RSPTOUT_ERR)) {
if (iir & XELPDP_PMDEMAND_RSPTOUT_ERR)
- drm_dbg(&dev_priv->drm,
+ drm_dbg(display->drm,
"Error waiting for Punit PM Demand Response\n");
- intel_pmdemand_irq_handler(dev_priv);
+ intel_pmdemand_irq_handler(display);
found = true;
}
if (iir & XELPDP_RM_TIMEOUT) {
u32 val = intel_de_read(display, RM_TIMEOUT_REG_CAPTURE);
- drm_warn(&dev_priv->drm, "Register Access Timeout = 0x%x\n", val);
+ drm_warn(display->drm, "Register Access Timeout = 0x%x\n", val);
found = true;
}
} else if (iir & GEN8_DE_MISC_GSE) {
@@ -1239,12 +1218,12 @@ gen8_de_misc_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
u32 psr_iir;
i915_reg_t iir_reg;
- for_each_intel_encoder_with_psr(&dev_priv->drm, encoder) {
+ for_each_intel_encoder_with_psr(display->drm, encoder) {
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
- if (DISPLAY_VER(dev_priv) >= 12)
- iir_reg = TRANS_PSR_IIR(dev_priv,
- intel_dp->psr.transcoder);
+ if (DISPLAY_VER(display) >= 12)
+ iir_reg = TRANS_PSR_IIR(display,
+ intel_dp->psr.transcoder);
else
iir_reg = EDP_PSR_IIR;
@@ -1256,19 +1235,18 @@ gen8_de_misc_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
intel_psr_irq_handler(intel_dp, psr_iir);
/* prior GEN12 only have one EDP PSR */
- if (DISPLAY_VER(dev_priv) < 12)
+ if (DISPLAY_VER(display) < 12)
break;
}
}
if (!found)
- drm_err(&dev_priv->drm, "Unexpected DE Misc interrupt: 0x%08x\n", iir);
+ drm_err(display->drm, "Unexpected DE Misc interrupt: 0x%08x\n", iir);
}
-static void gen11_dsi_te_interrupt_handler(struct drm_i915_private *dev_priv,
+static void gen11_dsi_te_interrupt_handler(struct intel_display *display,
u32 te_trigger)
{
- struct intel_display *display = &dev_priv->display;
enum pipe pipe = INVALID_PIPE;
enum transcoder dsi_trans;
enum port port;
@@ -1278,7 +1256,7 @@ static void gen11_dsi_te_interrupt_handler(struct drm_i915_private *dev_priv,
* Incase of dual link, TE comes from DSI_1
* this is to check if dual link is enabled
*/
- val = intel_de_read(display, TRANS_DDI_FUNC_CTL2(dev_priv, TRANSCODER_DSI_0));
+ val = intel_de_read(display, TRANS_DDI_FUNC_CTL2(display, TRANSCODER_DSI_0));
val &= PORT_SYNC_MODE_ENABLE;
/*
@@ -1294,12 +1272,12 @@ static void gen11_dsi_te_interrupt_handler(struct drm_i915_private *dev_priv,
val = val & OP_MODE_MASK;
if (val != CMD_MODE_NO_GATE && val != CMD_MODE_TE_GATE) {
- drm_err(&dev_priv->drm, "DSI trancoder not configured in command mode\n");
+ drm_err(display->drm, "DSI trancoder not configured in command mode\n");
return;
}
/* Get PIPE for handling VBLANK event */
- val = intel_de_read(display, TRANS_DDI_FUNC_CTL(dev_priv, dsi_trans));
+ val = intel_de_read(display, TRANS_DDI_FUNC_CTL(display, dsi_trans));
switch (val & TRANS_DDI_EDP_INPUT_MASK) {
case TRANS_DDI_EDP_INPUT_A_ON:
pipe = PIPE_A;
@@ -1311,28 +1289,28 @@ static void gen11_dsi_te_interrupt_handler(struct drm_i915_private *dev_priv,
pipe = PIPE_C;
break;
default:
- drm_err(&dev_priv->drm, "Invalid PIPE\n");
+ drm_err(display->drm, "Invalid PIPE\n");
return;
}
- intel_handle_vblank(dev_priv, pipe);
+ intel_handle_vblank(display, pipe);
/* clear TE in dsi IIR */
port = (te_trigger & DSI1_TE) ? PORT_B : PORT_A;
intel_de_rmw(display, DSI_INTR_IDENT_REG(port), 0, 0);
}
-static u32 gen8_de_pipe_flip_done_mask(struct drm_i915_private *i915)
+static u32 gen8_de_pipe_flip_done_mask(struct intel_display *display)
{
- if (DISPLAY_VER(i915) >= 9)
+ if (DISPLAY_VER(display) >= 9)
return GEN9_PIPE_PLANE1_FLIP_DONE;
else
return GEN8_PIPE_PRIMARY_FLIP_DONE;
}
-static void gen8_read_and_ack_pch_irqs(struct drm_i915_private *i915, u32 *pch_iir, u32 *pica_iir)
+static void gen8_read_and_ack_pch_irqs(struct intel_display *display, u32 *pch_iir, u32 *pica_iir)
{
- struct intel_display *display = &i915->display;
+ struct drm_i915_private *i915 = to_i915(display->drm);
u32 pica_ier = 0;
*pica_iir = 0;
@@ -1346,7 +1324,7 @@ static void gen8_read_and_ack_pch_irqs(struct drm_i915_private *i915, u32 *pch_i
* their flags both in the PICA and SDE IIR.
*/
if (*pch_iir & SDE_PICAINTERRUPT) {
- drm_WARN_ON(&i915->drm, INTEL_PCH_TYPE(i915) < PCH_MTL);
+ drm_WARN_ON(display->drm, INTEL_PCH_TYPE(i915) < PCH_MTL);
pica_ier = intel_de_rmw(display, PICAINTERRUPT_IER, ~0, 0);
*pica_iir = intel_de_read(display, PICAINTERRUPT_IIR);
@@ -1365,26 +1343,26 @@ void gen8_de_irq_handler(struct intel_display *display, u32 master_ctl)
u32 iir;
enum pipe pipe;
- drm_WARN_ON_ONCE(&dev_priv->drm, !HAS_DISPLAY(dev_priv));
+ drm_WARN_ON_ONCE(display->drm, !HAS_DISPLAY(display));
if (master_ctl & GEN8_DE_MISC_IRQ) {
iir = intel_de_read(display, GEN8_DE_MISC_IIR);
if (iir) {
intel_de_write(display, GEN8_DE_MISC_IIR, iir);
- gen8_de_misc_irq_handler(dev_priv, iir);
+ gen8_de_misc_irq_handler(display, iir);
} else {
- drm_err_ratelimited(&dev_priv->drm,
+ drm_err_ratelimited(display->drm,
"The master control interrupt lied (DE MISC)!\n");
}
}
- if (DISPLAY_VER(dev_priv) >= 11 && (master_ctl & GEN11_DE_HPD_IRQ)) {
+ if (DISPLAY_VER(display) >= 11 && (master_ctl & GEN11_DE_HPD_IRQ)) {
iir = intel_de_read(display, GEN11_DE_HPD_IIR);
if (iir) {
intel_de_write(display, GEN11_DE_HPD_IIR, iir);
gen11_hpd_irq_handler(display, iir);
} else {
- drm_err_ratelimited(&dev_priv->drm,
+ drm_err_ratelimited(display->drm,
"The master control interrupt lied, (DE HPD)!\n");
}
}
@@ -1396,19 +1374,19 @@ void gen8_de_irq_handler(struct intel_display *display, u32 master_ctl)
intel_de_write(display, GEN8_DE_PORT_IIR, iir);
- if (iir & gen8_de_port_aux_mask(dev_priv)) {
+ if (iir & gen8_de_port_aux_mask(display)) {
intel_dp_aux_irq_handler(display);
found = true;
}
- if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) {
+ if (display->platform.geminilake || display->platform.broxton) {
u32 hotplug_trigger = iir & BXT_DE_PORT_HOTPLUG_MASK;
if (hotplug_trigger) {
bxt_hpd_irq_handler(display, hotplug_trigger);
found = true;
}
- } else if (IS_BROADWELL(dev_priv)) {
+ } else if (display->platform.broadwell) {
u32 hotplug_trigger = iir & BDW_DE_PORT_HOTPLUG_MASK;
if (hotplug_trigger) {
@@ -1417,31 +1395,31 @@ void gen8_de_irq_handler(struct intel_display *display, u32 master_ctl)
}
}
- if ((IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) &&
+ if ((display->platform.geminilake || display->platform.broxton) &&
(iir & BXT_DE_PORT_GMBUS)) {
intel_gmbus_irq_handler(display);
found = true;
}
- if (DISPLAY_VER(dev_priv) >= 11) {
+ if (DISPLAY_VER(display) >= 11) {
u32 te_trigger = iir & (DSI0_TE | DSI1_TE);
if (te_trigger) {
- gen11_dsi_te_interrupt_handler(dev_priv, te_trigger);
+ gen11_dsi_te_interrupt_handler(display, te_trigger);
found = true;
}
}
if (!found)
- drm_err_ratelimited(&dev_priv->drm,
+ drm_err_ratelimited(display->drm,
"Unexpected DE Port interrupt\n");
} else {
- drm_err_ratelimited(&dev_priv->drm,
+ drm_err_ratelimited(display->drm,
"The master control interrupt lied (DE PORT)!\n");
}
}
- for_each_pipe(dev_priv, pipe) {
+ for_each_pipe(display, pipe) {
u32 fault_errors;
if (!(master_ctl & GEN8_DE_PIPE_IRQ(pipe)))
@@ -1449,7 +1427,7 @@ void gen8_de_irq_handler(struct intel_display *display, u32 master_ctl)
iir = intel_de_read(display, GEN8_DE_PIPE_IIR(pipe));
if (!iir) {
- drm_err_ratelimited(&dev_priv->drm,
+ drm_err_ratelimited(display->drm,
"The master control interrupt lied (DE PIPE)!\n");
continue;
}
@@ -1457,29 +1435,29 @@ void gen8_de_irq_handler(struct intel_display *display, u32 master_ctl)
intel_de_write(display, GEN8_DE_PIPE_IIR(pipe), iir);
if (iir & GEN8_PIPE_VBLANK)
- intel_handle_vblank(dev_priv, pipe);
+ intel_handle_vblank(display, pipe);
- if (iir & gen8_de_pipe_flip_done_mask(dev_priv))
- flip_done_handler(dev_priv, pipe);
+ if (iir & gen8_de_pipe_flip_done_mask(display))
+ flip_done_handler(display, pipe);
- if (HAS_DSB(dev_priv)) {
+ if (HAS_DSB(display)) {
if (iir & GEN12_DSB_INT(INTEL_DSB_0))
- intel_dsb_irq_handler(&dev_priv->display, pipe, INTEL_DSB_0);
+ intel_dsb_irq_handler(display, pipe, INTEL_DSB_0);
if (iir & GEN12_DSB_INT(INTEL_DSB_1))
- intel_dsb_irq_handler(&dev_priv->display, pipe, INTEL_DSB_1);
+ intel_dsb_irq_handler(display, pipe, INTEL_DSB_1);
if (iir & GEN12_DSB_INT(INTEL_DSB_2))
- intel_dsb_irq_handler(&dev_priv->display, pipe, INTEL_DSB_2);
+ intel_dsb_irq_handler(display, pipe, INTEL_DSB_2);
}
if (iir & GEN8_PIPE_CDCLK_CRC_DONE)
- hsw_pipe_crc_irq_handler(dev_priv, pipe);
+ hsw_pipe_crc_irq_handler(display, pipe);
if (iir & GEN8_PIPE_FIFO_UNDERRUN)
intel_cpu_fifo_underrun_irq_handler(display, pipe);
- fault_errors = iir & gen8_de_pipe_fault_mask(dev_priv);
+ fault_errors = iir & gen8_de_pipe_fault_mask(display);
if (fault_errors)
intel_pipe_fault_irq_handler(display,
gen8_pipe_fault_handlers(display),
@@ -1495,7 +1473,7 @@ void gen8_de_irq_handler(struct intel_display *display, u32 master_ctl)
* scheme also closed the SDE interrupt handling race we've seen
* on older pch-split platforms. But this needs testing.
*/
- gen8_read_and_ack_pch_irqs(dev_priv, &iir, &pica_iir);
+ gen8_read_and_ack_pch_irqs(display, &iir, &pica_iir);
if (iir) {
if (pica_iir)
xelpdp_pica_irq_handler(display, pica_iir);
@@ -1505,13 +1483,13 @@ void gen8_de_irq_handler(struct intel_display *display, u32 master_ctl)
else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT)
spt_irq_handler(display, iir);
else
- cpt_irq_handler(dev_priv, iir);
+ cpt_irq_handler(display, iir);
} else {
/*
* Like on previous PCH there seems to be something
* fishy going on with forwarding PCH interrupts.
*/
- drm_dbg(&dev_priv->drm,
+ drm_dbg(display->drm,
"The master control interrupt lied (SDE)!\n");
}
}
@@ -1556,10 +1534,9 @@ void gen11_display_irq_handler(struct intel_display *display)
enable_rpm_wakeref_asserts(&i915->runtime_pm);
}
-static void i915gm_irq_cstate_wa_enable(struct drm_i915_private *i915)
+static void i915gm_irq_cstate_wa_enable(struct intel_display *display)
{
- struct intel_display *display = &i915->display;
- lockdep_assert_held(&i915->drm.vblank_time_lock);
+ lockdep_assert_held(&display->drm->vblank_time_lock);
/*
* Vblank/CRC interrupts fail to wake the device up from C2+.
@@ -1567,33 +1544,30 @@ static void i915gm_irq_cstate_wa_enable(struct drm_i915_private *i915)
* the problem. There is a small power cost so we do this
* only when vblank/CRC interrupts are actually enabled.
*/
- if (i915->display.irq.vblank_enabled++ == 0)
+ if (display->irq.vblank_enabled++ == 0)
intel_de_write(display, SCPD0,
_MASKED_BIT_ENABLE(CSTATE_RENDER_CLOCK_GATE_DISABLE));
}
-static void i915gm_irq_cstate_wa_disable(struct drm_i915_private *i915)
+static void i915gm_irq_cstate_wa_disable(struct intel_display *display)
{
- struct intel_display *display = &i915->display;
- lockdep_assert_held(&i915->drm.vblank_time_lock);
+ lockdep_assert_held(&display->drm->vblank_time_lock);
- if (--i915->display.irq.vblank_enabled == 0)
+ if (--display->irq.vblank_enabled == 0)
intel_de_write(display, SCPD0,
_MASKED_BIT_DISABLE(CSTATE_RENDER_CLOCK_GATE_DISABLE));
}
void i915gm_irq_cstate_wa(struct intel_display *display, bool enable)
{
- struct drm_i915_private *i915 = to_i915(display->drm);
-
- spin_lock_irq(&i915->drm.vblank_time_lock);
+ spin_lock_irq(&display->drm->vblank_time_lock);
if (enable)
- i915gm_irq_cstate_wa_enable(i915);
+ i915gm_irq_cstate_wa_enable(display);
else
- i915gm_irq_cstate_wa_disable(i915);
+ i915gm_irq_cstate_wa_disable(display);
- spin_unlock_irq(&i915->drm.vblank_time_lock);
+ spin_unlock_irq(&display->drm->vblank_time_lock);
}
int i8xx_enable_vblank(struct drm_crtc *crtc)
@@ -1624,20 +1598,20 @@ void i8xx_disable_vblank(struct drm_crtc *crtc)
int i915gm_enable_vblank(struct drm_crtc *crtc)
{
- struct drm_i915_private *i915 = to_i915(crtc->dev);
+ struct intel_display *display = to_intel_display(crtc->dev);
- i915gm_irq_cstate_wa_enable(i915);
+ i915gm_irq_cstate_wa_enable(display);
return i8xx_enable_vblank(crtc);
}
void i915gm_disable_vblank(struct drm_crtc *crtc)
{
- struct drm_i915_private *i915 = to_i915(crtc->dev);
+ struct intel_display *display = to_intel_display(crtc->dev);
i8xx_disable_vblank(crtc);
- i915gm_irq_cstate_wa_disable(i915);
+ i915gm_irq_cstate_wa_disable(display);
}
int i965_enable_vblank(struct drm_crtc *crtc)
@@ -1674,7 +1648,7 @@ int ilk_enable_vblank(struct drm_crtc *crtc)
struct drm_i915_private *dev_priv = to_i915(crtc->dev);
enum pipe pipe = to_intel_crtc(crtc)->pipe;
unsigned long irqflags;
- u32 bit = DISPLAY_VER(dev_priv) >= 7 ?
+ u32 bit = DISPLAY_VER(display) >= 7 ?
DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe);
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
@@ -1684,7 +1658,7 @@ int ilk_enable_vblank(struct drm_crtc *crtc)
/* Even though there is no DMC, frame counter can get stuck when
* PSR is active as no frames are generated.
*/
- if (HAS_PSR(dev_priv))
+ if (HAS_PSR(display))
drm_crtc_vblank_restore(crtc);
return 0;
@@ -1696,7 +1670,7 @@ void ilk_disable_vblank(struct drm_crtc *crtc)
struct drm_i915_private *dev_priv = to_i915(crtc->dev);
enum pipe pipe = to_intel_crtc(crtc)->pipe;
unsigned long irqflags;
- u32 bit = DISPLAY_VER(dev_priv) >= 7 ?
+ u32 bit = DISPLAY_VER(display) >= 7 ?
DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe);
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
@@ -1764,7 +1738,7 @@ int bdw_enable_vblank(struct drm_crtc *_crtc)
/* Even if there is no DMC, frame counter can get stuck when
* PSR is active as no frames are generated, so check only for PSR.
*/
- if (HAS_PSR(dev_priv))
+ if (HAS_PSR(display))
drm_crtc_vblank_restore(&crtc->base);
return 0;
@@ -1897,11 +1871,11 @@ void vlv_display_error_irq_handler(struct intel_display *display,
vlv_page_table_error_irq_handler(display, dpinvgtt);
}
-static void _vlv_display_irq_reset(struct drm_i915_private *dev_priv)
+static void _vlv_display_irq_reset(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
- if (IS_CHERRYVIEW(dev_priv))
+ if (display->platform.cherryview)
intel_de_write(display, DPINVGTT, DPINVGTT_STATUS_MASK_CHV);
else
intel_de_write(display, DPINVGTT, DPINVGTT_STATUS_MASK_VLV);
@@ -1910,9 +1884,9 @@ static void _vlv_display_irq_reset(struct drm_i915_private *dev_priv)
VLV_ERROR_REGS);
i915_hotplug_interrupt_update_locked(display, 0xffffffff, 0);
- intel_de_rmw(display, PORT_HOTPLUG_STAT(dev_priv), 0, 0);
+ intel_de_rmw(display, PORT_HOTPLUG_STAT(display), 0, 0);
- i9xx_pipestat_irq_reset(dev_priv);
+ i9xx_pipestat_irq_reset(display);
intel_display_irq_regs_reset(display, VLV_IRQ_REGS);
dev_priv->irq_mask = ~0u;
@@ -1920,22 +1894,18 @@ static void _vlv_display_irq_reset(struct drm_i915_private *dev_priv)
void vlv_display_irq_reset(struct intel_display *display)
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
-
- if (dev_priv->display.irq.vlv_display_irqs_enabled)
- _vlv_display_irq_reset(dev_priv);
+ if (display->irq.vlv_display_irqs_enabled)
+ _vlv_display_irq_reset(display);
}
void i9xx_display_irq_reset(struct intel_display *display)
{
- struct drm_i915_private *i915 = to_i915(display->drm);
-
- if (I915_HAS_HOTPLUG(i915)) {
+ if (I915_HAS_HOTPLUG(display)) {
i915_hotplug_interrupt_update(display, 0xffffffff, 0);
- intel_de_rmw(display, PORT_HOTPLUG_STAT(i915), 0, 0);
+ intel_de_rmw(display, PORT_HOTPLUG_STAT(display), 0, 0);
}
- i9xx_pipestat_irq_reset(i915);
+ i9xx_pipestat_irq_reset(display);
}
static u32 vlv_error_mask(void)
@@ -1951,10 +1921,10 @@ void vlv_display_irq_postinstall(struct intel_display *display)
u32 enable_mask;
enum pipe pipe;
- if (!dev_priv->display.irq.vlv_display_irqs_enabled)
+ if (!display->irq.vlv_display_irqs_enabled)
return;
- if (IS_CHERRYVIEW(dev_priv))
+ if (display->platform.cherryview)
intel_de_write(display, DPINVGTT,
DPINVGTT_STATUS_MASK_CHV |
DPINVGTT_EN_MASK_CHV);
@@ -1969,7 +1939,7 @@ void vlv_display_irq_postinstall(struct intel_display *display)
pipestat_mask = PIPE_CRC_DONE_INTERRUPT_STATUS;
i915_enable_pipestat(display, PIPE_A, PIPE_GMBUS_INTERRUPT_STATUS);
- for_each_pipe(dev_priv, pipe)
+ for_each_pipe(display, pipe)
i915_enable_pipestat(display, pipe, pipestat_mask);
enable_mask = I915_DISPLAY_PORT_INTERRUPT |
@@ -1979,11 +1949,11 @@ void vlv_display_irq_postinstall(struct intel_display *display)
I915_LPE_PIPE_B_INTERRUPT |
I915_MASTER_ERROR_INTERRUPT;
- if (IS_CHERRYVIEW(dev_priv))
+ if (display->platform.cherryview)
enable_mask |= I915_DISPLAY_PIPE_C_EVENT_INTERRUPT |
I915_LPE_PIPE_C_INTERRUPT;
- drm_WARN_ON(&dev_priv->drm, dev_priv->irq_mask != ~0u);
+ drm_WARN_ON(display->drm, dev_priv->irq_mask != ~0u);
dev_priv->irq_mask = ~enable_mask;
@@ -1992,16 +1962,15 @@ void vlv_display_irq_postinstall(struct intel_display *display)
void gen8_display_irq_reset(struct intel_display *display)
{
- struct drm_i915_private *dev_priv = to_i915(display->drm);
enum pipe pipe;
- if (!HAS_DISPLAY(dev_priv))
+ if (!HAS_DISPLAY(display))
return;
intel_de_write(display, EDP_PSR_IMR, 0xffffffff);
intel_de_write(display, EDP_PSR_IIR, 0xffffffff);
- for_each_pipe(dev_priv, pipe)
+ for_each_pipe(display, pipe)
if (intel_display_power_is_enabled(display,
POWER_DOMAIN_PIPE(pipe)))
intel_display_irq_regs_reset(display, GEN8_DE_PIPE_IRQ_REGS(pipe));
@@ -2017,15 +1986,15 @@ void gen11_display_irq_reset(struct intel_display *display)
u32 trans_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) |
BIT(TRANSCODER_C) | BIT(TRANSCODER_D);
- if (!HAS_DISPLAY(dev_priv))
+ if (!HAS_DISPLAY(display))
return;
intel_de_write(display, GEN11_DISPLAY_INT_CTL, 0);
- if (DISPLAY_VER(dev_priv) >= 12) {
+ if (DISPLAY_VER(display) >= 12) {
enum transcoder trans;
- for_each_cpu_transcoder_masked(dev_priv, trans, trans_mask) {
+ for_each_cpu_transcoder_masked(display, trans, trans_mask) {
enum intel_display_power_domain domain;
domain = POWER_DOMAIN_TRANSCODER(trans);
@@ -2033,10 +2002,10 @@ void gen11_display_irq_reset(struct intel_display *display)
continue;
intel_de_write(display,
- TRANS_PSR_IMR(dev_priv, trans),
+ TRANS_PSR_IMR(display, trans),
0xffffffff);
intel_de_write(display,
- TRANS_PSR_IIR(dev_priv, trans),
+ TRANS_PSR_IIR(display, trans),
0xffffffff);
}
} else {
@@ -2044,7 +2013,7 @@ void gen11_display_irq_reset(struct intel_display *display)
intel_de_write(display, EDP_PSR_IIR, 0xffffffff);
}
- for_each_pipe(dev_priv, pipe)
+ for_each_pipe(display, pipe)
if (intel_display_power_is_enabled(display,
POWER_DOMAIN_PIPE(pipe)))
intel_display_irq_regs_reset(display, GEN8_DE_PIPE_IRQ_REGS(pipe));
@@ -2052,7 +2021,7 @@ void gen11_display_irq_reset(struct intel_display *display)
intel_display_irq_regs_reset(display, GEN8_DE_PORT_IRQ_REGS);
intel_display_irq_regs_reset(display, GEN8_DE_MISC_IRQ_REGS);
- if (DISPLAY_VER(dev_priv) >= 14)
+ if (DISPLAY_VER(display) >= 14)
intel_display_irq_regs_reset(display, PICAINTERRUPT_IRQ_REGS);
else
intel_display_irq_regs_reset(display, GEN11_DE_HPD_IRQ_REGS);
@@ -2066,7 +2035,7 @@ void gen8_irq_power_well_post_enable(struct intel_display *display,
{
struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 extra_ier = GEN8_PIPE_VBLANK | GEN8_PIPE_FIFO_UNDERRUN |
- gen8_de_pipe_flip_done_mask(dev_priv);
+ gen8_de_pipe_flip_done_mask(display);
enum pipe pipe;
spin_lock_irq(&dev_priv->irq_lock);
@@ -2076,10 +2045,10 @@ void gen8_irq_power_well_post_enable(struct intel_display *display,
return;
}
- for_each_pipe_masked(dev_priv, pipe, pipe_mask)
+ for_each_pipe_masked(display, pipe, pipe_mask)
intel_display_irq_regs_init(display, GEN8_DE_PIPE_IRQ_REGS(pipe),
- dev_priv->display.irq.de_irq_mask[pipe],
- ~dev_priv->display.irq.de_irq_mask[pipe] | extra_ier);
+ display->irq.de_irq_mask[pipe],
+ ~display->irq.de_irq_mask[pipe] | extra_ier);
spin_unlock_irq(&dev_priv->irq_lock);
}
@@ -2097,7 +2066,7 @@ void gen8_irq_power_well_pre_disable(struct intel_display *display,
return;
}
- for_each_pipe_masked(dev_priv, pipe, pipe_mask)
+ for_each_pipe_masked(display, pipe, pipe_mask)
intel_display_irq_regs_reset(display, GEN8_DE_PIPE_IRQ_REGS(pipe));
spin_unlock_irq(&dev_priv->irq_lock);
@@ -2117,9 +2086,9 @@ void gen8_irq_power_well_pre_disable(struct intel_display *display,
* to avoid races with the irq handler, assuming we have MSI. Shared legacy
* interrupts could still race.
*/
-static void ibx_irq_postinstall(struct drm_i915_private *dev_priv)
+static void ibx_irq_postinstall(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
+ struct drm_i915_private *dev_priv = to_i915(display->drm);
u32 mask;
if (HAS_PCH_NOP(dev_priv))
@@ -2141,13 +2110,13 @@ void valleyview_enable_display_irqs(struct intel_display *display)
lockdep_assert_held(&dev_priv->irq_lock);
- if (dev_priv->display.irq.vlv_display_irqs_enabled)
+ if (display->irq.vlv_display_irqs_enabled)
return;
- dev_priv->display.irq.vlv_display_irqs_enabled = true;
+ display->irq.vlv_display_irqs_enabled = true;
if (intel_irqs_enabled(dev_priv)) {
- _vlv_display_irq_reset(dev_priv);
+ _vlv_display_irq_reset(display);
vlv_display_irq_postinstall(display);
}
}
@@ -2158,13 +2127,13 @@ void valleyview_disable_display_irqs(struct intel_display *display)
lockdep_assert_held(&dev_priv->irq_lock);
- if (!dev_priv->display.irq.vlv_display_irqs_enabled)
+ if (!display->irq.vlv_display_irqs_enabled)
return;
- dev_priv->display.irq.vlv_display_irqs_enabled = false;
+ display->irq.vlv_display_irqs_enabled = false;
if (intel_irqs_enabled(dev_priv))
- _vlv_display_irq_reset(dev_priv);
+ _vlv_display_irq_reset(display);
}
void ilk_de_irq_postinstall(struct intel_display *display)
@@ -2173,7 +2142,7 @@ void ilk_de_irq_postinstall(struct intel_display *display)
u32 display_mask, extra_mask;
- if (DISPLAY_VER(i915) >= 7) {
+ if (DISPLAY_VER(display) >= 7) {
display_mask = (DE_MASTER_IRQ_CONTROL | DE_GSE_IVB |
DE_PCH_EVENT_IVB | DE_AUX_CHANNEL_A_IVB);
extra_mask = (DE_PIPEC_VBLANK_IVB | DE_PIPEB_VBLANK_IVB |
@@ -2194,59 +2163,59 @@ void ilk_de_irq_postinstall(struct intel_display *display)
DE_DP_A_HOTPLUG);
}
- if (IS_HASWELL(i915)) {
+ if (display->platform.haswell) {
intel_display_irq_regs_assert_irr_is_zero(display, EDP_PSR_IIR);
display_mask |= DE_EDP_PSR_INT_HSW;
}
- if (IS_IRONLAKE_M(i915))
+ if (display->platform.ironlake && display->platform.mobile)
extra_mask |= DE_PCU_EVENT;
i915->irq_mask = ~display_mask;
- ibx_irq_postinstall(i915);
+ ibx_irq_postinstall(display);
intel_display_irq_regs_init(display, DE_IRQ_REGS, i915->irq_mask,
display_mask | extra_mask);
}
-static void mtp_irq_postinstall(struct drm_i915_private *i915);
-static void icp_irq_postinstall(struct drm_i915_private *i915);
+static void mtp_irq_postinstall(struct intel_display *display);
+static void icp_irq_postinstall(struct intel_display *display);
void gen8_de_irq_postinstall(struct intel_display *display)
{
struct drm_i915_private *dev_priv = to_i915(display->drm);
- u32 de_pipe_masked = gen8_de_pipe_fault_mask(dev_priv) |
+ u32 de_pipe_masked = gen8_de_pipe_fault_mask(display) |
GEN8_PIPE_CDCLK_CRC_DONE;
u32 de_pipe_enables;
- u32 de_port_masked = gen8_de_port_aux_mask(dev_priv);
+ u32 de_port_masked = gen8_de_port_aux_mask(display);
u32 de_port_enables;
u32 de_misc_masked = GEN8_DE_EDP_PSR;
u32 trans_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) |
BIT(TRANSCODER_C) | BIT(TRANSCODER_D);
enum pipe pipe;
- if (!HAS_DISPLAY(dev_priv))
+ if (!HAS_DISPLAY(display))
return;
- if (DISPLAY_VER(dev_priv) >= 14)
- mtp_irq_postinstall(dev_priv);
+ if (DISPLAY_VER(display) >= 14)
+ mtp_irq_postinstall(display);
else if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
- icp_irq_postinstall(dev_priv);
+ icp_irq_postinstall(display);
else if (HAS_PCH_SPLIT(dev_priv))
- ibx_irq_postinstall(dev_priv);
+ ibx_irq_postinstall(display);
- if (DISPLAY_VER(dev_priv) < 11)
+ if (DISPLAY_VER(display) < 11)
de_misc_masked |= GEN8_DE_MISC_GSE;
- if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv))
+ if (display->platform.geminilake || display->platform.broxton)
de_port_masked |= BXT_DE_PORT_GMBUS;
- if (DISPLAY_VER(dev_priv) >= 14) {
+ if (DISPLAY_VER(display) >= 14) {
de_misc_masked |= XELPDP_PMDEMAND_RSPTOUT_ERR |
XELPDP_PMDEMAND_RSP | XELPDP_RM_TIMEOUT;
- } else if (DISPLAY_VER(dev_priv) >= 11) {
+ } else if (DISPLAY_VER(display) >= 11) {
enum port port;
if (intel_bios_is_dsi_present(display, &port))
@@ -2256,25 +2225,25 @@ void gen8_de_irq_postinstall(struct intel_display *display)
if (HAS_DBUF_OVERLAP_DETECTION(display))
de_misc_masked |= XE2LPD_DBUF_OVERLAP_DETECTED;
- if (HAS_DSB(dev_priv))
+ if (HAS_DSB(display))
de_pipe_masked |= GEN12_DSB_INT(INTEL_DSB_0) |
GEN12_DSB_INT(INTEL_DSB_1) |
GEN12_DSB_INT(INTEL_DSB_2);
de_pipe_enables = de_pipe_masked |
GEN8_PIPE_VBLANK | GEN8_PIPE_FIFO_UNDERRUN |
- gen8_de_pipe_flip_done_mask(dev_priv);
+ gen8_de_pipe_flip_done_mask(display);
de_port_enables = de_port_masked;
- if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv))
+ if (display->platform.geminilake || display->platform.broxton)
de_port_enables |= BXT_DE_PORT_HOTPLUG_MASK;
- else if (IS_BROADWELL(dev_priv))
+ else if (display->platform.broadwell)
de_port_enables |= BDW_DE_PORT_HOTPLUG_MASK;
- if (DISPLAY_VER(dev_priv) >= 12) {
+ if (DISPLAY_VER(display) >= 12) {
enum transcoder trans;
- for_each_cpu_transcoder_masked(dev_priv, trans, trans_mask) {
+ for_each_cpu_transcoder_masked(display, trans, trans_mask) {
enum intel_display_power_domain domain;
domain = POWER_DOMAIN_TRANSCODER(trans);
@@ -2282,19 +2251,19 @@ void gen8_de_irq_postinstall(struct intel_display *display)
continue;
intel_display_irq_regs_assert_irr_is_zero(display,
- TRANS_PSR_IIR(dev_priv, trans));
+ TRANS_PSR_IIR(display, trans));
}
} else {
intel_display_irq_regs_assert_irr_is_zero(display, EDP_PSR_IIR);
}
- for_each_pipe(dev_priv, pipe) {
- dev_priv->display.irq.de_irq_mask[pipe] = ~de_pipe_masked;
+ for_each_pipe(display, pipe) {
+ display->irq.de_irq_mask[pipe] = ~de_pipe_masked;
if (intel_display_power_is_enabled(display,
POWER_DOMAIN_PIPE(pipe)))
intel_display_irq_regs_init(display, GEN8_DE_PIPE_IRQ_REGS(pipe),
- dev_priv->display.irq.de_irq_mask[pipe],
+ display->irq.de_irq_mask[pipe],
de_pipe_enables);
}
@@ -2303,7 +2272,7 @@ void gen8_de_irq_postinstall(struct intel_display *display)
intel_display_irq_regs_init(display, GEN8_DE_MISC_IRQ_REGS, ~de_misc_masked,
de_misc_masked);
- if (IS_DISPLAY_VER(dev_priv, 11, 13)) {
+ if (IS_DISPLAY_VER(display, 11, 13)) {
u32 de_hpd_masked = 0;
u32 de_hpd_enables = GEN11_DE_TC_HOTPLUG_MASK |
GEN11_DE_TBT_HOTPLUG_MASK;
@@ -2313,9 +2282,8 @@ void gen8_de_irq_postinstall(struct intel_display *display)
}
}
-static void mtp_irq_postinstall(struct drm_i915_private *i915)
+static void mtp_irq_postinstall(struct intel_display *display)
{
- struct intel_display *display = &i915->display;
u32 sde_mask = SDE_GMBUS_ICP | SDE_PICAINTERRUPT;
u32 de_hpd_mask = XELPDP_AUX_TC_MASK;
u32 de_hpd_enables = de_hpd_mask | XELPDP_DP_ALT_HOTPLUG_MASK |
@@ -2327,9 +2295,8 @@ static void mtp_irq_postinstall(struct drm_i915_private *i915)
intel_display_irq_regs_init(display, SDE_IRQ_REGS, ~sde_mask, 0xffffffff);
}
-static void icp_irq_postinstall(struct drm_i915_private *dev_priv)
+static void icp_irq_postinstall(struct intel_display *display)
{
- struct intel_display *display = &dev_priv->display;
u32 mask = SDE_GMBUS_ICP;
intel_display_irq_regs_init(display, SDE_IRQ_REGS, ~mask, 0xffffffff);
--
2.39.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* RE: [PATCH 8/9] drm/i915/irq: convert rest of intel_display_irq.[ch] to struct intel_display
2025-03-11 18:00 ` [PATCH 8/9] drm/i915/irq: convert rest of intel_display_irq.[ch] " Jani Nikula
@ 2025-03-12 5:53 ` Shankar, Uma
0 siblings, 0 replies; 31+ messages in thread
From: Shankar, Uma @ 2025-03-12 5:53 UTC (permalink / raw)
To: Nikula, Jani, intel-gfx@lists.freedesktop.org,
intel-xe@lists.freedesktop.org
Cc: Nikula, Jani
> -----Original Message-----
> From: Intel-xe <intel-xe-bounces@lists.freedesktop.org> On Behalf Of Jani Nikula
> Sent: Tuesday, March 11, 2025 11:31 PM
> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nikula@intel.com>
> Subject: [PATCH 8/9] drm/i915/irq: convert rest of intel_display_irq.[ch] to struct
> intel_display
>
> Going forward, struct intel_display is the main display device data
> pointer. Convert as much as possible of intel_display_irq.[ch] to struct
> intel_display.
Looks Good to me.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> .../gpu/drm/i915/display/intel_display_irq.c | 527 ++++++++----------
> 1 file changed, 247 insertions(+), 280 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c
> b/drivers/gpu/drm/i915/display/intel_display_irq.c
> index 68f903c35978..6f78fe6de06a 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_irq.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
> @@ -115,9 +115,8 @@ static void intel_pipe_fault_irq_handler(struct
> intel_display *display,
> }
>
> static void
> -intel_handle_vblank(struct drm_i915_private *dev_priv, enum pipe pipe)
> +intel_handle_vblank(struct intel_display *display, enum pipe pipe)
> {
> - struct intel_display *display = &dev_priv->display;
> struct intel_crtc *crtc = intel_crtc_for_pipe(display, pipe);
>
> drm_crtc_handle_vblank(&crtc->base);
> @@ -136,14 +135,14 @@ void ilk_update_display_irq(struct intel_display
> *display,
> u32 new_val;
>
> lockdep_assert_held(&dev_priv->irq_lock);
> - drm_WARN_ON(&dev_priv->drm, enabled_irq_mask &
> ~interrupt_mask);
> + drm_WARN_ON(display->drm, enabled_irq_mask & ~interrupt_mask);
>
> new_val = dev_priv->irq_mask;
> new_val &= ~interrupt_mask;
> new_val |= (~enabled_irq_mask & interrupt_mask);
>
> if (new_val != dev_priv->irq_mask &&
> - !drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv))) {
> + !drm_WARN_ON(display->drm, !intel_irqs_enabled(dev_priv))) {
> dev_priv->irq_mask = new_val;
> intel_de_write(display, DEIMR, dev_priv->irq_mask);
> intel_de_posting_read(display, DEIMR);
> @@ -175,9 +174,9 @@ void bdw_update_port_irq(struct intel_display *display,
>
> lockdep_assert_held(&dev_priv->irq_lock);
>
> - drm_WARN_ON(&dev_priv->drm, enabled_irq_mask &
> ~interrupt_mask);
> + drm_WARN_ON(display->drm, enabled_irq_mask & ~interrupt_mask);
>
> - if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
> + if (drm_WARN_ON(display->drm, !intel_irqs_enabled(dev_priv)))
> return;
>
> old_val = intel_de_read(display, GEN8_DE_PORT_IMR);
> @@ -208,17 +207,17 @@ static void bdw_update_pipe_irq(struct intel_display
> *display,
>
> lockdep_assert_held(&dev_priv->irq_lock);
>
> - drm_WARN_ON(&dev_priv->drm, enabled_irq_mask &
> ~interrupt_mask);
> + drm_WARN_ON(display->drm, enabled_irq_mask & ~interrupt_mask);
>
> - if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
> + if (drm_WARN_ON(display->drm, !intel_irqs_enabled(dev_priv)))
> return;
>
> - new_val = dev_priv->display.irq.de_irq_mask[pipe];
> + new_val = display->irq.de_irq_mask[pipe];
> new_val &= ~interrupt_mask;
> new_val |= (~enabled_irq_mask & interrupt_mask);
>
> - if (new_val != dev_priv->display.irq.de_irq_mask[pipe]) {
> - dev_priv->display.irq.de_irq_mask[pipe] = new_val;
> + if (new_val != display->irq.de_irq_mask[pipe]) {
> + display->irq.de_irq_mask[pipe] = new_val;
> intel_de_write(display, GEN8_DE_PIPE_IMR(pipe), display-
> >irq.de_irq_mask[pipe]);
> intel_de_posting_read(display, GEN8_DE_PIPE_IMR(pipe));
> }
> @@ -252,11 +251,11 @@ void ibx_display_interrupt_update(struct intel_display
> *display,
> sdeimr &= ~interrupt_mask;
> sdeimr |= (~enabled_irq_mask & interrupt_mask);
>
> - drm_WARN_ON(&dev_priv->drm, enabled_irq_mask &
> ~interrupt_mask);
> + drm_WARN_ON(display->drm, enabled_irq_mask & ~interrupt_mask);
>
> lockdep_assert_held(&dev_priv->irq_lock);
>
> - if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
> + if (drm_WARN_ON(display->drm, !intel_irqs_enabled(dev_priv)))
> return;
>
> intel_de_write(display, SDEIMR, sdeimr);
> @@ -322,20 +321,20 @@ void i915_enable_pipestat(struct intel_display
> *display,
> enum pipe pipe, u32 status_mask)
> {
> struct drm_i915_private *dev_priv = to_i915(display->drm);
> - i915_reg_t reg = PIPESTAT(dev_priv, pipe);
> + i915_reg_t reg = PIPESTAT(display, pipe);
> u32 enable_mask;
>
> - drm_WARN_ONCE(&dev_priv->drm, status_mask &
> ~PIPESTAT_INT_STATUS_MASK,
> + drm_WARN_ONCE(display->drm, status_mask &
> ~PIPESTAT_INT_STATUS_MASK,
> "pipe %c: status_mask=0x%x\n",
> pipe_name(pipe), status_mask);
>
> lockdep_assert_held(&dev_priv->irq_lock);
> - drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv));
> + drm_WARN_ON(display->drm, !intel_irqs_enabled(dev_priv));
>
> - if ((dev_priv->display.irq.pipestat_irq_mask[pipe] & status_mask) ==
> status_mask)
> + if ((display->irq.pipestat_irq_mask[pipe] & status_mask) == status_mask)
> return;
>
> - dev_priv->display.irq.pipestat_irq_mask[pipe] |= status_mask;
> + display->irq.pipestat_irq_mask[pipe] |= status_mask;
> enable_mask = i915_pipestat_enable_mask(display, pipe);
>
> intel_de_write(display, reg, enable_mask | status_mask);
> @@ -346,20 +345,20 @@ void i915_disable_pipestat(struct intel_display
> *display,
> enum pipe pipe, u32 status_mask)
> {
> struct drm_i915_private *dev_priv = to_i915(display->drm);
> - i915_reg_t reg = PIPESTAT(dev_priv, pipe);
> + i915_reg_t reg = PIPESTAT(display, pipe);
> u32 enable_mask;
>
> - drm_WARN_ONCE(&dev_priv->drm, status_mask &
> ~PIPESTAT_INT_STATUS_MASK,
> + drm_WARN_ONCE(display->drm, status_mask &
> ~PIPESTAT_INT_STATUS_MASK,
> "pipe %c: status_mask=0x%x\n",
> pipe_name(pipe), status_mask);
>
> lockdep_assert_held(&dev_priv->irq_lock);
> - drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv));
> + drm_WARN_ON(display->drm, !intel_irqs_enabled(dev_priv));
>
> - if ((dev_priv->display.irq.pipestat_irq_mask[pipe] & status_mask) == 0)
> + if ((display->irq.pipestat_irq_mask[pipe] & status_mask) == 0)
> return;
>
> - dev_priv->display.irq.pipestat_irq_mask[pipe] &= ~status_mask;
> + display->irq.pipestat_irq_mask[pipe] &= ~status_mask;
> enable_mask = i915_pipestat_enable_mask(display, pipe);
>
> intel_de_write(display, reg, enable_mask | status_mask);
> @@ -368,15 +367,13 @@ void i915_disable_pipestat(struct intel_display
> *display,
>
> static bool i915_has_legacy_blc_interrupt(struct intel_display *display)
> {
> - struct drm_i915_private *i915 = to_i915(display->drm);
> -
> - if (IS_I85X(i915))
> + if (display->platform.i85x)
> return true;
>
> - if (IS_PINEVIEW(i915))
> + if (display->platform.pineview)
> return true;
>
> - return IS_DISPLAY_VER(display, 3, 4) && IS_MOBILE(i915);
> + return IS_DISPLAY_VER(display, 3, 4) && display->platform.mobile;
> }
>
> /**
> @@ -396,7 +393,7 @@ void i915_enable_asle_pipestat(struct intel_display
> *display)
> spin_lock_irq(&dev_priv->irq_lock);
>
> i915_enable_pipestat(display, PIPE_B,
> PIPE_LEGACY_BLC_EVENT_STATUS);
> - if (DISPLAY_VER(dev_priv) >= 4)
> + if (DISPLAY_VER(display) >= 4)
> i915_enable_pipestat(display, PIPE_A,
> PIPE_LEGACY_BLC_EVENT_STATUS);
>
> @@ -404,13 +401,12 @@ void i915_enable_asle_pipestat(struct intel_display
> *display)
> }
>
> #if IS_ENABLED(CONFIG_DEBUG_FS)
> -static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
> +static void display_pipe_crc_irq_handler(struct intel_display *display,
> enum pipe pipe,
> u32 crc0, u32 crc1,
> u32 crc2, u32 crc3,
> u32 crc4)
> {
> - struct intel_display *display = &dev_priv->display;
> struct intel_crtc *crtc = intel_crtc_for_pipe(display, pipe);
> struct intel_pipe_crc *pipe_crc = &crtc->pipe_crc;
> u32 crcs[5] = { crc0, crc1, crc2, crc3, crc4 };
> @@ -427,7 +423,7 @@ static void display_pipe_crc_irq_handler(struct
> drm_i915_private *dev_priv,
> * don't trust that one either.
> */
> if (pipe_crc->skipped <= 0 ||
> - (DISPLAY_VER(dev_priv) >= 8 && pipe_crc->skipped == 1)) {
> + (DISPLAY_VER(display) >= 8 && pipe_crc->skipped == 1)) {
> pipe_crc->skipped++;
> spin_unlock(&pipe_crc->lock);
> return;
> @@ -440,20 +436,19 @@ static void display_pipe_crc_irq_handler(struct
> drm_i915_private *dev_priv,
> }
> #else
> static inline void
> -display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
> +display_pipe_crc_irq_handler(struct intel_display *display,
> enum pipe pipe,
> u32 crc0, u32 crc1,
> u32 crc2, u32 crc3,
> u32 crc4) {}
> #endif
>
> -static void flip_done_handler(struct drm_i915_private *i915,
> +static void flip_done_handler(struct intel_display *display,
> enum pipe pipe)
> {
> - struct intel_display *display = &i915->display;
> struct intel_crtc *crtc = intel_crtc_for_pipe(display, pipe);
>
> - spin_lock(&i915->drm.event_lock);
> + spin_lock(&display->drm->event_lock);
>
> if (crtc->flip_done_event) {
> trace_intel_crtc_flip_done(crtc);
> @@ -461,25 +456,21 @@ static void flip_done_handler(struct drm_i915_private
> *i915,
> crtc->flip_done_event = NULL;
> }
>
> - spin_unlock(&i915->drm.event_lock);
> + spin_unlock(&display->drm->event_lock);
> }
>
> -static void hsw_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
> +static void hsw_pipe_crc_irq_handler(struct intel_display *display,
> enum pipe pipe)
> {
> - struct intel_display *display = &dev_priv->display;
> -
> - display_pipe_crc_irq_handler(dev_priv, pipe,
> + display_pipe_crc_irq_handler(display, pipe,
> intel_de_read(display,
> PIPE_CRC_RES_HSW(pipe)),
> 0, 0, 0, 0);
> }
>
> -static void ivb_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
> +static void ivb_pipe_crc_irq_handler(struct intel_display *display,
> enum pipe pipe)
> {
> - struct intel_display *display = &dev_priv->display;
> -
> - display_pipe_crc_irq_handler(dev_priv, pipe,
> + display_pipe_crc_irq_handler(display, pipe,
> intel_de_read(display,
> PIPE_CRC_RES_1_IVB(pipe)),
> intel_de_read(display,
> PIPE_CRC_RES_2_IVB(pipe)),
> intel_de_read(display,
> PIPE_CRC_RES_3_IVB(pipe)),
> @@ -487,40 +478,38 @@ static void ivb_pipe_crc_irq_handler(struct
> drm_i915_private *dev_priv,
> intel_de_read(display,
> PIPE_CRC_RES_5_IVB(pipe)));
> }
>
> -static void i9xx_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
> +static void i9xx_pipe_crc_irq_handler(struct intel_display *display,
> enum pipe pipe)
> {
> - struct intel_display *display = &dev_priv->display;
> u32 res1, res2;
>
> - if (DISPLAY_VER(dev_priv) >= 3)
> - res1 = intel_de_read(display,
> PIPE_CRC_RES_RES1_I915(dev_priv, pipe));
> + if (DISPLAY_VER(display) >= 3)
> + res1 = intel_de_read(display, PIPE_CRC_RES_RES1_I915(display,
> pipe));
> else
> res1 = 0;
>
> - if (DISPLAY_VER(dev_priv) >= 5 || IS_G4X(dev_priv))
> - res2 = intel_de_read(display,
> PIPE_CRC_RES_RES2_G4X(dev_priv, pipe));
> + if (DISPLAY_VER(display) >= 5 || display->platform.g4x)
> + res2 = intel_de_read(display, PIPE_CRC_RES_RES2_G4X(display,
> pipe));
> else
> res2 = 0;
>
> - display_pipe_crc_irq_handler(dev_priv, pipe,
> - intel_de_read(display,
> PIPE_CRC_RES_RED(dev_priv, pipe)),
> - intel_de_read(display,
> PIPE_CRC_RES_GREEN(dev_priv, pipe)),
> - intel_de_read(display,
> PIPE_CRC_RES_BLUE(dev_priv, pipe)),
> + display_pipe_crc_irq_handler(display, pipe,
> + intel_de_read(display,
> PIPE_CRC_RES_RED(display, pipe)),
> + intel_de_read(display,
> PIPE_CRC_RES_GREEN(display, pipe)),
> + intel_de_read(display,
> PIPE_CRC_RES_BLUE(display, pipe)),
> res1, res2);
> }
>
> -static void i9xx_pipestat_irq_reset(struct drm_i915_private *dev_priv)
> +static void i9xx_pipestat_irq_reset(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> enum pipe pipe;
>
> - for_each_pipe(dev_priv, pipe) {
> + for_each_pipe(display, pipe) {
> intel_de_write(display,
> - PIPESTAT(dev_priv, pipe),
> + PIPESTAT(display, pipe),
> PIPESTAT_INT_STATUS_MASK |
> PIPE_FIFO_UNDERRUN_STATUS);
>
> - dev_priv->display.irq.pipestat_irq_mask[pipe] = 0;
> + display->irq.pipestat_irq_mask[pipe] = 0;
> }
> }
>
> @@ -532,13 +521,13 @@ void i9xx_pipestat_irq_ack(struct intel_display
> *display,
>
> spin_lock(&dev_priv->irq_lock);
>
> - if ((IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) &&
> - !dev_priv->display.irq.vlv_display_irqs_enabled) {
> + if ((display->platform.valleyview || display->platform.cherryview) &&
> + !display->irq.vlv_display_irqs_enabled) {
> spin_unlock(&dev_priv->irq_lock);
> return;
> }
>
> - for_each_pipe(dev_priv, pipe) {
> + for_each_pipe(display, pipe) {
> i915_reg_t reg;
> u32 status_mask, enable_mask, iir_bit = 0;
>
> @@ -566,12 +555,12 @@ void i9xx_pipestat_irq_ack(struct intel_display
> *display,
> break;
> }
> if (iir & iir_bit)
> - status_mask |= dev_priv-
> >display.irq.pipestat_irq_mask[pipe];
> + status_mask |= display->irq.pipestat_irq_mask[pipe];
>
> if (!status_mask)
> continue;
>
> - reg = PIPESTAT(dev_priv, pipe);
> + reg = PIPESTAT(display, pipe);
> pipe_stats[pipe] = intel_de_read(display, reg) & status_mask;
> enable_mask = i915_pipestat_enable_mask(display, pipe);
>
> @@ -595,19 +584,18 @@ void i9xx_pipestat_irq_ack(struct intel_display
> *display,
> void i915_pipestat_irq_handler(struct intel_display *display,
> u32 iir, u32 pipe_stats[I915_MAX_PIPES])
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> bool blc_event = false;
> enum pipe pipe;
>
> - for_each_pipe(dev_priv, pipe) {
> + for_each_pipe(display, pipe) {
> if (pipe_stats[pipe] & PIPE_VBLANK_INTERRUPT_STATUS)
> - intel_handle_vblank(dev_priv, pipe);
> + intel_handle_vblank(display, pipe);
>
> if (pipe_stats[pipe] & PIPE_LEGACY_BLC_EVENT_STATUS)
> blc_event = true;
>
> if (pipe_stats[pipe] & PIPE_CRC_DONE_INTERRUPT_STATUS)
> - i9xx_pipe_crc_irq_handler(dev_priv, pipe);
> + i9xx_pipe_crc_irq_handler(display, pipe);
>
> if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS)
> intel_cpu_fifo_underrun_irq_handler(display, pipe);
> @@ -620,19 +608,18 @@ void i915_pipestat_irq_handler(struct intel_display
> *display,
> void i965_pipestat_irq_handler(struct intel_display *display,
> u32 iir, u32 pipe_stats[I915_MAX_PIPES])
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> bool blc_event = false;
> enum pipe pipe;
>
> - for_each_pipe(dev_priv, pipe) {
> + for_each_pipe(display, pipe) {
> if (pipe_stats[pipe] &
> PIPE_START_VBLANK_INTERRUPT_STATUS)
> - intel_handle_vblank(dev_priv, pipe);
> + intel_handle_vblank(display, pipe);
>
> if (pipe_stats[pipe] & PIPE_LEGACY_BLC_EVENT_STATUS)
> blc_event = true;
>
> if (pipe_stats[pipe] & PIPE_CRC_DONE_INTERRUPT_STATUS)
> - i9xx_pipe_crc_irq_handler(dev_priv, pipe);
> + i9xx_pipe_crc_irq_handler(display, pipe);
>
> if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS)
> intel_cpu_fifo_underrun_irq_handler(display, pipe);
> @@ -648,18 +635,17 @@ void i965_pipestat_irq_handler(struct intel_display
> *display,
> void valleyview_pipestat_irq_handler(struct intel_display *display,
> u32 pipe_stats[I915_MAX_PIPES])
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> enum pipe pipe;
>
> - for_each_pipe(dev_priv, pipe) {
> + for_each_pipe(display, pipe) {
> if (pipe_stats[pipe] &
> PIPE_START_VBLANK_INTERRUPT_STATUS)
> - intel_handle_vblank(dev_priv, pipe);
> + intel_handle_vblank(display, pipe);
>
> if (pipe_stats[pipe] & PLANE_FLIP_DONE_INT_STATUS_VLV)
> - flip_done_handler(dev_priv, pipe);
> + flip_done_handler(display, pipe);
>
> if (pipe_stats[pipe] & PIPE_CRC_DONE_INTERRUPT_STATUS)
> - i9xx_pipe_crc_irq_handler(dev_priv, pipe);
> + i9xx_pipe_crc_irq_handler(display, pipe);
>
> if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS)
> intel_cpu_fifo_underrun_irq_handler(display, pipe);
> @@ -669,9 +655,8 @@ void valleyview_pipestat_irq_handler(struct intel_display
> *display,
> intel_gmbus_irq_handler(display);
> }
>
> -static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
> +static void ibx_irq_handler(struct intel_display *display, u32 pch_iir)
> {
> - struct intel_display *display = &dev_priv->display;
> enum pipe pipe;
> u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK;
>
> @@ -680,7 +665,7 @@ static void ibx_irq_handler(struct drm_i915_private
> *dev_priv, u32 pch_iir)
> if (pch_iir & SDE_AUDIO_POWER_MASK) {
> int port = ffs((pch_iir & SDE_AUDIO_POWER_MASK) >>
> SDE_AUDIO_POWER_SHIFT);
> - drm_dbg(&dev_priv->drm, "PCH audio power change on port
> %d\n",
> + drm_dbg(display->drm, "PCH audio power change on port %d\n",
> port_name(port));
> }
>
> @@ -691,26 +676,26 @@ static void ibx_irq_handler(struct drm_i915_private
> *dev_priv, u32 pch_iir)
> intel_gmbus_irq_handler(display);
>
> if (pch_iir & SDE_AUDIO_HDCP_MASK)
> - drm_dbg(&dev_priv->drm, "PCH HDCP audio interrupt\n");
> + drm_dbg(display->drm, "PCH HDCP audio interrupt\n");
>
> if (pch_iir & SDE_AUDIO_TRANS_MASK)
> - drm_dbg(&dev_priv->drm, "PCH transcoder audio interrupt\n");
> + drm_dbg(display->drm, "PCH transcoder audio interrupt\n");
>
> if (pch_iir & SDE_POISON)
> - drm_err(&dev_priv->drm, "PCH poison interrupt\n");
> + drm_err(display->drm, "PCH poison interrupt\n");
>
> if (pch_iir & SDE_FDI_MASK) {
> - for_each_pipe(dev_priv, pipe)
> - drm_dbg(&dev_priv->drm, " pipe %c FDI IIR:
> 0x%08x\n",
> + for_each_pipe(display, pipe)
> + drm_dbg(display->drm, " pipe %c FDI IIR: 0x%08x\n",
> pipe_name(pipe),
> intel_de_read(display, FDI_RX_IIR(pipe)));
> }
>
> if (pch_iir & (SDE_TRANSB_CRC_DONE | SDE_TRANSA_CRC_DONE))
> - drm_dbg(&dev_priv->drm, "PCH transcoder CRC done
> interrupt\n");
> + drm_dbg(display->drm, "PCH transcoder CRC done interrupt\n");
>
> if (pch_iir & (SDE_TRANSB_CRC_ERR | SDE_TRANSA_CRC_ERR))
> - drm_dbg(&dev_priv->drm,
> + drm_dbg(display->drm,
> "PCH transcoder CRC error interrupt\n");
>
> if (pch_iir & SDE_TRANSA_FIFO_UNDER)
> @@ -753,14 +738,13 @@ static const struct pipe_fault_handler
> ivb_pipe_fault_handlers[] = {
> {}
> };
>
> -static void ivb_err_int_handler(struct drm_i915_private *dev_priv)
> +static void ivb_err_int_handler(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> u32 err_int = intel_de_read(display, GEN7_ERR_INT);
> enum pipe pipe;
>
> if (err_int & ERR_INT_POISON)
> - drm_err(&dev_priv->drm, "Poison interrupt\n");
> + drm_err(display->drm, "Poison interrupt\n");
>
> if (err_int & ERR_INT_INVALID_GTT_PTE)
> drm_err_ratelimited(display->drm, "Invalid GTT PTE\n");
> @@ -768,17 +752,17 @@ static void ivb_err_int_handler(struct
> drm_i915_private *dev_priv)
> if (err_int & ERR_INT_INVALID_PTE_DATA)
> drm_err_ratelimited(display->drm, "Invalid PTE data\n");
>
> - for_each_pipe(dev_priv, pipe) {
> + for_each_pipe(display, pipe) {
> u32 fault_errors;
>
> if (err_int & ERR_INT_FIFO_UNDERRUN(pipe))
> intel_cpu_fifo_underrun_irq_handler(display, pipe);
>
> if (err_int & ERR_INT_PIPE_CRC_DONE(pipe)) {
> - if (IS_IVYBRIDGE(dev_priv))
> - ivb_pipe_crc_irq_handler(dev_priv, pipe);
> + if (display->platform.ivybridge)
> + ivb_pipe_crc_irq_handler(display, pipe);
> else
> - hsw_pipe_crc_irq_handler(dev_priv, pipe);
> + hsw_pipe_crc_irq_handler(display, pipe);
> }
>
> fault_errors = err_int & ivb_err_int_pipe_fault_mask(pipe);
> @@ -790,25 +774,23 @@ static void ivb_err_int_handler(struct
> drm_i915_private *dev_priv)
> intel_de_write(display, GEN7_ERR_INT, err_int);
> }
>
> -static void cpt_serr_int_handler(struct drm_i915_private *dev_priv)
> +static void cpt_serr_int_handler(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> u32 serr_int = intel_de_read(display, SERR_INT);
> enum pipe pipe;
>
> if (serr_int & SERR_INT_POISON)
> - drm_err(&dev_priv->drm, "PCH poison interrupt\n");
> + drm_err(display->drm, "PCH poison interrupt\n");
>
> - for_each_pipe(dev_priv, pipe)
> + for_each_pipe(display, pipe)
> if (serr_int & SERR_INT_TRANS_FIFO_UNDERRUN(pipe))
> intel_pch_fifo_underrun_irq_handler(display, pipe);
>
> intel_de_write(display, SERR_INT, serr_int);
> }
>
> -static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
> +static void cpt_irq_handler(struct intel_display *display, u32 pch_iir)
> {
> - struct intel_display *display = &dev_priv->display;
> enum pipe pipe;
> u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK_CPT;
>
> @@ -817,7 +799,7 @@ static void cpt_irq_handler(struct drm_i915_private
> *dev_priv, u32 pch_iir)
> if (pch_iir & SDE_AUDIO_POWER_MASK_CPT) {
> int port = ffs((pch_iir & SDE_AUDIO_POWER_MASK_CPT) >>
> SDE_AUDIO_POWER_SHIFT_CPT);
> - drm_dbg(&dev_priv->drm, "PCH audio power change on port
> %c\n",
> + drm_dbg(display->drm, "PCH audio power change on port %c\n",
> port_name(port));
> }
>
> @@ -828,20 +810,20 @@ static void cpt_irq_handler(struct drm_i915_private
> *dev_priv, u32 pch_iir)
> intel_gmbus_irq_handler(display);
>
> if (pch_iir & SDE_AUDIO_CP_REQ_CPT)
> - drm_dbg(&dev_priv->drm, "Audio CP request interrupt\n");
> + drm_dbg(display->drm, "Audio CP request interrupt\n");
>
> if (pch_iir & SDE_AUDIO_CP_CHG_CPT)
> - drm_dbg(&dev_priv->drm, "Audio CP change interrupt\n");
> + drm_dbg(display->drm, "Audio CP change interrupt\n");
>
> if (pch_iir & SDE_FDI_MASK_CPT) {
> - for_each_pipe(dev_priv, pipe)
> - drm_dbg(&dev_priv->drm, " pipe %c FDI IIR:
> 0x%08x\n",
> + for_each_pipe(display, pipe)
> + drm_dbg(display->drm, " pipe %c FDI IIR: 0x%08x\n",
> pipe_name(pipe),
> intel_de_read(display, FDI_RX_IIR(pipe)));
> }
>
> if (pch_iir & SDE_ERROR_CPT)
> - cpt_serr_int_handler(dev_priv);
> + cpt_serr_int_handler(display);
> }
>
> static u32 ilk_gtt_fault_pipe_fault_mask(enum pipe pipe)
> @@ -910,23 +892,23 @@ void ilk_display_irq_handler(struct intel_display
> *display, u32 de_iir)
> intel_opregion_asle_intr(display);
>
> if (de_iir & DE_POISON)
> - drm_err(&dev_priv->drm, "Poison interrupt\n");
> + drm_err(display->drm, "Poison interrupt\n");
>
> if (de_iir & DE_GTT_FAULT)
> ilk_gtt_fault_irq_handler(display);
>
> - for_each_pipe(dev_priv, pipe) {
> + for_each_pipe(display, pipe) {
> if (de_iir & DE_PIPE_VBLANK(pipe))
> - intel_handle_vblank(dev_priv, pipe);
> + intel_handle_vblank(display, pipe);
>
> if (de_iir & DE_PLANE_FLIP_DONE(pipe))
> - flip_done_handler(dev_priv, pipe);
> + flip_done_handler(display, pipe);
>
> if (de_iir & DE_PIPE_FIFO_UNDERRUN(pipe))
> intel_cpu_fifo_underrun_irq_handler(display, pipe);
>
> if (de_iir & DE_PIPE_CRC_DONE(pipe))
> - i9xx_pipe_crc_irq_handler(dev_priv, pipe);
> + i9xx_pipe_crc_irq_handler(display, pipe);
> }
>
> /* check event from PCH */
> @@ -934,15 +916,15 @@ void ilk_display_irq_handler(struct intel_display
> *display, u32 de_iir)
> u32 pch_iir = intel_de_read(display, SDEIIR);
>
> if (HAS_PCH_CPT(dev_priv))
> - cpt_irq_handler(dev_priv, pch_iir);
> + cpt_irq_handler(display, pch_iir);
> else
> - ibx_irq_handler(dev_priv, pch_iir);
> + ibx_irq_handler(display, pch_iir);
>
> /* should clear PCH hotplug event before clear CPU irq */
> intel_de_write(display, SDEIIR, pch_iir);
> }
>
> - if (DISPLAY_VER(dev_priv) == 5 && de_iir & DE_PCU_EVENT)
> + if (DISPLAY_VER(display) == 5 && de_iir & DE_PCU_EVENT)
> gen5_rps_irq_handler(&to_gt(dev_priv)->rps);
> }
>
> @@ -956,12 +938,12 @@ void ivb_display_irq_handler(struct intel_display
> *display, u32 de_iir)
> ilk_hpd_irq_handler(display, hotplug_trigger);
>
> if (de_iir & DE_ERR_INT_IVB)
> - ivb_err_int_handler(dev_priv);
> + ivb_err_int_handler(display);
>
> if (de_iir & DE_EDP_PSR_INT_HSW) {
> struct intel_encoder *encoder;
>
> - for_each_intel_encoder_with_psr(&dev_priv->drm, encoder) {
> + for_each_intel_encoder_with_psr(display->drm, encoder) {
> struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> u32 psr_iir;
>
> @@ -977,35 +959,35 @@ void ivb_display_irq_handler(struct intel_display
> *display, u32 de_iir)
> if (de_iir & DE_GSE_IVB)
> intel_opregion_asle_intr(display);
>
> - for_each_pipe(dev_priv, pipe) {
> + for_each_pipe(display, pipe) {
> if (de_iir & DE_PIPE_VBLANK_IVB(pipe))
> - intel_handle_vblank(dev_priv, pipe);
> + intel_handle_vblank(display, pipe);
>
> if (de_iir & DE_PLANE_FLIP_DONE_IVB(pipe))
> - flip_done_handler(dev_priv, pipe);
> + flip_done_handler(display, pipe);
> }
>
> /* check event from PCH */
> if (!HAS_PCH_NOP(dev_priv) && (de_iir & DE_PCH_EVENT_IVB)) {
> u32 pch_iir = intel_de_read(display, SDEIIR);
>
> - cpt_irq_handler(dev_priv, pch_iir);
> + cpt_irq_handler(display, pch_iir);
>
> /* clear PCH hotplug event before clear CPU irq */
> intel_de_write(display, SDEIIR, pch_iir);
> }
> }
>
> -static u32 gen8_de_port_aux_mask(struct drm_i915_private *dev_priv)
> +static u32 gen8_de_port_aux_mask(struct intel_display *display)
> {
> u32 mask;
>
> - if (DISPLAY_VER(dev_priv) >= 20)
> + if (DISPLAY_VER(display) >= 20)
> return 0;
> - else if (DISPLAY_VER(dev_priv) >= 14)
> + else if (DISPLAY_VER(display) >= 14)
> return TGL_DE_PORT_AUX_DDIA |
> TGL_DE_PORT_AUX_DDIB;
> - else if (DISPLAY_VER(dev_priv) >= 13)
> + else if (DISPLAY_VER(display) >= 13)
> return TGL_DE_PORT_AUX_DDIA |
> TGL_DE_PORT_AUX_DDIB |
> TGL_DE_PORT_AUX_DDIC |
> @@ -1015,7 +997,7 @@ static u32 gen8_de_port_aux_mask(struct
> drm_i915_private *dev_priv)
> TGL_DE_PORT_AUX_USBC2 |
> TGL_DE_PORT_AUX_USBC3 |
> TGL_DE_PORT_AUX_USBC4;
> - else if (DISPLAY_VER(dev_priv) >= 12)
> + else if (DISPLAY_VER(display) >= 12)
> return TGL_DE_PORT_AUX_DDIA |
> TGL_DE_PORT_AUX_DDIB |
> TGL_DE_PORT_AUX_DDIC |
> @@ -1027,12 +1009,12 @@ static u32 gen8_de_port_aux_mask(struct
> drm_i915_private *dev_priv)
> TGL_DE_PORT_AUX_USBC6;
>
> mask = GEN8_AUX_CHANNEL_A;
> - if (DISPLAY_VER(dev_priv) >= 9)
> + if (DISPLAY_VER(display) >= 9)
> mask |= GEN9_AUX_CHANNEL_B |
> GEN9_AUX_CHANNEL_C |
> GEN9_AUX_CHANNEL_D;
>
> - if (DISPLAY_VER(dev_priv) == 11) {
> + if (DISPLAY_VER(display) == 11) {
> mask |= ICL_AUX_CHANNEL_F;
> mask |= ICL_AUX_CHANNEL_E;
> }
> @@ -1040,10 +1022,8 @@ static u32 gen8_de_port_aux_mask(struct
> drm_i915_private *dev_priv)
> return mask;
> }
>
> -static u32 gen8_de_pipe_fault_mask(struct drm_i915_private *dev_priv)
> +static u32 gen8_de_pipe_fault_mask(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> -
> if (DISPLAY_VER(display) >= 14)
> return MTL_PIPEDMC_ATS_FAULT |
> MTL_PLANE_ATS_FAULT |
> @@ -1195,15 +1175,14 @@ gen8_pipe_fault_handlers(struct intel_display
> *display)
> return bdw_pipe_fault_handlers;
> }
>
> -static void intel_pmdemand_irq_handler(struct drm_i915_private *dev_priv)
> +static void intel_pmdemand_irq_handler(struct intel_display *display)
> {
> - wake_up_all(&dev_priv->display.pmdemand.waitqueue);
> + wake_up_all(&display->pmdemand.waitqueue);
> }
>
> static void
> -gen8_de_misc_irq_handler(struct drm_i915_private *dev_priv, u32 iir)
> +gen8_de_misc_irq_handler(struct intel_display *display, u32 iir)
> {
> - struct intel_display *display = &dev_priv->display;
> bool found = false;
>
> if (HAS_DBUF_OVERLAP_DETECTION(display)) {
> @@ -1213,20 +1192,20 @@ gen8_de_misc_irq_handler(struct drm_i915_private
> *dev_priv, u32 iir)
> }
> }
>
> - if (DISPLAY_VER(dev_priv) >= 14) {
> + if (DISPLAY_VER(display) >= 14) {
> if (iir & (XELPDP_PMDEMAND_RSP |
> XELPDP_PMDEMAND_RSPTOUT_ERR)) {
> if (iir & XELPDP_PMDEMAND_RSPTOUT_ERR)
> - drm_dbg(&dev_priv->drm,
> + drm_dbg(display->drm,
> "Error waiting for Punit PM Demand
> Response\n");
>
> - intel_pmdemand_irq_handler(dev_priv);
> + intel_pmdemand_irq_handler(display);
> found = true;
> }
>
> if (iir & XELPDP_RM_TIMEOUT) {
> u32 val = intel_de_read(display,
> RM_TIMEOUT_REG_CAPTURE);
> - drm_warn(&dev_priv->drm, "Register Access Timeout =
> 0x%x\n", val);
> + drm_warn(display->drm, "Register Access Timeout =
> 0x%x\n", val);
> found = true;
> }
> } else if (iir & GEN8_DE_MISC_GSE) {
> @@ -1239,12 +1218,12 @@ gen8_de_misc_irq_handler(struct drm_i915_private
> *dev_priv, u32 iir)
> u32 psr_iir;
> i915_reg_t iir_reg;
>
> - for_each_intel_encoder_with_psr(&dev_priv->drm, encoder) {
> + for_each_intel_encoder_with_psr(display->drm, encoder) {
> struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
>
> - if (DISPLAY_VER(dev_priv) >= 12)
> - iir_reg = TRANS_PSR_IIR(dev_priv,
> - intel_dp->psr.transcoder);
> + if (DISPLAY_VER(display) >= 12)
> + iir_reg = TRANS_PSR_IIR(display,
> + intel_dp-
> >psr.transcoder);
> else
> iir_reg = EDP_PSR_IIR;
>
> @@ -1256,19 +1235,18 @@ gen8_de_misc_irq_handler(struct drm_i915_private
> *dev_priv, u32 iir)
> intel_psr_irq_handler(intel_dp, psr_iir);
>
> /* prior GEN12 only have one EDP PSR */
> - if (DISPLAY_VER(dev_priv) < 12)
> + if (DISPLAY_VER(display) < 12)
> break;
> }
> }
>
> if (!found)
> - drm_err(&dev_priv->drm, "Unexpected DE Misc interrupt:
> 0x%08x\n", iir);
> + drm_err(display->drm, "Unexpected DE Misc interrupt:
> 0x%08x\n", iir);
> }
>
> -static void gen11_dsi_te_interrupt_handler(struct drm_i915_private *dev_priv,
> +static void gen11_dsi_te_interrupt_handler(struct intel_display *display,
> u32 te_trigger)
> {
> - struct intel_display *display = &dev_priv->display;
> enum pipe pipe = INVALID_PIPE;
> enum transcoder dsi_trans;
> enum port port;
> @@ -1278,7 +1256,7 @@ static void gen11_dsi_te_interrupt_handler(struct
> drm_i915_private *dev_priv,
> * Incase of dual link, TE comes from DSI_1
> * this is to check if dual link is enabled
> */
> - val = intel_de_read(display, TRANS_DDI_FUNC_CTL2(dev_priv,
> TRANSCODER_DSI_0));
> + val = intel_de_read(display, TRANS_DDI_FUNC_CTL2(display,
> TRANSCODER_DSI_0));
> val &= PORT_SYNC_MODE_ENABLE;
>
> /*
> @@ -1294,12 +1272,12 @@ static void gen11_dsi_te_interrupt_handler(struct
> drm_i915_private *dev_priv,
> val = val & OP_MODE_MASK;
>
> if (val != CMD_MODE_NO_GATE && val != CMD_MODE_TE_GATE) {
> - drm_err(&dev_priv->drm, "DSI trancoder not configured in
> command mode\n");
> + drm_err(display->drm, "DSI trancoder not configured in
> command mode\n");
> return;
> }
>
> /* Get PIPE for handling VBLANK event */
> - val = intel_de_read(display, TRANS_DDI_FUNC_CTL(dev_priv, dsi_trans));
> + val = intel_de_read(display, TRANS_DDI_FUNC_CTL(display, dsi_trans));
> switch (val & TRANS_DDI_EDP_INPUT_MASK) {
> case TRANS_DDI_EDP_INPUT_A_ON:
> pipe = PIPE_A;
> @@ -1311,28 +1289,28 @@ static void gen11_dsi_te_interrupt_handler(struct
> drm_i915_private *dev_priv,
> pipe = PIPE_C;
> break;
> default:
> - drm_err(&dev_priv->drm, "Invalid PIPE\n");
> + drm_err(display->drm, "Invalid PIPE\n");
> return;
> }
>
> - intel_handle_vblank(dev_priv, pipe);
> + intel_handle_vblank(display, pipe);
>
> /* clear TE in dsi IIR */
> port = (te_trigger & DSI1_TE) ? PORT_B : PORT_A;
> intel_de_rmw(display, DSI_INTR_IDENT_REG(port), 0, 0);
> }
>
> -static u32 gen8_de_pipe_flip_done_mask(struct drm_i915_private *i915)
> +static u32 gen8_de_pipe_flip_done_mask(struct intel_display *display)
> {
> - if (DISPLAY_VER(i915) >= 9)
> + if (DISPLAY_VER(display) >= 9)
> return GEN9_PIPE_PLANE1_FLIP_DONE;
> else
> return GEN8_PIPE_PRIMARY_FLIP_DONE;
> }
>
> -static void gen8_read_and_ack_pch_irqs(struct drm_i915_private *i915, u32
> *pch_iir, u32 *pica_iir)
> +static void gen8_read_and_ack_pch_irqs(struct intel_display *display, u32
> *pch_iir, u32 *pica_iir)
> {
> - struct intel_display *display = &i915->display;
> + struct drm_i915_private *i915 = to_i915(display->drm);
> u32 pica_ier = 0;
>
> *pica_iir = 0;
> @@ -1346,7 +1324,7 @@ static void gen8_read_and_ack_pch_irqs(struct
> drm_i915_private *i915, u32 *pch_i
> * their flags both in the PICA and SDE IIR.
> */
> if (*pch_iir & SDE_PICAINTERRUPT) {
> - drm_WARN_ON(&i915->drm, INTEL_PCH_TYPE(i915) <
> PCH_MTL);
> + drm_WARN_ON(display->drm, INTEL_PCH_TYPE(i915) <
> PCH_MTL);
>
> pica_ier = intel_de_rmw(display, PICAINTERRUPT_IER, ~0, 0);
> *pica_iir = intel_de_read(display, PICAINTERRUPT_IIR);
> @@ -1365,26 +1343,26 @@ void gen8_de_irq_handler(struct intel_display
> *display, u32 master_ctl)
> u32 iir;
> enum pipe pipe;
>
> - drm_WARN_ON_ONCE(&dev_priv->drm, !HAS_DISPLAY(dev_priv));
> + drm_WARN_ON_ONCE(display->drm, !HAS_DISPLAY(display));
>
> if (master_ctl & GEN8_DE_MISC_IRQ) {
> iir = intel_de_read(display, GEN8_DE_MISC_IIR);
> if (iir) {
> intel_de_write(display, GEN8_DE_MISC_IIR, iir);
> - gen8_de_misc_irq_handler(dev_priv, iir);
> + gen8_de_misc_irq_handler(display, iir);
> } else {
> - drm_err_ratelimited(&dev_priv->drm,
> + drm_err_ratelimited(display->drm,
> "The master control interrupt lied (DE
> MISC)!\n");
> }
> }
>
> - if (DISPLAY_VER(dev_priv) >= 11 && (master_ctl &
> GEN11_DE_HPD_IRQ)) {
> + if (DISPLAY_VER(display) >= 11 && (master_ctl & GEN11_DE_HPD_IRQ)) {
> iir = intel_de_read(display, GEN11_DE_HPD_IIR);
> if (iir) {
> intel_de_write(display, GEN11_DE_HPD_IIR, iir);
> gen11_hpd_irq_handler(display, iir);
> } else {
> - drm_err_ratelimited(&dev_priv->drm,
> + drm_err_ratelimited(display->drm,
> "The master control interrupt lied,
> (DE HPD)!\n");
> }
> }
> @@ -1396,19 +1374,19 @@ void gen8_de_irq_handler(struct intel_display
> *display, u32 master_ctl)
>
> intel_de_write(display, GEN8_DE_PORT_IIR, iir);
>
> - if (iir & gen8_de_port_aux_mask(dev_priv)) {
> + if (iir & gen8_de_port_aux_mask(display)) {
> intel_dp_aux_irq_handler(display);
> found = true;
> }
>
> - if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv))
> {
> + if (display->platform.geminilake || display-
> >platform.broxton) {
> u32 hotplug_trigger = iir &
> BXT_DE_PORT_HOTPLUG_MASK;
>
> if (hotplug_trigger) {
> bxt_hpd_irq_handler(display,
> hotplug_trigger);
> found = true;
> }
> - } else if (IS_BROADWELL(dev_priv)) {
> + } else if (display->platform.broadwell) {
> u32 hotplug_trigger = iir &
> BDW_DE_PORT_HOTPLUG_MASK;
>
> if (hotplug_trigger) {
> @@ -1417,31 +1395,31 @@ void gen8_de_irq_handler(struct intel_display
> *display, u32 master_ctl)
> }
> }
>
> - if ((IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv))
> &&
> + if ((display->platform.geminilake || display-
> >platform.broxton) &&
> (iir & BXT_DE_PORT_GMBUS)) {
> intel_gmbus_irq_handler(display);
> found = true;
> }
>
> - if (DISPLAY_VER(dev_priv) >= 11) {
> + if (DISPLAY_VER(display) >= 11) {
> u32 te_trigger = iir & (DSI0_TE | DSI1_TE);
>
> if (te_trigger) {
> -
> gen11_dsi_te_interrupt_handler(dev_priv, te_trigger);
> +
> gen11_dsi_te_interrupt_handler(display, te_trigger);
> found = true;
> }
> }
>
> if (!found)
> - drm_err_ratelimited(&dev_priv->drm,
> + drm_err_ratelimited(display->drm,
> "Unexpected DE Port
> interrupt\n");
> } else {
> - drm_err_ratelimited(&dev_priv->drm,
> + drm_err_ratelimited(display->drm,
> "The master control interrupt lied (DE
> PORT)!\n");
> }
> }
>
> - for_each_pipe(dev_priv, pipe) {
> + for_each_pipe(display, pipe) {
> u32 fault_errors;
>
> if (!(master_ctl & GEN8_DE_PIPE_IRQ(pipe)))
> @@ -1449,7 +1427,7 @@ void gen8_de_irq_handler(struct intel_display *display,
> u32 master_ctl)
>
> iir = intel_de_read(display, GEN8_DE_PIPE_IIR(pipe));
> if (!iir) {
> - drm_err_ratelimited(&dev_priv->drm,
> + drm_err_ratelimited(display->drm,
> "The master control interrupt lied (DE
> PIPE)!\n");
> continue;
> }
> @@ -1457,29 +1435,29 @@ void gen8_de_irq_handler(struct intel_display
> *display, u32 master_ctl)
> intel_de_write(display, GEN8_DE_PIPE_IIR(pipe), iir);
>
> if (iir & GEN8_PIPE_VBLANK)
> - intel_handle_vblank(dev_priv, pipe);
> + intel_handle_vblank(display, pipe);
>
> - if (iir & gen8_de_pipe_flip_done_mask(dev_priv))
> - flip_done_handler(dev_priv, pipe);
> + if (iir & gen8_de_pipe_flip_done_mask(display))
> + flip_done_handler(display, pipe);
>
> - if (HAS_DSB(dev_priv)) {
> + if (HAS_DSB(display)) {
> if (iir & GEN12_DSB_INT(INTEL_DSB_0))
> - intel_dsb_irq_handler(&dev_priv->display, pipe,
> INTEL_DSB_0);
> + intel_dsb_irq_handler(display, pipe,
> INTEL_DSB_0);
>
> if (iir & GEN12_DSB_INT(INTEL_DSB_1))
> - intel_dsb_irq_handler(&dev_priv->display, pipe,
> INTEL_DSB_1);
> + intel_dsb_irq_handler(display, pipe,
> INTEL_DSB_1);
>
> if (iir & GEN12_DSB_INT(INTEL_DSB_2))
> - intel_dsb_irq_handler(&dev_priv->display, pipe,
> INTEL_DSB_2);
> + intel_dsb_irq_handler(display, pipe,
> INTEL_DSB_2);
> }
>
> if (iir & GEN8_PIPE_CDCLK_CRC_DONE)
> - hsw_pipe_crc_irq_handler(dev_priv, pipe);
> + hsw_pipe_crc_irq_handler(display, pipe);
>
> if (iir & GEN8_PIPE_FIFO_UNDERRUN)
> intel_cpu_fifo_underrun_irq_handler(display, pipe);
>
> - fault_errors = iir & gen8_de_pipe_fault_mask(dev_priv);
> + fault_errors = iir & gen8_de_pipe_fault_mask(display);
> if (fault_errors)
> intel_pipe_fault_irq_handler(display,
>
> gen8_pipe_fault_handlers(display),
> @@ -1495,7 +1473,7 @@ void gen8_de_irq_handler(struct intel_display *display,
> u32 master_ctl)
> * scheme also closed the SDE interrupt handling race we've
> seen
> * on older pch-split platforms. But this needs testing.
> */
> - gen8_read_and_ack_pch_irqs(dev_priv, &iir, &pica_iir);
> + gen8_read_and_ack_pch_irqs(display, &iir, &pica_iir);
> if (iir) {
> if (pica_iir)
> xelpdp_pica_irq_handler(display, pica_iir);
> @@ -1505,13 +1483,13 @@ void gen8_de_irq_handler(struct intel_display
> *display, u32 master_ctl)
> else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT)
> spt_irq_handler(display, iir);
> else
> - cpt_irq_handler(dev_priv, iir);
> + cpt_irq_handler(display, iir);
> } else {
> /*
> * Like on previous PCH there seems to be something
> * fishy going on with forwarding PCH interrupts.
> */
> - drm_dbg(&dev_priv->drm,
> + drm_dbg(display->drm,
> "The master control interrupt lied (SDE)!\n");
> }
> }
> @@ -1556,10 +1534,9 @@ void gen11_display_irq_handler(struct intel_display
> *display)
> enable_rpm_wakeref_asserts(&i915->runtime_pm);
> }
>
> -static void i915gm_irq_cstate_wa_enable(struct drm_i915_private *i915)
> +static void i915gm_irq_cstate_wa_enable(struct intel_display *display)
> {
> - struct intel_display *display = &i915->display;
> - lockdep_assert_held(&i915->drm.vblank_time_lock);
> + lockdep_assert_held(&display->drm->vblank_time_lock);
>
> /*
> * Vblank/CRC interrupts fail to wake the device up from C2+.
> @@ -1567,33 +1544,30 @@ static void i915gm_irq_cstate_wa_enable(struct
> drm_i915_private *i915)
> * the problem. There is a small power cost so we do this
> * only when vblank/CRC interrupts are actually enabled.
> */
> - if (i915->display.irq.vblank_enabled++ == 0)
> + if (display->irq.vblank_enabled++ == 0)
> intel_de_write(display, SCPD0,
>
> _MASKED_BIT_ENABLE(CSTATE_RENDER_CLOCK_GATE_DISABLE));
> }
>
> -static void i915gm_irq_cstate_wa_disable(struct drm_i915_private *i915)
> +static void i915gm_irq_cstate_wa_disable(struct intel_display *display)
> {
> - struct intel_display *display = &i915->display;
> - lockdep_assert_held(&i915->drm.vblank_time_lock);
> + lockdep_assert_held(&display->drm->vblank_time_lock);
>
> - if (--i915->display.irq.vblank_enabled == 0)
> + if (--display->irq.vblank_enabled == 0)
> intel_de_write(display, SCPD0,
>
> _MASKED_BIT_DISABLE(CSTATE_RENDER_CLOCK_GATE_DISABLE));
> }
>
> void i915gm_irq_cstate_wa(struct intel_display *display, bool enable)
> {
> - struct drm_i915_private *i915 = to_i915(display->drm);
> -
> - spin_lock_irq(&i915->drm.vblank_time_lock);
> + spin_lock_irq(&display->drm->vblank_time_lock);
>
> if (enable)
> - i915gm_irq_cstate_wa_enable(i915);
> + i915gm_irq_cstate_wa_enable(display);
> else
> - i915gm_irq_cstate_wa_disable(i915);
> + i915gm_irq_cstate_wa_disable(display);
>
> - spin_unlock_irq(&i915->drm.vblank_time_lock);
> + spin_unlock_irq(&display->drm->vblank_time_lock);
> }
>
> int i8xx_enable_vblank(struct drm_crtc *crtc)
> @@ -1624,20 +1598,20 @@ void i8xx_disable_vblank(struct drm_crtc *crtc)
>
> int i915gm_enable_vblank(struct drm_crtc *crtc)
> {
> - struct drm_i915_private *i915 = to_i915(crtc->dev);
> + struct intel_display *display = to_intel_display(crtc->dev);
>
> - i915gm_irq_cstate_wa_enable(i915);
> + i915gm_irq_cstate_wa_enable(display);
>
> return i8xx_enable_vblank(crtc);
> }
>
> void i915gm_disable_vblank(struct drm_crtc *crtc)
> {
> - struct drm_i915_private *i915 = to_i915(crtc->dev);
> + struct intel_display *display = to_intel_display(crtc->dev);
>
> i8xx_disable_vblank(crtc);
>
> - i915gm_irq_cstate_wa_disable(i915);
> + i915gm_irq_cstate_wa_disable(display);
> }
>
> int i965_enable_vblank(struct drm_crtc *crtc)
> @@ -1674,7 +1648,7 @@ int ilk_enable_vblank(struct drm_crtc *crtc)
> struct drm_i915_private *dev_priv = to_i915(crtc->dev);
> enum pipe pipe = to_intel_crtc(crtc)->pipe;
> unsigned long irqflags;
> - u32 bit = DISPLAY_VER(dev_priv) >= 7 ?
> + u32 bit = DISPLAY_VER(display) >= 7 ?
> DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe);
>
> spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> @@ -1684,7 +1658,7 @@ int ilk_enable_vblank(struct drm_crtc *crtc)
> /* Even though there is no DMC, frame counter can get stuck when
> * PSR is active as no frames are generated.
> */
> - if (HAS_PSR(dev_priv))
> + if (HAS_PSR(display))
> drm_crtc_vblank_restore(crtc);
>
> return 0;
> @@ -1696,7 +1670,7 @@ void ilk_disable_vblank(struct drm_crtc *crtc)
> struct drm_i915_private *dev_priv = to_i915(crtc->dev);
> enum pipe pipe = to_intel_crtc(crtc)->pipe;
> unsigned long irqflags;
> - u32 bit = DISPLAY_VER(dev_priv) >= 7 ?
> + u32 bit = DISPLAY_VER(display) >= 7 ?
> DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe);
>
> spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
> @@ -1764,7 +1738,7 @@ int bdw_enable_vblank(struct drm_crtc *_crtc)
> /* Even if there is no DMC, frame counter can get stuck when
> * PSR is active as no frames are generated, so check only for PSR.
> */
> - if (HAS_PSR(dev_priv))
> + if (HAS_PSR(display))
> drm_crtc_vblank_restore(&crtc->base);
>
> return 0;
> @@ -1897,11 +1871,11 @@ void vlv_display_error_irq_handler(struct
> intel_display *display,
> vlv_page_table_error_irq_handler(display, dpinvgtt);
> }
>
> -static void _vlv_display_irq_reset(struct drm_i915_private *dev_priv)
> +static void _vlv_display_irq_reset(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
>
> - if (IS_CHERRYVIEW(dev_priv))
> + if (display->platform.cherryview)
> intel_de_write(display, DPINVGTT,
> DPINVGTT_STATUS_MASK_CHV);
> else
> intel_de_write(display, DPINVGTT,
> DPINVGTT_STATUS_MASK_VLV);
> @@ -1910,9 +1884,9 @@ static void _vlv_display_irq_reset(struct
> drm_i915_private *dev_priv)
> VLV_ERROR_REGS);
>
> i915_hotplug_interrupt_update_locked(display, 0xffffffff, 0);
> - intel_de_rmw(display, PORT_HOTPLUG_STAT(dev_priv), 0, 0);
> + intel_de_rmw(display, PORT_HOTPLUG_STAT(display), 0, 0);
>
> - i9xx_pipestat_irq_reset(dev_priv);
> + i9xx_pipestat_irq_reset(display);
>
> intel_display_irq_regs_reset(display, VLV_IRQ_REGS);
> dev_priv->irq_mask = ~0u;
> @@ -1920,22 +1894,18 @@ static void _vlv_display_irq_reset(struct
> drm_i915_private *dev_priv)
>
> void vlv_display_irq_reset(struct intel_display *display)
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> -
> - if (dev_priv->display.irq.vlv_display_irqs_enabled)
> - _vlv_display_irq_reset(dev_priv);
> + if (display->irq.vlv_display_irqs_enabled)
> + _vlv_display_irq_reset(display);
> }
>
> void i9xx_display_irq_reset(struct intel_display *display)
> {
> - struct drm_i915_private *i915 = to_i915(display->drm);
> -
> - if (I915_HAS_HOTPLUG(i915)) {
> + if (I915_HAS_HOTPLUG(display)) {
> i915_hotplug_interrupt_update(display, 0xffffffff, 0);
> - intel_de_rmw(display, PORT_HOTPLUG_STAT(i915), 0, 0);
> + intel_de_rmw(display, PORT_HOTPLUG_STAT(display), 0, 0);
> }
>
> - i9xx_pipestat_irq_reset(i915);
> + i9xx_pipestat_irq_reset(display);
> }
>
> static u32 vlv_error_mask(void)
> @@ -1951,10 +1921,10 @@ void vlv_display_irq_postinstall(struct intel_display
> *display)
> u32 enable_mask;
> enum pipe pipe;
>
> - if (!dev_priv->display.irq.vlv_display_irqs_enabled)
> + if (!display->irq.vlv_display_irqs_enabled)
> return;
>
> - if (IS_CHERRYVIEW(dev_priv))
> + if (display->platform.cherryview)
> intel_de_write(display, DPINVGTT,
> DPINVGTT_STATUS_MASK_CHV |
> DPINVGTT_EN_MASK_CHV);
> @@ -1969,7 +1939,7 @@ void vlv_display_irq_postinstall(struct intel_display
> *display)
> pipestat_mask = PIPE_CRC_DONE_INTERRUPT_STATUS;
>
> i915_enable_pipestat(display, PIPE_A,
> PIPE_GMBUS_INTERRUPT_STATUS);
> - for_each_pipe(dev_priv, pipe)
> + for_each_pipe(display, pipe)
> i915_enable_pipestat(display, pipe, pipestat_mask);
>
> enable_mask = I915_DISPLAY_PORT_INTERRUPT |
> @@ -1979,11 +1949,11 @@ void vlv_display_irq_postinstall(struct intel_display
> *display)
> I915_LPE_PIPE_B_INTERRUPT |
> I915_MASTER_ERROR_INTERRUPT;
>
> - if (IS_CHERRYVIEW(dev_priv))
> + if (display->platform.cherryview)
> enable_mask |= I915_DISPLAY_PIPE_C_EVENT_INTERRUPT |
> I915_LPE_PIPE_C_INTERRUPT;
>
> - drm_WARN_ON(&dev_priv->drm, dev_priv->irq_mask != ~0u);
> + drm_WARN_ON(display->drm, dev_priv->irq_mask != ~0u);
>
> dev_priv->irq_mask = ~enable_mask;
>
> @@ -1992,16 +1962,15 @@ void vlv_display_irq_postinstall(struct intel_display
> *display)
>
> void gen8_display_irq_reset(struct intel_display *display)
> {
> - struct drm_i915_private *dev_priv = to_i915(display->drm);
> enum pipe pipe;
>
> - if (!HAS_DISPLAY(dev_priv))
> + if (!HAS_DISPLAY(display))
> return;
>
> intel_de_write(display, EDP_PSR_IMR, 0xffffffff);
> intel_de_write(display, EDP_PSR_IIR, 0xffffffff);
>
> - for_each_pipe(dev_priv, pipe)
> + for_each_pipe(display, pipe)
> if (intel_display_power_is_enabled(display,
>
> POWER_DOMAIN_PIPE(pipe)))
> intel_display_irq_regs_reset(display,
> GEN8_DE_PIPE_IRQ_REGS(pipe));
> @@ -2017,15 +1986,15 @@ void gen11_display_irq_reset(struct intel_display
> *display)
> u32 trans_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) |
> BIT(TRANSCODER_C) | BIT(TRANSCODER_D);
>
> - if (!HAS_DISPLAY(dev_priv))
> + if (!HAS_DISPLAY(display))
> return;
>
> intel_de_write(display, GEN11_DISPLAY_INT_CTL, 0);
>
> - if (DISPLAY_VER(dev_priv) >= 12) {
> + if (DISPLAY_VER(display) >= 12) {
> enum transcoder trans;
>
> - for_each_cpu_transcoder_masked(dev_priv, trans, trans_mask) {
> + for_each_cpu_transcoder_masked(display, trans, trans_mask) {
> enum intel_display_power_domain domain;
>
> domain = POWER_DOMAIN_TRANSCODER(trans);
> @@ -2033,10 +2002,10 @@ void gen11_display_irq_reset(struct intel_display
> *display)
> continue;
>
> intel_de_write(display,
> - TRANS_PSR_IMR(dev_priv, trans),
> + TRANS_PSR_IMR(display, trans),
> 0xffffffff);
> intel_de_write(display,
> - TRANS_PSR_IIR(dev_priv, trans),
> + TRANS_PSR_IIR(display, trans),
> 0xffffffff);
> }
> } else {
> @@ -2044,7 +2013,7 @@ void gen11_display_irq_reset(struct intel_display
> *display)
> intel_de_write(display, EDP_PSR_IIR, 0xffffffff);
> }
>
> - for_each_pipe(dev_priv, pipe)
> + for_each_pipe(display, pipe)
> if (intel_display_power_is_enabled(display,
>
> POWER_DOMAIN_PIPE(pipe)))
> intel_display_irq_regs_reset(display,
> GEN8_DE_PIPE_IRQ_REGS(pipe));
> @@ -2052,7 +2021,7 @@ void gen11_display_irq_reset(struct intel_display
> *display)
> intel_display_irq_regs_reset(display, GEN8_DE_PORT_IRQ_REGS);
> intel_display_irq_regs_reset(display, GEN8_DE_MISC_IRQ_REGS);
>
> - if (DISPLAY_VER(dev_priv) >= 14)
> + if (DISPLAY_VER(display) >= 14)
> intel_display_irq_regs_reset(display,
> PICAINTERRUPT_IRQ_REGS);
> else
> intel_display_irq_regs_reset(display,
> GEN11_DE_HPD_IRQ_REGS);
> @@ -2066,7 +2035,7 @@ void gen8_irq_power_well_post_enable(struct
> intel_display *display,
> {
> struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 extra_ier = GEN8_PIPE_VBLANK | GEN8_PIPE_FIFO_UNDERRUN |
> - gen8_de_pipe_flip_done_mask(dev_priv);
> + gen8_de_pipe_flip_done_mask(display);
> enum pipe pipe;
>
> spin_lock_irq(&dev_priv->irq_lock);
> @@ -2076,10 +2045,10 @@ void gen8_irq_power_well_post_enable(struct
> intel_display *display,
> return;
> }
>
> - for_each_pipe_masked(dev_priv, pipe, pipe_mask)
> + for_each_pipe_masked(display, pipe, pipe_mask)
> intel_display_irq_regs_init(display,
> GEN8_DE_PIPE_IRQ_REGS(pipe),
> - dev_priv-
> >display.irq.de_irq_mask[pipe],
> - ~dev_priv-
> >display.irq.de_irq_mask[pipe] | extra_ier);
> + display->irq.de_irq_mask[pipe],
> + ~display->irq.de_irq_mask[pipe] |
> extra_ier);
>
> spin_unlock_irq(&dev_priv->irq_lock);
> }
> @@ -2097,7 +2066,7 @@ void gen8_irq_power_well_pre_disable(struct
> intel_display *display,
> return;
> }
>
> - for_each_pipe_masked(dev_priv, pipe, pipe_mask)
> + for_each_pipe_masked(display, pipe, pipe_mask)
> intel_display_irq_regs_reset(display,
> GEN8_DE_PIPE_IRQ_REGS(pipe));
>
> spin_unlock_irq(&dev_priv->irq_lock);
> @@ -2117,9 +2086,9 @@ void gen8_irq_power_well_pre_disable(struct
> intel_display *display,
> * to avoid races with the irq handler, assuming we have MSI. Shared legacy
> * interrupts could still race.
> */
> -static void ibx_irq_postinstall(struct drm_i915_private *dev_priv)
> +static void ibx_irq_postinstall(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> + struct drm_i915_private *dev_priv = to_i915(display->drm);
> u32 mask;
>
> if (HAS_PCH_NOP(dev_priv))
> @@ -2141,13 +2110,13 @@ void valleyview_enable_display_irqs(struct
> intel_display *display)
>
> lockdep_assert_held(&dev_priv->irq_lock);
>
> - if (dev_priv->display.irq.vlv_display_irqs_enabled)
> + if (display->irq.vlv_display_irqs_enabled)
> return;
>
> - dev_priv->display.irq.vlv_display_irqs_enabled = true;
> + display->irq.vlv_display_irqs_enabled = true;
>
> if (intel_irqs_enabled(dev_priv)) {
> - _vlv_display_irq_reset(dev_priv);
> + _vlv_display_irq_reset(display);
> vlv_display_irq_postinstall(display);
> }
> }
> @@ -2158,13 +2127,13 @@ void valleyview_disable_display_irqs(struct
> intel_display *display)
>
> lockdep_assert_held(&dev_priv->irq_lock);
>
> - if (!dev_priv->display.irq.vlv_display_irqs_enabled)
> + if (!display->irq.vlv_display_irqs_enabled)
> return;
>
> - dev_priv->display.irq.vlv_display_irqs_enabled = false;
> + display->irq.vlv_display_irqs_enabled = false;
>
> if (intel_irqs_enabled(dev_priv))
> - _vlv_display_irq_reset(dev_priv);
> + _vlv_display_irq_reset(display);
> }
>
> void ilk_de_irq_postinstall(struct intel_display *display)
> @@ -2173,7 +2142,7 @@ void ilk_de_irq_postinstall(struct intel_display
> *display)
>
> u32 display_mask, extra_mask;
>
> - if (DISPLAY_VER(i915) >= 7) {
> + if (DISPLAY_VER(display) >= 7) {
> display_mask = (DE_MASTER_IRQ_CONTROL | DE_GSE_IVB |
> DE_PCH_EVENT_IVB |
> DE_AUX_CHANNEL_A_IVB);
> extra_mask = (DE_PIPEC_VBLANK_IVB |
> DE_PIPEB_VBLANK_IVB |
> @@ -2194,59 +2163,59 @@ void ilk_de_irq_postinstall(struct intel_display
> *display)
> DE_DP_A_HOTPLUG);
> }
>
> - if (IS_HASWELL(i915)) {
> + if (display->platform.haswell) {
> intel_display_irq_regs_assert_irr_is_zero(display, EDP_PSR_IIR);
> display_mask |= DE_EDP_PSR_INT_HSW;
> }
>
> - if (IS_IRONLAKE_M(i915))
> + if (display->platform.ironlake && display->platform.mobile)
> extra_mask |= DE_PCU_EVENT;
>
> i915->irq_mask = ~display_mask;
>
> - ibx_irq_postinstall(i915);
> + ibx_irq_postinstall(display);
>
> intel_display_irq_regs_init(display, DE_IRQ_REGS, i915->irq_mask,
> display_mask | extra_mask);
> }
>
> -static void mtp_irq_postinstall(struct drm_i915_private *i915);
> -static void icp_irq_postinstall(struct drm_i915_private *i915);
> +static void mtp_irq_postinstall(struct intel_display *display);
> +static void icp_irq_postinstall(struct intel_display *display);
>
> void gen8_de_irq_postinstall(struct intel_display *display)
> {
> struct drm_i915_private *dev_priv = to_i915(display->drm);
>
> - u32 de_pipe_masked = gen8_de_pipe_fault_mask(dev_priv) |
> + u32 de_pipe_masked = gen8_de_pipe_fault_mask(display) |
> GEN8_PIPE_CDCLK_CRC_DONE;
> u32 de_pipe_enables;
> - u32 de_port_masked = gen8_de_port_aux_mask(dev_priv);
> + u32 de_port_masked = gen8_de_port_aux_mask(display);
> u32 de_port_enables;
> u32 de_misc_masked = GEN8_DE_EDP_PSR;
> u32 trans_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) |
> BIT(TRANSCODER_C) | BIT(TRANSCODER_D);
> enum pipe pipe;
>
> - if (!HAS_DISPLAY(dev_priv))
> + if (!HAS_DISPLAY(display))
> return;
>
> - if (DISPLAY_VER(dev_priv) >= 14)
> - mtp_irq_postinstall(dev_priv);
> + if (DISPLAY_VER(display) >= 14)
> + mtp_irq_postinstall(display);
> else if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
> - icp_irq_postinstall(dev_priv);
> + icp_irq_postinstall(display);
> else if (HAS_PCH_SPLIT(dev_priv))
> - ibx_irq_postinstall(dev_priv);
> + ibx_irq_postinstall(display);
>
> - if (DISPLAY_VER(dev_priv) < 11)
> + if (DISPLAY_VER(display) < 11)
> de_misc_masked |= GEN8_DE_MISC_GSE;
>
> - if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv))
> + if (display->platform.geminilake || display->platform.broxton)
> de_port_masked |= BXT_DE_PORT_GMBUS;
>
> - if (DISPLAY_VER(dev_priv) >= 14) {
> + if (DISPLAY_VER(display) >= 14) {
> de_misc_masked |= XELPDP_PMDEMAND_RSPTOUT_ERR |
> XELPDP_PMDEMAND_RSP |
> XELPDP_RM_TIMEOUT;
> - } else if (DISPLAY_VER(dev_priv) >= 11) {
> + } else if (DISPLAY_VER(display) >= 11) {
> enum port port;
>
> if (intel_bios_is_dsi_present(display, &port))
> @@ -2256,25 +2225,25 @@ void gen8_de_irq_postinstall(struct intel_display
> *display)
> if (HAS_DBUF_OVERLAP_DETECTION(display))
> de_misc_masked |= XE2LPD_DBUF_OVERLAP_DETECTED;
>
> - if (HAS_DSB(dev_priv))
> + if (HAS_DSB(display))
> de_pipe_masked |= GEN12_DSB_INT(INTEL_DSB_0) |
> GEN12_DSB_INT(INTEL_DSB_1) |
> GEN12_DSB_INT(INTEL_DSB_2);
>
> de_pipe_enables = de_pipe_masked |
> GEN8_PIPE_VBLANK | GEN8_PIPE_FIFO_UNDERRUN |
> - gen8_de_pipe_flip_done_mask(dev_priv);
> + gen8_de_pipe_flip_done_mask(display);
>
> de_port_enables = de_port_masked;
> - if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv))
> + if (display->platform.geminilake || display->platform.broxton)
> de_port_enables |= BXT_DE_PORT_HOTPLUG_MASK;
> - else if (IS_BROADWELL(dev_priv))
> + else if (display->platform.broadwell)
> de_port_enables |= BDW_DE_PORT_HOTPLUG_MASK;
>
> - if (DISPLAY_VER(dev_priv) >= 12) {
> + if (DISPLAY_VER(display) >= 12) {
> enum transcoder trans;
>
> - for_each_cpu_transcoder_masked(dev_priv, trans, trans_mask) {
> + for_each_cpu_transcoder_masked(display, trans, trans_mask) {
> enum intel_display_power_domain domain;
>
> domain = POWER_DOMAIN_TRANSCODER(trans);
> @@ -2282,19 +2251,19 @@ void gen8_de_irq_postinstall(struct intel_display
> *display)
> continue;
>
> intel_display_irq_regs_assert_irr_is_zero(display,
> -
> TRANS_PSR_IIR(dev_priv, trans));
> +
> TRANS_PSR_IIR(display, trans));
> }
> } else {
> intel_display_irq_regs_assert_irr_is_zero(display, EDP_PSR_IIR);
> }
>
> - for_each_pipe(dev_priv, pipe) {
> - dev_priv->display.irq.de_irq_mask[pipe] = ~de_pipe_masked;
> + for_each_pipe(display, pipe) {
> + display->irq.de_irq_mask[pipe] = ~de_pipe_masked;
>
> if (intel_display_power_is_enabled(display,
>
> POWER_DOMAIN_PIPE(pipe)))
> intel_display_irq_regs_init(display,
> GEN8_DE_PIPE_IRQ_REGS(pipe),
> - dev_priv-
> >display.irq.de_irq_mask[pipe],
> + display-
> >irq.de_irq_mask[pipe],
> de_pipe_enables);
> }
>
> @@ -2303,7 +2272,7 @@ void gen8_de_irq_postinstall(struct intel_display
> *display)
> intel_display_irq_regs_init(display, GEN8_DE_MISC_IRQ_REGS,
> ~de_misc_masked,
> de_misc_masked);
>
> - if (IS_DISPLAY_VER(dev_priv, 11, 13)) {
> + if (IS_DISPLAY_VER(display, 11, 13)) {
> u32 de_hpd_masked = 0;
> u32 de_hpd_enables = GEN11_DE_TC_HOTPLUG_MASK |
> GEN11_DE_TBT_HOTPLUG_MASK;
> @@ -2313,9 +2282,8 @@ void gen8_de_irq_postinstall(struct intel_display
> *display)
> }
> }
>
> -static void mtp_irq_postinstall(struct drm_i915_private *i915)
> +static void mtp_irq_postinstall(struct intel_display *display)
> {
> - struct intel_display *display = &i915->display;
> u32 sde_mask = SDE_GMBUS_ICP | SDE_PICAINTERRUPT;
> u32 de_hpd_mask = XELPDP_AUX_TC_MASK;
> u32 de_hpd_enables = de_hpd_mask |
> XELPDP_DP_ALT_HOTPLUG_MASK |
> @@ -2327,9 +2295,8 @@ static void mtp_irq_postinstall(struct
> drm_i915_private *i915)
> intel_display_irq_regs_init(display, SDE_IRQ_REGS, ~sde_mask, 0xffffffff);
> }
>
> -static void icp_irq_postinstall(struct drm_i915_private *dev_priv)
> +static void icp_irq_postinstall(struct intel_display *display)
> {
> - struct intel_display *display = &dev_priv->display;
> u32 mask = SDE_GMBUS_ICP;
>
> intel_display_irq_regs_init(display, SDE_IRQ_REGS, ~mask, 0xffffffff);
> --
> 2.39.5
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 9/9] drm/i915/display: rename I915_HAS_HOTPLUG() to HAS_HOTPLUG
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (7 preceding siblings ...)
2025-03-11 18:00 ` [PATCH 8/9] drm/i915/irq: convert rest of intel_display_irq.[ch] " Jani Nikula
@ 2025-03-11 18:00 ` Jani Nikula
2025-03-12 6:39 ` Shankar, Uma
2025-03-11 19:13 ` [PATCH 0/9] drm/i915/display: conversions to struct intel_display Ville Syrjälä
` (8 subsequent siblings)
17 siblings, 1 reply; 31+ messages in thread
From: Jani Nikula @ 2025-03-11 18:00 UTC (permalink / raw)
To: intel-gfx, intel-xe; +Cc: jani.nikula
Most of the other display feature check macros are just
HAS_<something>. Follow suit with hotplug check.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_crt.c | 6 +++---
drivers/gpu/drm/i915/display/intel_display_device.h | 2 +-
drivers/gpu/drm/i915/display/intel_display_irq.c | 2 +-
drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 2 +-
drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +-
drivers/gpu/drm/i915/i915_irq.c | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index a7f360f89410..cca22d2402e8 100644
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -877,7 +877,7 @@ intel_crt_detect(struct drm_connector *connector,
wakeref = intel_display_power_get(display, encoder->power_domain);
- if (I915_HAS_HOTPLUG(display)) {
+ if (HAS_HOTPLUG(display)) {
/* We can not rely on the HPD pin always being correctly wired
* up, for example many KVM do not pass it through, and so
* only trust an assertion that the monitor is connected.
@@ -901,7 +901,7 @@ intel_crt_detect(struct drm_connector *connector,
* broken monitor (without edid) to work behind a broken kvm (that fails
* to have the right resistors for HP detection) needs to fix this up.
* For now just bail out. */
- if (I915_HAS_HOTPLUG(display)) {
+ if (HAS_HOTPLUG(display)) {
status = connector_status_disconnected;
goto out;
}
@@ -1081,7 +1081,7 @@ void intel_crt_init(struct intel_display *display)
crt->base.power_domain = POWER_DOMAIN_PORT_CRT;
- if (I915_HAS_HOTPLUG(display) &&
+ if (HAS_HOTPLUG(display) &&
!dmi_check_system(intel_spurious_crt_detect)) {
crt->base.hpd_pin = HPD_CRT;
crt->base.hotplug = intel_encoder_hotplug;
diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h
index 717286981687..af574ae1c57e 100644
--- a/drivers/gpu/drm/i915/display/intel_display_device.h
+++ b/drivers/gpu/drm/i915/display/intel_display_device.h
@@ -169,6 +169,7 @@ struct intel_display_platforms {
#define HAS_GMBUS_IRQ(__display) (DISPLAY_VER(__display) >= 4)
#define HAS_GMBUS_BURST_READ(__display) (DISPLAY_VER(__display) >= 10 || (__display)->platform.kabylake)
#define HAS_GMCH(__display) (DISPLAY_INFO(__display)->has_gmch)
+#define HAS_HOTPLUG(__display) (DISPLAY_INFO(__display)->has_hotplug)
#define HAS_HW_SAGV_WM(__display) (DISPLAY_VER(__display) >= 13 && !(__display)->platform.dgfx)
#define HAS_IPC(__display) (DISPLAY_INFO(__display)->has_ipc)
#define HAS_IPS(__display) ((__display)->platform.haswell_ult || (__display)->platform.broadwell)
@@ -192,7 +193,6 @@ struct intel_display_platforms {
#define HAS_AS_SDP(__display) (DISPLAY_VER(__display) >= 13)
#define HAS_CMRR(__display) (DISPLAY_VER(__display) >= 20)
#define INTEL_NUM_PIPES(__display) (hweight8(DISPLAY_RUNTIME_INFO(__display)->pipe_mask))
-#define I915_HAS_HOTPLUG(__display) (DISPLAY_INFO(__display)->has_hotplug)
#define OVERLAY_NEEDS_PHYSICAL(__display) (DISPLAY_INFO(__display)->overlay_needs_physical)
#define SUPPORTS_TV(__display) (DISPLAY_INFO(__display)->supports_tv)
diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
index 6f78fe6de06a..d9f9b9f78abb 100644
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -1900,7 +1900,7 @@ void vlv_display_irq_reset(struct intel_display *display)
void i9xx_display_irq_reset(struct intel_display *display)
{
- if (I915_HAS_HOTPLUG(display)) {
+ if (HAS_HOTPLUG(display)) {
i915_hotplug_interrupt_update(display, 0xffffffff, 0);
intel_de_rmw(display, PORT_HOTPLUG_STAT(display), 0, 0);
}
diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
index 1bcff3a47745..2463e61e7802 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
@@ -1481,7 +1481,7 @@ void intel_hotplug_irq_init(struct intel_display *display)
intel_hpd_init_early(display);
if (HAS_GMCH(display)) {
- if (I915_HAS_HOTPLUG(display))
+ if (HAS_HOTPLUG(display))
display->funcs.hotplug = &i915_hpd_funcs;
} else {
if (HAS_PCH_DG2(i915))
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 6e2d9929b4d7..757b9ce7e3b1 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2036,7 +2036,7 @@ static u16 intel_sdvo_get_hotplug_support(struct intel_sdvo *intel_sdvo)
struct intel_display *display = to_intel_display(&intel_sdvo->base);
u16 hotplug;
- if (!I915_HAS_HOTPLUG(display))
+ if (!HAS_HOTPLUG(display))
return 0;
/*
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index ba3afc7e38ac..c1f938a1da44 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -954,7 +954,7 @@ static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
enable_mask |= I915_ASLE_INTERRUPT;
}
- if (I915_HAS_HOTPLUG(dev_priv)) {
+ if (HAS_HOTPLUG(dev_priv)) {
dev_priv->irq_mask &= ~I915_DISPLAY_PORT_INTERRUPT;
enable_mask |= I915_DISPLAY_PORT_INTERRUPT;
}
@@ -995,7 +995,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
ret = IRQ_HANDLED;
- if (I915_HAS_HOTPLUG(dev_priv) &&
+ if (HAS_HOTPLUG(dev_priv) &&
iir & I915_DISPLAY_PORT_INTERRUPT)
hotplug_status = i9xx_hpd_irq_ack(display);
--
2.39.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* RE: [PATCH 9/9] drm/i915/display: rename I915_HAS_HOTPLUG() to HAS_HOTPLUG
2025-03-11 18:00 ` [PATCH 9/9] drm/i915/display: rename I915_HAS_HOTPLUG() to HAS_HOTPLUG Jani Nikula
@ 2025-03-12 6:39 ` Shankar, Uma
0 siblings, 0 replies; 31+ messages in thread
From: Shankar, Uma @ 2025-03-12 6:39 UTC (permalink / raw)
To: Nikula, Jani, intel-gfx@lists.freedesktop.org,
intel-xe@lists.freedesktop.org
Cc: Nikula, Jani
> -----Original Message-----
> From: Intel-xe <intel-xe-bounces@lists.freedesktop.org> On Behalf Of Jani Nikula
> Sent: Tuesday, March 11, 2025 11:31 PM
> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nikula@intel.com>
> Subject: [PATCH 9/9] drm/i915/display: rename I915_HAS_HOTPLUG() to
> HAS_HOTPLUG
>
> Most of the other display feature check macros are just HAS_<something>. Follow
> suit with hotplug check.
Looks Good to me.
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_crt.c | 6 +++---
> drivers/gpu/drm/i915/display/intel_display_device.h | 2 +-
> drivers/gpu/drm/i915/display/intel_display_irq.c | 2 +-
> drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 2 +-
> drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +-
> drivers/gpu/drm/i915/i915_irq.c | 4 ++--
> 6 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_crt.c
> b/drivers/gpu/drm/i915/display/intel_crt.c
> index a7f360f89410..cca22d2402e8 100644
> --- a/drivers/gpu/drm/i915/display/intel_crt.c
> +++ b/drivers/gpu/drm/i915/display/intel_crt.c
> @@ -877,7 +877,7 @@ intel_crt_detect(struct drm_connector *connector,
>
> wakeref = intel_display_power_get(display, encoder->power_domain);
>
> - if (I915_HAS_HOTPLUG(display)) {
> + if (HAS_HOTPLUG(display)) {
> /* We can not rely on the HPD pin always being correctly wired
> * up, for example many KVM do not pass it through, and so
> * only trust an assertion that the monitor is connected.
> @@ -901,7 +901,7 @@ intel_crt_detect(struct drm_connector *connector,
> * broken monitor (without edid) to work behind a broken kvm (that fails
> * to have the right resistors for HP detection) needs to fix this up.
> * For now just bail out. */
> - if (I915_HAS_HOTPLUG(display)) {
> + if (HAS_HOTPLUG(display)) {
> status = connector_status_disconnected;
> goto out;
> }
> @@ -1081,7 +1081,7 @@ void intel_crt_init(struct intel_display *display)
>
> crt->base.power_domain = POWER_DOMAIN_PORT_CRT;
>
> - if (I915_HAS_HOTPLUG(display) &&
> + if (HAS_HOTPLUG(display) &&
> !dmi_check_system(intel_spurious_crt_detect)) {
> crt->base.hpd_pin = HPD_CRT;
> crt->base.hotplug = intel_encoder_hotplug; diff --git
> a/drivers/gpu/drm/i915/display/intel_display_device.h
> b/drivers/gpu/drm/i915/display/intel_display_device.h
> index 717286981687..af574ae1c57e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.h
> @@ -169,6 +169,7 @@ struct intel_display_platforms {
> #define HAS_GMBUS_IRQ(__display) (DISPLAY_VER(__display) >= 4)
> #define HAS_GMBUS_BURST_READ(__display) (DISPLAY_VER(__display) >= 10
> || (__display)->platform.kabylake)
> #define HAS_GMCH(__display) (DISPLAY_INFO(__display)->has_gmch)
> +#define HAS_HOTPLUG(__display) (DISPLAY_INFO(__display)-
> >has_hotplug)
> #define HAS_HW_SAGV_WM(__display) (DISPLAY_VER(__display) >= 13 &&
> !(__display)->platform.dgfx)
> #define HAS_IPC(__display) (DISPLAY_INFO(__display)->has_ipc)
> #define HAS_IPS(__display) ((__display)->platform.haswell_ult ||
> (__display)->platform.broadwell)
> @@ -192,7 +193,6 @@ struct intel_display_platforms {
> #define HAS_AS_SDP(__display) (DISPLAY_VER(__display) >= 13)
> #define HAS_CMRR(__display) (DISPLAY_VER(__display) >= 20)
> #define INTEL_NUM_PIPES(__display)
> (hweight8(DISPLAY_RUNTIME_INFO(__display)->pipe_mask))
> -#define I915_HAS_HOTPLUG(__display) (DISPLAY_INFO(__display)-
> >has_hotplug)
> #define OVERLAY_NEEDS_PHYSICAL(__display) (DISPLAY_INFO(__display)-
> >overlay_needs_physical)
> #define SUPPORTS_TV(__display) (DISPLAY_INFO(__display)-
> >supports_tv)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c
> b/drivers/gpu/drm/i915/display/intel_display_irq.c
> index 6f78fe6de06a..d9f9b9f78abb 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_irq.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
> @@ -1900,7 +1900,7 @@ void vlv_display_irq_reset(struct intel_display *display)
>
> void i9xx_display_irq_reset(struct intel_display *display) {
> - if (I915_HAS_HOTPLUG(display)) {
> + if (HAS_HOTPLUG(display)) {
> i915_hotplug_interrupt_update(display, 0xffffffff, 0);
> intel_de_rmw(display, PORT_HOTPLUG_STAT(display), 0, 0);
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> index 1bcff3a47745..2463e61e7802 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
> @@ -1481,7 +1481,7 @@ void intel_hotplug_irq_init(struct intel_display
> *display)
> intel_hpd_init_early(display);
>
> if (HAS_GMCH(display)) {
> - if (I915_HAS_HOTPLUG(display))
> + if (HAS_HOTPLUG(display))
> display->funcs.hotplug = &i915_hpd_funcs;
> } else {
> if (HAS_PCH_DG2(i915))
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c
> b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index 6e2d9929b4d7..757b9ce7e3b1 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -2036,7 +2036,7 @@ static u16 intel_sdvo_get_hotplug_support(struct
> intel_sdvo *intel_sdvo)
> struct intel_display *display = to_intel_display(&intel_sdvo->base);
> u16 hotplug;
>
> - if (!I915_HAS_HOTPLUG(display))
> + if (!HAS_HOTPLUG(display))
> return 0;
>
> /*
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index ba3afc7e38ac..c1f938a1da44 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -954,7 +954,7 @@ static void i915_irq_postinstall(struct drm_i915_private
> *dev_priv)
> enable_mask |= I915_ASLE_INTERRUPT;
> }
>
> - if (I915_HAS_HOTPLUG(dev_priv)) {
> + if (HAS_HOTPLUG(dev_priv)) {
> dev_priv->irq_mask &= ~I915_DISPLAY_PORT_INTERRUPT;
> enable_mask |= I915_DISPLAY_PORT_INTERRUPT;
> }
> @@ -995,7 +995,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
>
> ret = IRQ_HANDLED;
>
> - if (I915_HAS_HOTPLUG(dev_priv) &&
> + if (HAS_HOTPLUG(dev_priv) &&
> iir & I915_DISPLAY_PORT_INTERRUPT)
> hotplug_status = i9xx_hpd_irq_ack(display);
>
> --
> 2.39.5
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 0/9] drm/i915/display: conversions to struct intel_display
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (8 preceding siblings ...)
2025-03-11 18:00 ` [PATCH 9/9] drm/i915/display: rename I915_HAS_HOTPLUG() to HAS_HOTPLUG Jani Nikula
@ 2025-03-11 19:13 ` Ville Syrjälä
2025-03-11 20:19 ` ✓ CI.Patch_applied: success for drm/i915/display: conversions to struct intel_display (rev2) Patchwork
` (7 subsequent siblings)
17 siblings, 0 replies; 31+ messages in thread
From: Ville Syrjälä @ 2025-03-11 19:13 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, intel-xe
On Tue, Mar 11, 2025 at 08:00:34PM +0200, Jani Nikula wrote:
> Primarily convert all hotplug and irq code to struct intel_display, and
> then some.
>
> Jani Nikula (9):
> drm/i915/color: prefer display->platform.<platform> checks
> drm/i915/connector: convert intel_connector.c to struct intel_display
> drm/i915/hotplug: convert intel_hotplug.[ch] to struct intel_display
> drm/i915/hotplug: convert hotplug debugfs to struct intel_display
> drm/i915/hotplug: convert hotplug irq handling to intel_de_*()
> drm/i915/hotplug: convert intel_hotplug_irq.[ch] to struct
> intel_display
> drm/i915/irq: convert intel_display_irq.[ch] interfaces to struct
> intel_display
> drm/i915/irq: convert rest of intel_display_irq.[ch] to struct
> intel_display
> drm/i915/display: rename I915_HAS_HOTPLUG() to HAS_HOTPLUG
Looked reasonable to me. Series is
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> drivers/gpu/drm/i915/display/i9xx_plane.c | 24 +-
> drivers/gpu/drm/i915/display/intel_color.c | 16 +-
> .../gpu/drm/i915/display/intel_connector.c | 45 +-
> drivers/gpu/drm/i915/display/intel_crt.c | 10 +-
> .../drm/i915/display/intel_display_debugfs.c | 2 +-
> .../drm/i915/display/intel_display_device.h | 2 +-
> .../drm/i915/display/intel_display_driver.c | 16 +-
> .../gpu/drm/i915/display/intel_display_irq.c | 742 +++++++++---------
> .../gpu/drm/i915/display/intel_display_irq.h | 75 +-
> .../i915/display/intel_display_power_well.c | 18 +-
> .../drm/i915/display/intel_display_reset.c | 4 +-
> drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
> .../drm/i915/display/intel_fifo_underrun.c | 27 +-
> drivers/gpu/drm/i915/display/intel_hotplug.c | 348 ++++----
> drivers/gpu/drm/i915/display/intel_hotplug.h | 26 +-
> .../gpu/drm/i915/display/intel_hotplug_irq.c | 623 +++++++--------
> .../gpu/drm/i915/display/intel_hotplug_irq.h | 28 +-
> drivers/gpu/drm/i915/display/intel_pipe_crc.c | 3 +-
> drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +-
> drivers/gpu/drm/i915/display/intel_tv.c | 4 +-
> .../drm/i915/display/skl_universal_plane.c | 6 +-
> drivers/gpu/drm/i915/gt/intel_rps.c | 6 +-
> drivers/gpu/drm/i915/i915_driver.c | 14 +-
> drivers/gpu/drm/i915/i915_irq.c | 123 +--
> drivers/gpu/drm/xe/display/xe_display.c | 38 +-
> 25 files changed, 1118 insertions(+), 1086 deletions(-)
>
> --
> 2.39.5
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 31+ messages in thread* ✓ CI.Patch_applied: success for drm/i915/display: conversions to struct intel_display (rev2)
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (9 preceding siblings ...)
2025-03-11 19:13 ` [PATCH 0/9] drm/i915/display: conversions to struct intel_display Ville Syrjälä
@ 2025-03-11 20:19 ` Patchwork
2025-03-11 20:20 ` ✗ CI.checkpatch: warning " Patchwork
` (6 subsequent siblings)
17 siblings, 0 replies; 31+ messages in thread
From: Patchwork @ 2025-03-11 20:19 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-xe
== Series Details ==
Series: drm/i915/display: conversions to struct intel_display (rev2)
URL : https://patchwork.freedesktop.org/series/144749/
State : success
== Summary ==
=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: eb17816e5239 drm-tip: 2025y-03m-11d-20h-02m-04s UTC integration manifest
=== git am output follows ===
Applying: drm/i915/color: prefer display->platform.<platform> checks
Applying: drm/i915/connector: convert intel_connector.c to struct intel_display
Applying: drm/i915/hotplug: convert intel_hotplug.[ch] to struct intel_display
Applying: drm/i915/hotplug: convert hotplug debugfs to struct intel_display
Applying: drm/i915/hotplug: convert hotplug irq handling to intel_de_*()
Applying: drm/i915/hotplug: convert intel_hotplug_irq.[ch] to struct intel_display
Applying: drm/i915/irq: convert intel_display_irq.[ch] interfaces to struct intel_display
Applying: drm/i915/irq: convert rest of intel_display_irq.[ch] to struct intel_display
Applying: drm/i915/display: rename I915_HAS_HOTPLUG() to HAS_HOTPLUG
^ permalink raw reply [flat|nested] 31+ messages in thread* ✗ CI.checkpatch: warning for drm/i915/display: conversions to struct intel_display (rev2)
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (10 preceding siblings ...)
2025-03-11 20:19 ` ✓ CI.Patch_applied: success for drm/i915/display: conversions to struct intel_display (rev2) Patchwork
@ 2025-03-11 20:20 ` Patchwork
2025-03-11 20:21 ` ✓ CI.KUnit: success " Patchwork
` (5 subsequent siblings)
17 siblings, 0 replies; 31+ messages in thread
From: Patchwork @ 2025-03-11 20:20 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-xe
== Series Details ==
Series: drm/i915/display: conversions to struct intel_display (rev2)
URL : https://patchwork.freedesktop.org/series/144749/
State : warning
== Summary ==
+ KERNEL=/kernel
+ git clone https://gitlab.freedesktop.org/drm/maintainer-tools mt
Cloning into 'mt'...
warning: redirecting to https://gitlab.freedesktop.org/drm/maintainer-tools.git/
+ git -C mt rev-list -n1 origin/master
cbb4e4a079d89106c2736adc3c7de6f9dc56da07
+ cd /kernel
+ git config --global --add safe.directory /kernel
+ git log -n1
commit 95ea6912f96bd7b1efb657cace13a571700d03c6
Author: Jani Nikula <jani.nikula@intel.com>
Date: Tue Mar 11 20:00:43 2025 +0200
drm/i915/display: rename I915_HAS_HOTPLUG() to HAS_HOTPLUG
Most of the other display feature check macros are just
HAS_<something>. Follow suit with hotplug check.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+ /mt/dim checkpatch eb17816e52395a403aa0b447aa0befa9d2f86dd5 drm-intel
04b55f2c5ee1 drm/i915/color: prefer display->platform.<platform> checks
4326cffc63c2 drm/i915/connector: convert intel_connector.c to struct intel_display
432f7da0d64c drm/i915/hotplug: convert intel_hotplug.[ch] to struct intel_display
ab071cbd4557 drm/i915/hotplug: convert hotplug debugfs to struct intel_display
6aa75fe2a6a3 drm/i915/hotplug: convert hotplug irq handling to intel_de_*()
84217c72e315 drm/i915/hotplug: convert intel_hotplug_irq.[ch] to struct intel_display
3249dabeb621 drm/i915/irq: convert intel_display_irq.[ch] interfaces to struct intel_display
-:856: WARNING:LONG_LINE: line length of 103 exceeds 100 columns
#856: FILE: drivers/gpu/drm/i915/display/intel_display_irq.h:74:
+void i915_pipestat_irq_handler(struct intel_display *display, u32 iir, u32 pipe_stats[I915_MAX_PIPES]);
-:857: WARNING:LONG_LINE: line length of 103 exceeds 100 columns
#857: FILE: drivers/gpu/drm/i915/display/intel_display_irq.h:75:
+void i965_pipestat_irq_handler(struct intel_display *display, u32 iir, u32 pipe_stats[I915_MAX_PIPES]);
total: 0 errors, 2 warnings, 0 checks, 1501 lines checked
d672131db400 drm/i915/irq: convert rest of intel_display_irq.[ch] to struct intel_display
95ea6912f96b drm/i915/display: rename I915_HAS_HOTPLUG() to HAS_HOTPLUG
^ permalink raw reply [flat|nested] 31+ messages in thread* ✓ CI.KUnit: success for drm/i915/display: conversions to struct intel_display (rev2)
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (11 preceding siblings ...)
2025-03-11 20:20 ` ✗ CI.checkpatch: warning " Patchwork
@ 2025-03-11 20:21 ` Patchwork
2025-03-11 20:38 ` ✓ CI.Build: " Patchwork
` (4 subsequent siblings)
17 siblings, 0 replies; 31+ messages in thread
From: Patchwork @ 2025-03-11 20:21 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-xe
== Series Details ==
Series: drm/i915/display: conversions to struct intel_display (rev2)
URL : https://patchwork.freedesktop.org/series/144749/
State : success
== Summary ==
+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig
[20:20:30] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[20:20:34] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make all compile_commands.json ARCH=um O=.kunit --jobs=48
../lib/iomap.c:156:5: warning: no previous prototype for ‘ioread64_lo_hi’ [-Wmissing-prototypes]
156 | u64 ioread64_lo_hi(const void __iomem *addr)
| ^~~~~~~~~~~~~~
../lib/iomap.c:163:5: warning: no previous prototype for ‘ioread64_hi_lo’ [-Wmissing-prototypes]
163 | u64 ioread64_hi_lo(const void __iomem *addr)
| ^~~~~~~~~~~~~~
../lib/iomap.c:170:5: warning: no previous prototype for ‘ioread64be_lo_hi’ [-Wmissing-prototypes]
170 | u64 ioread64be_lo_hi(const void __iomem *addr)
| ^~~~~~~~~~~~~~~~
../lib/iomap.c:178:5: warning: no previous prototype for ‘ioread64be_hi_lo’ [-Wmissing-prototypes]
178 | u64 ioread64be_hi_lo(const void __iomem *addr)
| ^~~~~~~~~~~~~~~~
../lib/iomap.c:264:6: warning: no previous prototype for ‘iowrite64_lo_hi’ [-Wmissing-prototypes]
264 | void iowrite64_lo_hi(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~
../lib/iomap.c:272:6: warning: no previous prototype for ‘iowrite64_hi_lo’ [-Wmissing-prototypes]
272 | void iowrite64_hi_lo(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~
../lib/iomap.c:280:6: warning: no previous prototype for ‘iowrite64be_lo_hi’ [-Wmissing-prototypes]
280 | void iowrite64be_lo_hi(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~~~
../lib/iomap.c:288:6: warning: no previous prototype for ‘iowrite64be_hi_lo’ [-Wmissing-prototypes]
288 | void iowrite64be_hi_lo(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~~~
[20:21:00] Starting KUnit Kernel (1/1)...
[20:21:00] ============================================================
Running tests with:
$ .kunit/linux kunit.enable=1 mem=1G console=tty kunit_shutdown=halt
[20:21:00] ================== guc_buf (11 subtests) ===================
[20:21:00] [PASSED] test_smallest
[20:21:00] [PASSED] test_largest
[20:21:00] [PASSED] test_granular
[20:21:00] [PASSED] test_unique
[20:21:00] [PASSED] test_overlap
[20:21:00] [PASSED] test_reusable
[20:21:00] [PASSED] test_too_big
[20:21:00] [PASSED] test_flush
[20:21:00] [PASSED] test_lookup
[20:21:00] [PASSED] test_data
[20:21:00] [PASSED] test_class
[20:21:00] ===================== [PASSED] guc_buf =====================
[20:21:00] =================== guc_dbm (7 subtests) ===================
[20:21:00] [PASSED] test_empty
[20:21:00] [PASSED] test_default
[20:21:00] ======================== test_size ========================
[20:21:00] [PASSED] 4
[20:21:00] [PASSED] 8
[20:21:00] [PASSED] 32
[20:21:00] [PASSED] 256
[20:21:00] ==================== [PASSED] test_size ====================
[20:21:00] ======================= test_reuse ========================
[20:21:00] [PASSED] 4
[20:21:00] [PASSED] 8
[20:21:00] [PASSED] 32
[20:21:00] [PASSED] 256
[20:21:00] =================== [PASSED] test_reuse ====================
[20:21:00] =================== test_range_overlap ====================
[20:21:00] [PASSED] 4
[20:21:00] [PASSED] 8
[20:21:00] [PASSED] 32
[20:21:00] [PASSED] 256
[20:21:00] =============== [PASSED] test_range_overlap ================
[20:21:00] =================== test_range_compact ====================
[20:21:00] [PASSED] 4
[20:21:00] [PASSED] 8
[20:21:00] [PASSED] 32
[20:21:00] [PASSED] 256
[20:21:00] =============== [PASSED] test_range_compact ================
[20:21:00] ==================== test_range_spare =====================
[20:21:00] [PASSED] 4
[20:21:00] [PASSED] 8
[20:21:00] [PASSED] 32
[20:21:00] [PASSED] 256
[20:21:00] ================ [PASSED] test_range_spare =================
[20:21:00] ===================== [PASSED] guc_dbm =====================
[20:21:00] =================== guc_idm (6 subtests) ===================
[20:21:00] [PASSED] bad_init
[20:21:00] [PASSED] no_init
[20:21:00] [PASSED] init_fini
[20:21:00] [PASSED] check_used
[20:21:00] [PASSED] check_quota
[20:21:00] [PASSED] check_all
[20:21:00] ===================== [PASSED] guc_idm =====================
[20:21:00] ================== no_relay (3 subtests) ===================
[20:21:00] [PASSED] xe_drops_guc2pf_if_not_ready
[20:21:00] [PASSED] xe_drops_guc2vf_if_not_ready
[20:21:00] [PASSED] xe_rejects_send_if_not_ready
[20:21:00] ==================== [PASSED] no_relay =====================
[20:21:00] ================== pf_relay (14 subtests) ==================
[20:21:00] [PASSED] pf_rejects_guc2pf_too_short
[20:21:00] [PASSED] pf_rejects_guc2pf_too_long
[20:21:00] [PASSED] pf_rejects_guc2pf_no_payload
[20:21:00] [PASSED] pf_fails_no_payload
[20:21:00] [PASSED] pf_fails_bad_origin
[20:21:00] [PASSED] pf_fails_bad_type
[20:21:00] [PASSED] pf_txn_reports_error
[20:21:00] [PASSED] pf_txn_sends_pf2guc
[20:21:00] [PASSED] pf_sends_pf2guc
[20:21:00] [SKIPPED] pf_loopback_nop
[20:21:00] [SKIPPED] pf_loopback_echo
[20:21:00] [SKIPPED] pf_loopback_fail
[20:21:00] [SKIPPED] pf_loopback_busy
[20:21:00] [SKIPPED] pf_loopback_retry
[20:21:00] ==================== [PASSED] pf_relay =====================
[20:21:00] ================== vf_relay (3 subtests) ===================
[20:21:00] [PASSED] vf_rejects_guc2vf_too_short
[20:21:00] [PASSED] vf_rejects_guc2vf_too_long
[20:21:00] [PASSED] vf_rejects_guc2vf_no_payload
[20:21:00] ==================== [PASSED] vf_relay =====================
[20:21:00] ================= pf_service (11 subtests) =================
[20:21:00] [PASSED] pf_negotiate_any
[20:21:00] [PASSED] pf_negotiate_base_match
[20:21:00] [PASSED] pf_negotiate_base_newer
[20:21:00] [PASSED] pf_negotiate_base_next
[20:21:00] [SKIPPED] pf_negotiate_base_older
[20:21:00] [PASSED] pf_negotiate_base_prev
[20:21:00] [PASSED] pf_negotiate_latest_match
[20:21:00] [PASSED] pf_negotiate_latest_newer
[20:21:00] [PASSED] pf_negotiate_latest_next
[20:21:00] [SKIPPED] pf_negotiate_latest_older
[20:21:00] [SKIPPED] pf_negotiate_latest_prev
[20:21:00] =================== [PASSED] pf_service ====================
[20:21:00] ===================== lmtt (1 subtest) =====================
[20:21:00] ======================== test_ops =========================
[20:21:00] [PASSED] 2-level
[20:21:00] [PASSED] multi-level
[20:21:00] ==================== [PASSED] test_ops =====================
[20:21:00] ====================== [PASSED] lmtt =======================
[20:21:00] =================== xe_mocs (2 subtests) ===================
[20:21:00] ================ xe_live_mocs_kernel_kunit ================
[20:21:00] =========== [SKIPPED] xe_live_mocs_kernel_kunit ============
[20:21:00] ================ xe_live_mocs_reset_kunit =================
[20:21:00] ============ [SKIPPED] xe_live_mocs_reset_kunit ============
[20:21:00] ==================== [SKIPPED] xe_mocs =====================
[20:21:00] ================= xe_migrate (2 subtests) ==================
[20:21:00] ================= xe_migrate_sanity_kunit =================
[20:21:00] ============ [SKIPPED] xe_migrate_sanity_kunit =============
[20:21:00] ================== xe_validate_ccs_kunit ==================
[20:21:00] ============= [SKIPPED] xe_validate_ccs_kunit ==============
[20:21:00] =================== [SKIPPED] xe_migrate ===================
[20:21:00] ================== xe_dma_buf (1 subtest) ==================
[20:21:00] ==================== xe_dma_buf_kunit =====================
[20:21:00] ================ [SKIPPED] xe_dma_buf_kunit ================
[20:21:00] =================== [SKIPPED] xe_dma_buf ===================
[20:21:00] ================= xe_bo_shrink (1 subtest) =================
[20:21:00] =================== xe_bo_shrink_kunit ====================
[20:21:00] =============== [SKIPPED] xe_bo_shrink_kunit ===============
[20:21:00] ================== [SKIPPED] xe_bo_shrink ==================
[20:21:00] ==================== xe_bo (2 subtests) ====================
[20:21:00] ================== xe_ccs_migrate_kunit ===================
[20:21:00] ============== [SKIPPED] xe_ccs_migrate_kunit ==============
stty: 'standard input': Inappropriate ioctl for device
[20:21:00] ==================== xe_bo_evict_kunit ====================
[20:21:00] =============== [SKIPPED] xe_bo_evict_kunit ================
[20:21:00] ===================== [SKIPPED] xe_bo ======================
[20:21:00] ==================== args (11 subtests) ====================
[20:21:00] [PASSED] count_args_test
[20:21:00] [PASSED] call_args_example
[20:21:00] [PASSED] call_args_test
[20:21:00] [PASSED] drop_first_arg_example
[20:21:00] [PASSED] drop_first_arg_test
[20:21:00] [PASSED] first_arg_example
[20:21:00] [PASSED] first_arg_test
[20:21:00] [PASSED] last_arg_example
[20:21:00] [PASSED] last_arg_test
[20:21:00] [PASSED] pick_arg_example
[20:21:00] [PASSED] sep_comma_example
[20:21:00] ====================== [PASSED] args =======================
[20:21:00] =================== xe_pci (2 subtests) ====================
[20:21:00] [PASSED] xe_gmdid_graphics_ip
[20:21:00] [PASSED] xe_gmdid_media_ip
[20:21:00] ===================== [PASSED] xe_pci ======================
[20:21:00] =================== xe_rtp (2 subtests) ====================
[20:21:00] =============== xe_rtp_process_to_sr_tests ================
[20:21:00] [PASSED] coalesce-same-reg
[20:21:00] [PASSED] no-match-no-add
[20:21:00] [PASSED] match-or
[20:21:00] [PASSED] match-or-xfail
[20:21:00] [PASSED] no-match-no-add-multiple-rules
[20:21:00] [PASSED] two-regs-two-entries
[20:21:00] [PASSED] clr-one-set-other
[20:21:00] [PASSED] set-field
[20:21:00] [PASSED] conflict-duplicate
[20:21:00] [PASSED] conflict-not-disjoint
[20:21:00] [PASSED] conflict-reg-type
[20:21:00] =========== [PASSED] xe_rtp_process_to_sr_tests ============
[20:21:00] ================== xe_rtp_process_tests ===================
[20:21:00] [PASSED] active1
[20:21:00] [PASSED] active2
[20:21:00] [PASSED] active-inactive
[20:21:00] [PASSED] inactive-active
[20:21:00] [PASSED] inactive-1st_or_active-inactive
[20:21:00] [PASSED] inactive-2nd_or_active-inactive
[20:21:00] [PASSED] inactive-last_or_active-inactive
[20:21:00] [PASSED] inactive-no_or_active-inactive
[20:21:00] ============== [PASSED] xe_rtp_process_tests ===============
[20:21:00] ===================== [PASSED] xe_rtp ======================
[20:21:00] ==================== xe_wa (1 subtest) =====================
[20:21:00] ======================== xe_wa_gt =========================
[20:21:00] [PASSED] TIGERLAKE (B0)
[20:21:00] [PASSED] DG1 (A0)
[20:21:00] [PASSED] DG1 (B0)
[20:21:00] [PASSED] ALDERLAKE_S (A0)
[20:21:00] [PASSED] ALDERLAKE_S (B0)
[20:21:00] [PASSED] ALDERLAKE_S (C0)
[20:21:00] [PASSED] ALDERLAKE_S (D0)
[20:21:00] [PASSED] ALDERLAKE_P (A0)
[20:21:00] [PASSED] ALDERLAKE_P (B0)
[20:21:00] [PASSED] ALDERLAKE_P (C0)
[20:21:00] [PASSED] ALDERLAKE_S_RPLS (D0)
[20:21:00] [PASSED] ALDERLAKE_P_RPLU (E0)
[20:21:00] [PASSED] DG2_G10 (C0)
[20:21:00] [PASSED] DG2_G11 (B1)
[20:21:00] [PASSED] DG2_G12 (A1)
[20:21:00] [PASSED] METEORLAKE (g:A0, m:A0)
[20:21:00] [PASSED] METEORLAKE (g:A0, m:A0)
[20:21:00] [PASSED] METEORLAKE (g:A0, m:A0)
[20:21:00] [PASSED] LUNARLAKE (g:A0, m:A0)
[20:21:00] [PASSED] LUNARLAKE (g:B0, m:A0)
[20:21:00] [PASSED] BATTLEMAGE (g:A0, m:A1)
[20:21:00] ==================== [PASSED] xe_wa_gt =====================
[20:21:00] ====================== [PASSED] xe_wa ======================
[20:21:00] ============================================================
[20:21:00] Testing complete. Ran 133 tests: passed: 117, skipped: 16
[20:21:00] Elapsed time: 30.676s total, 4.168s configuring, 26.242s building, 0.249s running
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/tests/.kunitconfig
[20:21:01] Configuring KUnit Kernel ...
Regenerating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[20:21:02] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make all compile_commands.json ARCH=um O=.kunit --jobs=48
../lib/iomap.c:156:5: warning: no previous prototype for ‘ioread64_lo_hi’ [-Wmissing-prototypes]
156 | u64 ioread64_lo_hi(const void __iomem *addr)
| ^~~~~~~~~~~~~~
../lib/iomap.c:163:5: warning: no previous prototype for ‘ioread64_hi_lo’ [-Wmissing-prototypes]
163 | u64 ioread64_hi_lo(const void __iomem *addr)
| ^~~~~~~~~~~~~~
../lib/iomap.c:170:5: warning: no previous prototype for ‘ioread64be_lo_hi’ [-Wmissing-prototypes]
170 | u64 ioread64be_lo_hi(const void __iomem *addr)
| ^~~~~~~~~~~~~~~~
../lib/iomap.c:178:5: warning: no previous prototype for ‘ioread64be_hi_lo’ [-Wmissing-prototypes]
178 | u64 ioread64be_hi_lo(const void __iomem *addr)
| ^~~~~~~~~~~~~~~~
../lib/iomap.c:264:6: warning: no previous prototype for ‘iowrite64_lo_hi’ [-Wmissing-prototypes]
264 | void iowrite64_lo_hi(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~
../lib/iomap.c:272:6: warning: no previous prototype for ‘iowrite64_hi_lo’ [-Wmissing-prototypes]
272 | void iowrite64_hi_lo(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~
../lib/iomap.c:280:6: warning: no previous prototype for ‘iowrite64be_lo_hi’ [-Wmissing-prototypes]
280 | void iowrite64be_lo_hi(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~~~
../lib/iomap.c:288:6: warning: no previous prototype for ‘iowrite64be_hi_lo’ [-Wmissing-prototypes]
288 | void iowrite64be_hi_lo(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~~~
[20:21:23] Starting KUnit Kernel (1/1)...
[20:21:23] ============================================================
Running tests with:
$ .kunit/linux kunit.enable=1 mem=1G console=tty kunit_shutdown=halt
[20:21:23] =========== drm_validate_clone_mode (2 subtests) ===========
[20:21:23] ============== drm_test_check_in_clone_mode ===============
[20:21:23] [PASSED] in_clone_mode
[20:21:23] [PASSED] not_in_clone_mode
[20:21:23] ========== [PASSED] drm_test_check_in_clone_mode ===========
[20:21:23] =============== drm_test_check_valid_clones ===============
[20:21:23] [PASSED] not_in_clone_mode
[20:21:23] [PASSED] valid_clone
[20:21:23] [PASSED] invalid_clone
[20:21:23] =========== [PASSED] drm_test_check_valid_clones ===========
[20:21:23] ============= [PASSED] drm_validate_clone_mode =============
[20:21:23] ============= drm_validate_modeset (1 subtest) =============
[20:21:23] [PASSED] drm_test_check_connector_changed_modeset
[20:21:23] ============== [PASSED] drm_validate_modeset ===============
[20:21:23] ================== drm_buddy (7 subtests) ==================
[20:21:23] [PASSED] drm_test_buddy_alloc_limit
[20:21:23] [PASSED] drm_test_buddy_alloc_optimistic
[20:21:23] [PASSED] drm_test_buddy_alloc_pessimistic
[20:21:23] [PASSED] drm_test_buddy_alloc_pathological
[20:21:24] [PASSED] drm_test_buddy_alloc_contiguous
[20:21:24] [PASSED] drm_test_buddy_alloc_clear
[20:21:24] [PASSED] drm_test_buddy_alloc_range_bias
[20:21:24] ==================== [PASSED] drm_buddy ====================
[20:21:24] ============= drm_cmdline_parser (40 subtests) =============
[20:21:24] [PASSED] drm_test_cmdline_force_d_only
[20:21:24] [PASSED] drm_test_cmdline_force_D_only_dvi
[20:21:24] [PASSED] drm_test_cmdline_force_D_only_hdmi
[20:21:24] [PASSED] drm_test_cmdline_force_D_only_not_digital
[20:21:24] [PASSED] drm_test_cmdline_force_e_only
[20:21:24] [PASSED] drm_test_cmdline_res
[20:21:24] [PASSED] drm_test_cmdline_res_vesa
[20:21:24] [PASSED] drm_test_cmdline_res_vesa_rblank
[20:21:24] [PASSED] drm_test_cmdline_res_rblank
[20:21:24] [PASSED] drm_test_cmdline_res_bpp
[20:21:24] [PASSED] drm_test_cmdline_res_refresh
[20:21:24] [PASSED] drm_test_cmdline_res_bpp_refresh
[20:21:24] [PASSED] drm_test_cmdline_res_bpp_refresh_interlaced
[20:21:24] [PASSED] drm_test_cmdline_res_bpp_refresh_margins
[20:21:24] [PASSED] drm_test_cmdline_res_bpp_refresh_force_off
[20:21:24] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on
[20:21:24] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on_analog
[20:21:24] [PASSED] drm_test_cmdline_res_bpp_refresh_force_on_digital
[20:21:24] [PASSED] drm_test_cmdline_res_bpp_refresh_interlaced_margins_force_on
[20:21:24] [PASSED] drm_test_cmdline_res_margins_force_on
[20:21:24] [PASSED] drm_test_cmdline_res_vesa_margins
[20:21:24] [PASSED] drm_test_cmdline_name
[20:21:24] [PASSED] drm_test_cmdline_name_bpp
[20:21:24] [PASSED] drm_test_cmdline_name_option
[20:21:24] [PASSED] drm_test_cmdline_name_bpp_option
[20:21:24] [PASSED] drm_test_cmdline_rotate_0
[20:21:24] [PASSED] drm_test_cmdline_rotate_90
[20:21:24] [PASSED] drm_test_cmdline_rotate_180
[20:21:24] [PASSED] drm_test_cmdline_rotate_270
[20:21:24] [PASSED] drm_test_cmdline_hmirror
[20:21:24] [PASSED] drm_test_cmdline_vmirror
[20:21:24] [PASSED] drm_test_cmdline_margin_options
[20:21:24] [PASSED] drm_test_cmdline_multiple_options
[20:21:24] [PASSED] drm_test_cmdline_bpp_extra_and_option
[20:21:24] [PASSED] drm_test_cmdline_extra_and_option
[20:21:24] [PASSED] drm_test_cmdline_freestanding_options
[20:21:24] [PASSED] drm_test_cmdline_freestanding_force_e_and_options
[20:21:24] [PASSED] drm_test_cmdline_panel_orientation
[20:21:24] ================ drm_test_cmdline_invalid =================
[20:21:24] [PASSED] margin_only
[20:21:24] [PASSED] interlace_only
[20:21:24] [PASSED] res_missing_x
[20:21:24] [PASSED] res_missing_y
[20:21:24] [PASSED] res_bad_y
[20:21:24] [PASSED] res_missing_y_bpp
[20:21:24] [PASSED] res_bad_bpp
[20:21:24] [PASSED] res_bad_refresh
[20:21:24] [PASSED] res_bpp_refresh_force_on_off
[20:21:24] [PASSED] res_invalid_mode
[20:21:24] [PASSED] res_bpp_wrong_place_mode
[20:21:24] [PASSED] name_bpp_refresh
[20:21:24] [PASSED] name_refresh
[20:21:24] [PASSED] name_refresh_wrong_mode
[20:21:24] [PASSED] name_refresh_invalid_mode
[20:21:24] [PASSED] rotate_multiple
[20:21:24] [PASSED] rotate_invalid_val
[20:21:24] [PASSED] rotate_truncated
[20:21:24] [PASSED] invalid_option
[20:21:24] [PASSED] invalid_tv_option
[20:21:24] [PASSED] truncated_tv_option
[20:21:24] ============ [PASSED] drm_test_cmdline_invalid =============
[20:21:24] =============== drm_test_cmdline_tv_options ===============
[20:21:24] [PASSED] NTSC
[20:21:24] [PASSED] NTSC_443
[20:21:24] [PASSED] NTSC_J
[20:21:24] [PASSED] PAL
[20:21:24] [PASSED] PAL_M
[20:21:24] [PASSED] PAL_N
[20:21:24] [PASSED] SECAM
[20:21:24] [PASSED] MONO_525
[20:21:24] [PASSED] MONO_625
[20:21:24] =========== [PASSED] drm_test_cmdline_tv_options ===========
[20:21:24] =============== [PASSED] drm_cmdline_parser ================
[20:21:24] ========== drmm_connector_hdmi_init (20 subtests) ==========
[20:21:24] [PASSED] drm_test_connector_hdmi_init_valid
[20:21:24] [PASSED] drm_test_connector_hdmi_init_bpc_8
[20:21:24] [PASSED] drm_test_connector_hdmi_init_bpc_10
[20:21:24] [PASSED] drm_test_connector_hdmi_init_bpc_12
[20:21:24] [PASSED] drm_test_connector_hdmi_init_bpc_invalid
[20:21:24] [PASSED] drm_test_connector_hdmi_init_bpc_null
[20:21:24] [PASSED] drm_test_connector_hdmi_init_formats_empty
[20:21:24] [PASSED] drm_test_connector_hdmi_init_formats_no_rgb
[20:21:24] === drm_test_connector_hdmi_init_formats_yuv420_allowed ===
[20:21:24] [PASSED] supported_formats=0x9 yuv420_allowed=1
[20:21:24] [PASSED] supported_formats=0x9 yuv420_allowed=0
[20:21:24] [PASSED] supported_formats=0x3 yuv420_allowed=1
[20:21:24] [PASSED] supported_formats=0x3 yuv420_allowed=0
[20:21:24] === [PASSED] drm_test_connector_hdmi_init_formats_yuv420_allowed ===
[20:21:24] [PASSED] drm_test_connector_hdmi_init_null_ddc
[20:21:24] [PASSED] drm_test_connector_hdmi_init_null_product
[20:21:24] [PASSED] drm_test_connector_hdmi_init_null_vendor
[20:21:24] [PASSED] drm_test_connector_hdmi_init_product_length_exact
[20:21:24] [PASSED] drm_test_connector_hdmi_init_product_length_too_long
[20:21:24] [PASSED] drm_test_connector_hdmi_init_product_valid
[20:21:24] [PASSED] drm_test_connector_hdmi_init_vendor_length_exact
[20:21:24] [PASSED] drm_test_connector_hdmi_init_vendor_length_too_long
[20:21:24] [PASSED] drm_test_connector_hdmi_init_vendor_valid
[20:21:24] ========= drm_test_connector_hdmi_init_type_valid =========
[20:21:24] [PASSED] HDMI-A
[20:21:24] [PASSED] HDMI-B
[20:21:24] ===== [PASSED] drm_test_connector_hdmi_init_type_valid =====
[20:21:24] ======== drm_test_connector_hdmi_init_type_invalid ========
[20:21:24] [PASSED] Unknown
[20:21:24] [PASSED] VGA
[20:21:24] [PASSED] DVI-I
[20:21:24] [PASSED] DVI-D
[20:21:24] [PASSED] DVI-A
[20:21:24] [PASSED] Composite
[20:21:24] [PASSED] SVIDEO
[20:21:24] [PASSED] LVDS
[20:21:24] [PASSED] Component
[20:21:24] [PASSED] DIN
[20:21:24] [PASSED] DP
[20:21:24] [PASSED] TV
[20:21:24] [PASSED] eDP
[20:21:24] [PASSED] Virtual
[20:21:24] [PASSED] DSI
[20:21:24] [PASSED] DPI
[20:21:24] [PASSED] Writeback
[20:21:24] [PASSED] SPI
[20:21:24] [PASSED] USB
[20:21:24] ==== [PASSED] drm_test_connector_hdmi_init_type_invalid ====
[20:21:24] ============ [PASSED] drmm_connector_hdmi_init =============
[20:21:24] ============= drmm_connector_init (3 subtests) =============
[20:21:24] [PASSED] drm_test_drmm_connector_init
[20:21:24] [PASSED] drm_test_drmm_connector_init_null_ddc
[20:21:24] ========= drm_test_drmm_connector_init_type_valid =========
[20:21:24] [PASSED] Unknown
[20:21:24] [PASSED] VGA
[20:21:24] [PASSED] DVI-I
[20:21:24] [PASSED] DVI-D
[20:21:24] [PASSED] DVI-A
[20:21:24] [PASSED] Composite
[20:21:24] [PASSED] SVIDEO
[20:21:24] [PASSED] LVDS
[20:21:24] [PASSED] Component
[20:21:24] [PASSED] DIN
[20:21:24] [PASSED] DP
[20:21:24] [PASSED] HDMI-A
[20:21:24] [PASSED] HDMI-B
[20:21:24] [PASSED] TV
[20:21:24] [PASSED] eDP
[20:21:24] [PASSED] Virtual
[20:21:24] [PASSED] DSI
[20:21:24] [PASSED] DPI
[20:21:24] [PASSED] Writeback
[20:21:24] [PASSED] SPI
[20:21:24] [PASSED] USB
[20:21:24] ===== [PASSED] drm_test_drmm_connector_init_type_valid =====
[20:21:24] =============== [PASSED] drmm_connector_init ===============
[20:21:24] ========= drm_connector_dynamic_init (6 subtests) ==========
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_init
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_init_null_ddc
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_init_not_added
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_init_properties
[20:21:24] ===== drm_test_drm_connector_dynamic_init_type_valid ======
[20:21:24] [PASSED] Unknown
[20:21:24] [PASSED] VGA
[20:21:24] [PASSED] DVI-I
[20:21:24] [PASSED] DVI-D
[20:21:24] [PASSED] DVI-A
[20:21:24] [PASSED] Composite
[20:21:24] [PASSED] SVIDEO
[20:21:24] [PASSED] LVDS
[20:21:24] [PASSED] Component
[20:21:24] [PASSED] DIN
[20:21:24] [PASSED] DP
[20:21:24] [PASSED] HDMI-A
[20:21:24] [PASSED] HDMI-B
[20:21:24] [PASSED] TV
[20:21:24] [PASSED] eDP
[20:21:24] [PASSED] Virtual
[20:21:24] [PASSED] DSI
[20:21:24] [PASSED] DPI
[20:21:24] [PASSED] Writeback
[20:21:24] [PASSED] SPI
[20:21:24] [PASSED] USB
[20:21:24] = [PASSED] drm_test_drm_connector_dynamic_init_type_valid ==
[20:21:24] ======== drm_test_drm_connector_dynamic_init_name =========
[20:21:24] [PASSED] Unknown
[20:21:24] [PASSED] VGA
[20:21:24] [PASSED] DVI-I
[20:21:24] [PASSED] DVI-D
[20:21:24] [PASSED] DVI-A
[20:21:24] [PASSED] Composite
[20:21:24] [PASSED] SVIDEO
[20:21:24] [PASSED] LVDS
[20:21:24] [PASSED] Component
[20:21:24] [PASSED] DIN
[20:21:24] [PASSED] DP
[20:21:24] [PASSED] HDMI-A
[20:21:24] [PASSED] HDMI-B
[20:21:24] [PASSED] TV
[20:21:24] [PASSED] eDP
[20:21:24] [PASSED] Virtual
[20:21:24] [PASSED] DSI
[20:21:24] [PASSED] DPI
[20:21:24] [PASSED] Writeback
[20:21:24] [PASSED] SPI
[20:21:24] [PASSED] USB
[20:21:24] ==== [PASSED] drm_test_drm_connector_dynamic_init_name =====
[20:21:24] =========== [PASSED] drm_connector_dynamic_init ============
[20:21:24] ==== drm_connector_dynamic_register_early (4 subtests) =====
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_register_early_on_list
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_register_early_defer
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_register_early_no_init
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_register_early_no_mode_object
[20:21:24] ====== [PASSED] drm_connector_dynamic_register_early =======
[20:21:24] ======= drm_connector_dynamic_register (7 subtests) ========
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_register_on_list
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_register_no_defer
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_register_no_init
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_register_mode_object
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_register_sysfs
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_register_sysfs_name
[20:21:24] [PASSED] drm_test_drm_connector_dynamic_register_debugfs
[20:21:24] ========= [PASSED] drm_connector_dynamic_register ==========
[20:21:24] = drm_connector_attach_broadcast_rgb_property (2 subtests) =
[20:21:24] [PASSED] drm_test_drm_connector_attach_broadcast_rgb_property
[20:21:24] [PASSED] drm_test_drm_connector_attach_broadcast_rgb_property_hdmi_connector
[20:21:24] === [PASSED] drm_connector_attach_broadcast_rgb_property ===
[20:21:24] ========== drm_get_tv_mode_from_name (2 subtests) ==========
[20:21:24] ========== drm_test_get_tv_mode_from_name_valid ===========
[20:21:24] [PASSED] NTSC
[20:21:24] [PASSED] NTSC-443
[20:21:24] [PASSED] NTSC-J
[20:21:24] [PASSED] PAL
[20:21:24] [PASSED] PAL-M
[20:21:24] [PASSED] PAL-N
[20:21:24] [PASSED] SECAM
[20:21:24] [PASSED] Mono
[20:21:24] ====== [PASSED] drm_test_get_tv_mode_from_name_valid =======
[20:21:24] [PASSED] drm_test_get_tv_mode_from_name_truncated
[20:21:24] ============ [PASSED] drm_get_tv_mode_from_name ============
[20:21:24] = drm_test_connector_hdmi_compute_mode_clock (12 subtests) =
[20:21:24] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb
[20:21:24] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_10bpc
[20:21:24] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_10bpc_vic_1
[20:21:24] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_12bpc
[20:21:24] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_12bpc_vic_1
[20:21:24] [PASSED] drm_test_drm_hdmi_compute_mode_clock_rgb_double
[20:21:24] = drm_test_connector_hdmi_compute_mode_clock_yuv420_valid =
[20:21:24] [PASSED] VIC 96
[20:21:24] [PASSED] VIC 97
[20:21:24] [PASSED] VIC 101
[20:21:24] [PASSED] VIC 102
[20:21:24] [PASSED] VIC 106
[20:21:24] [PASSED] VIC 107
[20:21:24] === [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv420_valid ===
[20:21:24] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv420_10_bpc
[20:21:24] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv420_12_bpc
[20:21:24] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv422_8_bpc
[20:21:24] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv422_10_bpc
[20:21:24] [PASSED] drm_test_connector_hdmi_compute_mode_clock_yuv422_12_bpc
[20:21:24] === [PASSED] drm_test_connector_hdmi_compute_mode_clock ====
[20:21:24] == drm_hdmi_connector_get_broadcast_rgb_name (2 subtests) ==
[20:21:24] === drm_test_drm_hdmi_connector_get_broadcast_rgb_name ====
[20:21:24] [PASSED] Automatic
[20:21:24] [PASSED] Full
[20:21:24] [PASSED] Limited 16:235
[20:21:24] === [PASSED] drm_test_drm_hdmi_connector_get_broadcast_rgb_name ===
[20:21:24] [PASSED] drm_test_drm_hdmi_connector_get_broadcast_rgb_name_invalid
[20:21:24] ==== [PASSED] drm_hdmi_connector_get_broadcast_rgb_name ====
[20:21:24] == drm_hdmi_connector_get_output_format_name (2 subtests) ==
[20:21:24] === drm_test_drm_hdmi_connector_get_output_format_name ====
[20:21:24] [PASSED] RGB
[20:21:24] [PASSED] YUV 4:2:0
[20:21:24] [PASSED] YUV 4:2:2
[20:21:24] [PASSED] YUV 4:4:4
[20:21:24] === [PASSED] drm_test_drm_hdmi_connector_get_output_format_name ===
[20:21:24] [PASSED] drm_test_drm_hdmi_connector_get_output_format_name_invalid
[20:21:24] ==== [PASSED] drm_hdmi_connector_get_output_format_name ====
[20:21:24] ============= drm_damage_helper (21 subtests) ==============
[20:21:24] [PASSED] drm_test_damage_iter_no_damage
[20:21:24] [PASSED] drm_test_damage_iter_no_damage_fractional_src
[20:21:24] [PASSED] drm_test_damage_iter_no_damage_src_moved
[20:21:24] [PASSED] drm_test_damage_iter_no_damage_fractional_src_moved
[20:21:24] [PASSED] drm_test_damage_iter_no_damage_not_visible
[20:21:24] [PASSED] drm_test_damage_iter_no_damage_no_crtc
[20:21:24] [PASSED] drm_test_damage_iter_no_damage_no_fb
[20:21:24] [PASSED] drm_test_damage_iter_simple_damage
[20:21:24] [PASSED] drm_test_damage_iter_single_damage
[20:21:24] [PASSED] drm_test_damage_iter_single_damage_intersect_src
[20:21:24] [PASSED] drm_test_damage_iter_single_damage_outside_src
[20:21:24] [PASSED] drm_test_damage_iter_single_damage_fractional_src
[20:21:24] [PASSED] drm_test_damage_iter_single_damage_intersect_fractional_src
[20:21:24] [PASSED] drm_test_damage_iter_single_damage_outside_fractional_src
[20:21:24] [PASSED] drm_test_damage_iter_single_damage_src_moved
[20:21:24] [PASSED] drm_test_damage_iter_single_damage_fractional_src_moved
[20:21:24] [PASSED] drm_test_damage_iter_damage
[20:21:24] [PASSED] drm_test_damage_iter_damage_one_intersect
[20:21:24] [PASSED] drm_test_damage_iter_damage_one_outside
[20:21:24] [PASSED] drm_test_damage_iter_damage_src_moved
[20:21:24] [PASSED] drm_test_damage_iter_damage_not_visible
[20:21:24] ================ [PASSED] drm_damage_helper ================
[20:21:24] ============== drm_dp_mst_helper (3 subtests) ==============
[20:21:24] ============== drm_test_dp_mst_calc_pbn_mode ==============
[20:21:24] [PASSED] Clock 154000 BPP 30 DSC disabled
[20:21:24] [PASSED] Clock 234000 BPP 30 DSC disabled
[20:21:24] [PASSED] Clock 297000 BPP 24 DSC disabled
[20:21:24] [PASSED] Clock 332880 BPP 24 DSC enabled
[20:21:24] [PASSED] Clock 324540 BPP 24 DSC enabled
[20:21:24] ========== [PASSED] drm_test_dp_mst_calc_pbn_mode ==========
[20:21:24] ============== drm_test_dp_mst_calc_pbn_div ===============
[20:21:24] [PASSED] Link rate 2000000 lane count 4
[20:21:24] [PASSED] Link rate 2000000 lane count 2
[20:21:24] [PASSED] Link rate 2000000 lane count 1
[20:21:24] [PASSED] Link rate 1350000 lane count 4
[20:21:24] [PASSED] Link rate 1350000 lane count 2
[20:21:24] [PASSED] Link rate 1350000 lane count 1
[20:21:24] [PASSED] Link rate 1000000 lane count 4
[20:21:24] [PASSED] Link rate 1000000 lane count 2
[20:21:24] [PASSED] Link rate 1000000 lane count 1
[20:21:24] [PASSED] Link rate 810000 lane count 4
[20:21:24] [PASSED] Link rate 810000 lane count 2
[20:21:24] [PASSED] Link rate 810000 lane count 1
[20:21:24] [PASSED] Link rate 540000 lane count 4
[20:21:24] [PASSED] Link rate 540000 lane count 2
[20:21:24] [PASSED] Link rate 540000 lane count 1
[20:21:24] [PASSED] Link rate 270000 lane count 4
[20:21:24] [PASSED] Link rate 270000 lane count 2
[20:21:24] [PASSED] Link rate 270000 lane count 1
[20:21:24] [PASSED] Link rate 162000 lane count 4
[20:21:24] [PASSED] Link rate 162000 lane count 2
[20:21:24] [PASSED] Link rate 162000 lane count 1
[20:21:24] ========== [PASSED] drm_test_dp_mst_calc_pbn_div ===========
[20:21:24] ========= drm_test_dp_mst_sideband_msg_req_decode =========
[20:21:24] [PASSED] DP_ENUM_PATH_RESOURCES with port number
[20:21:24] [PASSED] DP_POWER_UP_PHY with port number
[20:21:24] [PASSED] DP_POWER_DOWN_PHY with port number
[20:21:24] [PASSED] DP_ALLOCATE_PAYLOAD with SDP stream sinks
[20:21:24] [PASSED] DP_ALLOCATE_PAYLOAD with port number
[20:21:24] [PASSED] DP_ALLOCATE_PAYLOAD with VCPI
[20:21:24] [PASSED] DP_ALLOCATE_PAYLOAD with PBN
[20:21:24] [PASSED] DP_QUERY_PAYLOAD with port number
[20:21:24] [PASSED] DP_QUERY_PAYLOAD with VCPI
[20:21:24] [PASSED] DP_REMOTE_DPCD_READ with port number
[20:21:24] [PASSED] DP_REMOTE_DPCD_READ with DPCD address
[20:21:24] [PASSED] DP_REMOTE_DPCD_READ with max number of bytes
[20:21:24] [PASSED] DP_REMOTE_DPCD_WRITE with port number
[20:21:24] [PASSED] DP_REMOTE_DPCD_WRITE with DPCD address
[20:21:24] [PASSED] DP_REMOTE_DPCD_WRITE with data array
[20:21:24] [PASSED] DP_REMOTE_I2C_READ with port number
[20:21:24] [PASSED] DP_REMOTE_I2C_READ with I2C device ID
[20:21:24] [PASSED] DP_REMOTE_I2C_READ with transactions array
[20:21:24] [PASSED] DP_REMOTE_I2C_WRITE with port number
[20:21:24] [PASSED] DP_REMOTE_I2C_WRITE with I2C device ID
[20:21:24] [PASSED] DP_REMOTE_I2C_WRITE with data array
[20:21:24] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream ID
[20:21:24] [PASSED] DP_QUERY_STREAM_ENC_STATUS with client ID
[20:21:24] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream event
[20:21:24] [PASSED] DP_QUERY_STREAM_ENC_STATUS with valid stream event
[20:21:24] [PASSED] DP_QUERY_STREAM_ENC_STATUS with stream behavior
[20:21:24] [PASSED] DP_QUERY_STREAM_ENC_STATUS with a valid stream behavior
[20:21:24] ===== [PASSED] drm_test_dp_mst_sideband_msg_req_decode =====
[20:21:24] ================ [PASSED] drm_dp_mst_helper ================
[20:21:24] ================== drm_exec (7 subtests) ===================
[20:21:24] [PASSED] sanitycheck
[20:21:24] [PASSED] test_lock
[20:21:24] [PASSED] test_lock_unlock
[20:21:24] [PASSED] test_duplicates
[20:21:24] [PASSED] test_prepare
[20:21:24] [PASSED] test_prepare_array
[20:21:24] [PASSED] test_multiple_loops
[20:21:24] ==================== [PASSED] drm_exec =====================
[20:21:24] =========== drm_format_helper_test (18 subtests) ===========
[20:21:24] ============== drm_test_fb_xrgb8888_to_gray8 ==============
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ========== [PASSED] drm_test_fb_xrgb8888_to_gray8 ==========
[20:21:24] ============= drm_test_fb_xrgb8888_to_rgb332 ==============
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb332 ==========
[20:21:24] ============= drm_test_fb_xrgb8888_to_rgb565 ==============
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb565 ==========
[20:21:24] ============ drm_test_fb_xrgb8888_to_xrgb1555 =============
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ======== [PASSED] drm_test_fb_xrgb8888_to_xrgb1555 =========
[20:21:24] ============ drm_test_fb_xrgb8888_to_argb1555 =============
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ======== [PASSED] drm_test_fb_xrgb8888_to_argb1555 =========
[20:21:24] ============ drm_test_fb_xrgb8888_to_rgba5551 =============
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ======== [PASSED] drm_test_fb_xrgb8888_to_rgba5551 =========
[20:21:24] ============= drm_test_fb_xrgb8888_to_rgb888 ==============
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ========= [PASSED] drm_test_fb_xrgb8888_to_rgb888 ==========
[20:21:24] ============= drm_test_fb_xrgb8888_to_bgr888 ==============
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ========= [PASSED] drm_test_fb_xrgb8888_to_bgr888 ==========
[20:21:24] ============ drm_test_fb_xrgb8888_to_argb8888 =============
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ======== [PASSED] drm_test_fb_xrgb8888_to_argb8888 =========
[20:21:24] =========== drm_test_fb_xrgb8888_to_xrgb2101010 ===========
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ======= [PASSED] drm_test_fb_xrgb8888_to_xrgb2101010 =======
[20:21:24] =========== drm_test_fb_xrgb8888_to_argb2101010 ===========
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ======= [PASSED] drm_test_fb_xrgb8888_to_argb2101010 =======
[20:21:24] ============== drm_test_fb_xrgb8888_to_mono ===============
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ========== [PASSED] drm_test_fb_xrgb8888_to_mono ===========
[20:21:24] ==================== drm_test_fb_swab =====================
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ================ [PASSED] drm_test_fb_swab =================
[20:21:24] ============ drm_test_fb_xrgb8888_to_xbgr8888 =============
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ======== [PASSED] drm_test_fb_xrgb8888_to_xbgr8888 =========
[20:21:24] ============ drm_test_fb_xrgb8888_to_abgr8888 =============
[20:21:24] [PASSED] single_pixel_source_buffer
[20:21:24] [PASSED] single_pixel_clip_rectangle
[20:21:24] [PASSED] well_known_colors
[20:21:24] [PASSED] destination_pitch
[20:21:24] ======== [PASSED] drm_test_fb_xrgb8888_to_abgr8888 =========
[20:21:24] ================= drm_test_fb_clip_offset =================
[20:21:24] [PASSED] pass through
[20:21:24] [PASSED] horizontal offset
[20:21:24] [PASSED] vertical offset
[20:21:24] [PASSED] horizontal and vertical offset
[20:21:24] [PASSED] horizontal offset (custom pitch)
[20:21:24] [PASSED] vertical offset (custom pitch)
[20:21:24] [PASSED] horizontal and vertical offset (custom pitch)
[20:21:24] ============= [PASSED] drm_test_fb_clip_offset =============
[20:21:24] ============== drm_test_fb_build_fourcc_list ==============
[20:21:24] [PASSED] no native formats
[20:21:24] [PASSED] XRGB8888 as native format
[20:21:24] [PASSED] remove duplicates
[20:21:24] [PASSED] convert alpha formats
[20:21:24] [PASSED] random formats
[20:21:24] ========== [PASSED] drm_test_fb_build_fourcc_list ==========
[20:21:24] =================== drm_test_fb_memcpy ====================
[20:21:24] [PASSED] single_pixel_source_buffer: XR24 little-endian (0x34325258)
[20:21:24] [PASSED] single_pixel_source_buffer: XRA8 little-endian (0x38415258)
[20:21:24] [PASSED] single_pixel_source_buffer: YU24 little-endian (0x34325559)
[20:21:24] [PASSED] single_pixel_clip_rectangle: XB24 little-endian (0x34324258)
[20:21:24] [PASSED] single_pixel_clip_rectangle: XRA8 little-endian (0x38415258)
[20:21:24] [PASSED] single_pixel_clip_rectangle: YU24 little-endian (0x34325559)
[20:21:24] [PASSED] well_known_colors: XB24 little-endian (0x34324258)
[20:21:24] [PASSED] well_known_colors: XRA8 little-endian (0x38415258)
[20:21:24] [PASSED] well_known_colors: YU24 little-endian (0x34325559)
[20:21:24] [PASSED] destination_pitch: XB24 little-endian (0x34324258)
[20:21:24] [PASSED] destination_pitch: XRA8 little-endian (0x38415258)
[20:21:24] [PASSED] destination_pitch: YU24 little-endian (0x34325559)
[20:21:24] =============== [PASSED] drm_test_fb_memcpy ================
[20:21:24] ============= [PASSED] drm_format_helper_test ==============
[20:21:24] ================= drm_format (18 subtests) =================
[20:21:24] [PASSED] drm_test_format_block_width_invalid
[20:21:24] [PASSED] drm_test_format_block_width_one_plane
[20:21:24] [PASSED] drm_test_format_block_width_two_plane
[20:21:24] [PASSED] drm_test_format_block_width_three_plane
[20:21:24] [PASSED] drm_test_format_block_width_tiled
[20:21:24] [PASSED] drm_test_format_block_height_invalid
[20:21:24] [PASSED] drm_test_format_block_height_one_plane
[20:21:24] [PASSED] drm_test_format_block_height_two_plane
[20:21:24] [PASSED] drm_test_format_block_height_three_plane
[20:21:24] [PASSED] drm_test_format_block_height_tiled
[20:21:24] [PASSED] drm_test_format_min_pitch_invalid
[20:21:24] [PASSED] drm_test_format_min_pitch_one_plane_8bpp
[20:21:24] [PASSED] drm_test_format_min_pitch_one_plane_16bpp
[20:21:24] [PASSED] drm_test_format_min_pitch_one_plane_24bpp
[20:21:24] [PASSED] drm_test_format_min_pitch_one_plane_32bpp
[20:21:24] [PASSED] drm_test_format_min_pitch_two_plane
[20:21:24] [PASSED] drm_test_format_min_pitch_three_plane_8bpp
[20:21:24] [PASSED] drm_test_format_min_pitch_tiled
[20:21:24] =================== [PASSED] drm_format ====================
[20:21:24] ============== drm_framebuffer (10 subtests) ===============
[20:21:24] ========== drm_test_framebuffer_check_src_coords ==========
[20:21:24] [PASSED] Success: source fits into fb
[20:21:24] [PASSED] Fail: overflowing fb with x-axis coordinate
[20:21:24] [PASSED] Fail: overflowing fb with y-axis coordinate
[20:21:24] [PASSED] Fail: overflowing fb with source width
[20:21:24] [PASSED] Fail: overflowing fb with source height
[20:21:24] ====== [PASSED] drm_test_framebuffer_check_src_coords ======
[20:21:24] [PASSED] drm_test_framebuffer_cleanup
[20:21:24] =============== drm_test_framebuffer_create ===============
[20:21:24] [PASSED] ABGR8888 normal sizes
[20:21:24] [PASSED] ABGR8888 max sizes
[20:21:24] [PASSED] ABGR8888 pitch greater than min required
[20:21:24] [PASSED] ABGR8888 pitch less than min required
[20:21:24] [PASSED] ABGR8888 Invalid width
[20:21:24] [PASSED] ABGR8888 Invalid buffer handle
[20:21:24] [PASSED] No pixel format
[20:21:24] [PASSED] ABGR8888 Width 0
[20:21:24] [PASSED] ABGR8888 Height 0
[20:21:24] [PASSED] ABGR8888 Out of bound height * pitch combination
[20:21:24] [PASSED] ABGR8888 Large buffer offset
[20:21:24] [PASSED] ABGR8888 Buffer offset for inexistent plane
[20:21:24] [PASSED] ABGR8888 Invalid flag
[20:21:24] [PASSED] ABGR8888 Set DRM_MODE_FB_MODIFIERS without modifiers
[20:21:24] [PASSED] ABGR8888 Valid buffer modifier
[20:21:24] [PASSED] ABGR8888 Invalid buffer modifier(DRM_FORMAT_MOD_SAMSUNG_64_32_TILE)
[20:21:24] [PASSED] ABGR8888 Extra pitches without DRM_MODE_FB_MODIFIERS
[20:21:24] [PASSED] ABGR8888 Extra pitches with DRM_MODE_FB_MODIFIERS
[20:21:24] [PASSED] NV12 Normal sizes
[20:21:24] [PASSED] NV12 Max sizes
[20:21:24] [PASSED] NV12 Invalid pitch
[20:21:24] [PASSED] NV12 Invalid modifier/missing DRM_MODE_FB_MODIFIERS flag
[20:21:24] [PASSED] NV12 different modifier per-plane
[20:21:24] [PASSED] NV12 with DRM_FORMAT_MOD_SAMSUNG_64_32_TILE
[20:21:24] [PASSED] NV12 Valid modifiers without DRM_MODE_FB_MODIFIERS
[20:21:24] [PASSED] NV12 Modifier for inexistent plane
[20:21:24] [PASSED] NV12 Handle for inexistent plane
[20:21:24] [PASSED] NV12 Handle for inexistent plane without DRM_MODE_FB_MODIFIERS
[20:21:24] [PASSED] YVU420 DRM_MODE_FB_MODIFIERS set without modifier
[20:21:24] [PASSED] YVU420 Normal sizes
[20:21:24] [PASSED] YVU420 Max sizes
[20:21:24] [PASSED] YVU420 Invalid pitch
[20:21:24] [PASSED] YVU420 Different pitches
[20:21:24] [PASSED] YVU420 Different buffer offsets/pitches
[20:21:24] [PASSED] YVU420 Modifier set just for plane 0, without DRM_MODE_FB_MODIFIERS
[20:21:24] [PASSED] YVU420 Modifier set just for planes 0, 1, without DRM_MODE_FB_MODIFIERS
[20:21:24] [PASSED] YVU420 Modifier set just for plane 0, 1, with DRM_MODE_FB_MODIFIERS
[20:21:24] [PASSED] YVU420 Valid modifier
[20:21:24] [PASSED] YVU420 Different modifiers per plane
[20:21:24] [PASSED] YVU420 Modifier for inexistent plane
[20:21:24] [PASSED] YUV420_10BIT Invalid modifier(DRM_FORMAT_MOD_LINEAR)
[20:21:24] [PASSED] X0L2 Normal sizes
[20:21:24] [PASSED] X0L2 Max sizes
[20:21:24] [PASSED] X0L2 Invalid pitch
[20:21:24] [PASSED] X0L2 Pitch greater than minimum required
[20:21:24] [PASSED] X0L2 Handle for inexistent plane
[20:21:24] [PASSED] X0L2 Offset for inexistent plane, without DRM_MODE_FB_MODIFIERS set
[20:21:24] [PASSED] X0L2 Modifier without DRM_MODE_FB_MODIFIERS set
[20:21:24] [PASSED] X0L2 Valid modifier
[20:21:24] [PASSED] X0L2 Modifier for inexistent plane
[20:21:24] =========== [PASSED] drm_test_framebuffer_create ===========
[20:21:24] [PASSED] drm_test_framebuffer_free
[20:21:24] [PASSED] drm_test_framebuffer_init
[20:21:24] [PASSED] drm_test_framebuffer_init_bad_format
[20:21:24] [PASSED] drm_test_framebuffer_init_dev_mismatch
[20:21:24] [PASSED] drm_test_framebuffer_lookup
[20:21:24] [PASSED] drm_test_framebuffer_lookup_inexistent
[20:21:24] [PASSED] drm_test_framebuffer_modifiers_not_supported
[20:21:24] ================= [PASSED] drm_framebuffer =================
[20:21:24] ================ drm_gem_shmem (8 subtests) ================
[20:21:24] [PASSED] drm_gem_shmem_test_obj_create
[20:21:24] [PASSED] drm_gem_shmem_test_obj_create_private
[20:21:24] [PASSED] drm_gem_shmem_test_pin_pages
[20:21:24] [PASSED] drm_gem_shmem_test_vmap
[20:21:24] [PASSED] drm_gem_shmem_test_get_pages_sgt
[20:21:24] [PASSED] drm_gem_shmem_test_get_sg_table
[20:21:24] [PASSED] drm_gem_shmem_test_madvise
[20:21:24] [PASSED] drm_gem_shmem_test_purge
[20:21:24] ================== [PASSED] drm_gem_shmem ==================
[20:21:24] === drm_atomic_helper_connector_hdmi_check (23 subtests) ===
[20:21:24] [PASSED] drm_test_check_broadcast_rgb_auto_cea_mode
[20:21:24] [PASSED] drm_test_check_broadcast_rgb_auto_cea_mode_vic_1
[20:21:24] [PASSED] drm_test_check_broadcast_rgb_full_cea_mode
[20:21:24] [PASSED] drm_test_check_broadcast_rgb_full_cea_mode_vic_1
[20:21:24] [PASSED] drm_test_check_broadcast_rgb_limited_cea_mode
[20:21:24] [PASSED] drm_test_check_broadcast_rgb_limited_cea_mode_vic_1
[20:21:24] [PASSED] drm_test_check_broadcast_rgb_crtc_mode_changed
[20:21:24] [PASSED] drm_test_check_broadcast_rgb_crtc_mode_not_changed
[20:21:24] [PASSED] drm_test_check_disable_connector
[20:21:24] [PASSED] drm_test_check_hdmi_funcs_reject_rate
[20:21:24] [PASSED] drm_test_check_max_tmds_rate_bpc_fallback
[20:21:24] [PASSED] drm_test_check_max_tmds_rate_format_fallback
[20:21:24] [PASSED] drm_test_check_output_bpc_crtc_mode_changed
[20:21:24] [PASSED] drm_test_check_output_bpc_crtc_mode_not_changed
[20:21:24] [PASSED] drm_test_check_output_bpc_dvi
[20:21:24] [PASSED] drm_test_check_output_bpc_format_vic_1
[20:21:24] [PASSED] drm_test_check_output_bpc_format_display_8bpc_only
[20:21:24] [PASSED] drm_test_check_output_bpc_format_display_rgb_only
[20:21:24] [PASSED] drm_test_check_output_bpc_format_driver_8bpc_only
[20:21:24] [PASSED] drm_test_check_output_bpc_format_driver_rgb_only
[20:21:24] [PASSED] drm_test_check_tmds_char_rate_rgb_8bpc
[20:21:24] [PASSED] drm_test_check_tmds_char_rate_rgb_10bpc
[20:21:24] [PASSED] drm_test_check_tmds_char_rate_rgb_12bpc
[20:21:24] ===== [PASSED] drm_atomic_helper_connector_hdmi_check ======
[20:21:24] === drm_atomic_helper_connector_hdmi_reset (6 subtests) ====
[20:21:24] [PASSED] drm_test_check_broadcast_rgb_value
[20:21:24] [PASSED] drm_test_check_bpc_8_value
[20:21:24] [PASSED] drm_test_check_bpc_10_value
[20:21:24] [PASSED] drm_test_check_bpc_12_value
[20:21:24] [PASSED] drm_test_check_format_value
[20:21:24] [PASSED] drm_test_check_tmds_char_value
[20:21:24] ===== [PASSED] drm_atomic_helper_connector_hdmi_reset ======
[20:21:24] = drm_atomic_helper_connector_hdmi_mode_valid (4 subtests) =
[20:21:24] [PASSED] drm_test_check_mode_valid
[20:21:24] [PASSED] drm_test_check_mode_valid_reject
[20:21:24] [PASSED] drm_test_check_mode_valid_reject_rate
[20:21:24] [PASSED] drm_test_check_mode_valid_reject_max_clock
[20:21:24] === [PASSED] drm_atomic_helper_connector_hdmi_mode_valid ===
[20:21:24] ================= drm_managed (2 subtests) =================
[20:21:24] [PASSED] drm_test_managed_release_action
[20:21:24] [PASSED] drm_test_managed_run_action
[20:21:24] =================== [PASSED] drm_managed ===================
[20:21:24] =================== drm_mm (6 subtests) ====================
[20:21:24] [PASSED] drm_test_mm_init
[20:21:24] [PASSED] drm_test_mm_debug
[20:21:24] [PASSED] drm_test_mm_align32
[20:21:24] [PASSED] drm_test_mm_align64
[20:21:24] [PASSED] drm_test_mm_lowest
[20:21:24] [PASSED] drm_test_mm_highest
[20:21:24] ===================== [PASSED] drm_mm ======================
[20:21:24] ============= drm_modes_analog_tv (5 subtests) =============
[20:21:24] [PASSED] drm_test_modes_analog_tv_mono_576i
[20:21:24] [PASSED] drm_test_modes_analog_tv_ntsc_480i
[20:21:24] [PASSED] drm_test_modes_analog_tv_ntsc_480i_inlined
[20:21:24] [PASSED] drm_test_modes_analog_tv_pal_576i
[20:21:24] [PASSED] drm_test_modes_analog_tv_pal_576i_inlined
[20:21:24] =============== [PASSED] drm_modes_analog_tv ===============
[20:21:24] ============== drm_plane_helper (2 subtests) ===============
[20:21:24] =============== drm_test_check_plane_state ================
[20:21:24] [PASSED] clipping_simple
[20:21:24] [PASSED] clipping_rotate_reflect
[20:21:24] [PASSED] positioning_simple
[20:21:24] [PASSED] upscaling
[20:21:24] [PASSED] downscaling
[20:21:24] [PASSED] rounding1
[20:21:24] [PASSED] rounding2
[20:21:24] [PASSED] rounding3
[20:21:24] [PASSED] rounding4
[20:21:24] =========== [PASSED] drm_test_check_plane_state ============
[20:21:24] =========== drm_test_check_invalid_plane_state ============
[20:21:24] [PASSED] positioning_invalid
[20:21:24] [PASSED] upscaling_invalid
[20:21:24] [PASSED] downscaling_invalid
[20:21:24] ======= [PASSED] drm_test_check_invalid_plane_state ========
[20:21:24] ================ [PASSED] drm_plane_helper =================
[20:21:24] ====== drm_connector_helper_tv_get_modes (1 subtest) =======
[20:21:24] ====== drm_test_connector_helper_tv_get_modes_check =======
[20:21:24] [PASSED] None
[20:21:24] [PASSED] PAL
[20:21:24] [PASSED] NTSC
[20:21:24] [PASSED] Both, NTSC Default
[20:21:24] [PASSED] Both, PAL Default
[20:21:24] [PASSED] Both, NTSC Default, with PAL on command-line
[20:21:24] [PASSED] Both, PAL Default, with NTSC on command-line
[20:21:24] == [PASSED] drm_test_connector_helper_tv_get_modes_check ===
[20:21:24] ======== [PASSED] drm_connector_helper_tv_get_modes ========
[20:21:24] ================== drm_rect (9 subtests) ===================
[20:21:24] [PASSED] drm_test_rect_clip_scaled_div_by_zero
[20:21:24] [PASSED] drm_test_rect_clip_scaled_not_clipped
[20:21:24] [PASSED] drm_test_rect_clip_scaled_clipped
[20:21:24] [PASSED] drm_test_rect_clip_scaled_signed_vs_unsigned
[20:21:24] ================= drm_test_rect_intersect =================
[20:21:24] [PASSED] top-left x bottom-right: 2x2+1+1 x 2x2+0+0
[20:21:24] [PASSED] top-right x bottom-left: 2x2+0+0 x 2x2+1-1
[20:21:24] [PASSED] bottom-left x top-right: 2x2+1-1 x 2x2+0+0
[20:21:24] [PASSED] bottom-right x top-left: 2x2+0+0 x 2x2+1+1
[20:21:24] [PASSED] right x left: 2x1+0+0 x 3x1+1+0
[20:21:24] [PASSED] left x right: 3x1+1+0 x 2x1+0+0
[20:21:24] [PASSED] up x bottom: 1x2+0+0 x 1x3+0-1
[20:21:24] [PASSED] bottom x up: 1x3+0-1 x 1x2+0+0
[20:21:24] [PASSED] touching corner: 1x1+0+0 x 2x2+1+1
[20:21:24] [PASSED] touching side: 1x1+0+0 x 1x1+1+0
[20:21:24] [PASSED] equal rects: 2x2+0+0 x 2x2+0+0
[20:21:24] [PASSED] inside another: 2x2+0+0 x 1x1+1+1
[20:21:24] [PASSED] far away: 1x1+0+0 x 1x1+3+6
[20:21:24] [PASSED] points intersecting: 0x0+5+10 x 0x0+5+10
[20:21:24] [PASSED] points not intersecting: 0x0+0+0 x 0x0+5+10
[20:21:24] ============= [PASSED] drm_test_rect_intersect =============
[20:21:24] ================ drm_test_rect_calc_hscale ================
[20:21:24] [PASSED] normal use
[20:21:24] [PASSED] out of max range
[20:21:24] [PASSED] out of min range
[20:21:24] [PASSED] zero dst
[20:21:24] [PASSED] negative src
[20:21:24] [PASSED] negative dst
[20:21:24] ============ [PASSED] drm_test_rect_calc_hscale ============
[20:21:24] ================ drm_test_rect_calc_vscale ================
[20:21:24] [PASSED] normal use
[20:21:24] [PASSED] out of max range
[20:21:24] [PASSED] out of min range
[20:21:24] [PASSED] zero dst
[20:21:24] [PASSED] negative src
[20:21:24] [PASSED] negative dst
stty: 'standard input': Inappropriate ioctl for device
[20:21:24] ============ [PASSED] drm_test_rect_calc_vscale ============
[20:21:24] ================== drm_test_rect_rotate ===================
[20:21:24] [PASSED] reflect-x
[20:21:24] [PASSED] reflect-y
[20:21:24] [PASSED] rotate-0
[20:21:24] [PASSED] rotate-90
[20:21:24] [PASSED] rotate-180
[20:21:24] [PASSED] rotate-270
[20:21:24] ============== [PASSED] drm_test_rect_rotate ===============
[20:21:24] ================ drm_test_rect_rotate_inv =================
[20:21:24] [PASSED] reflect-x
[20:21:24] [PASSED] reflect-y
[20:21:24] [PASSED] rotate-0
[20:21:24] [PASSED] rotate-90
[20:21:24] [PASSED] rotate-180
[20:21:24] [PASSED] rotate-270
[20:21:24] ============ [PASSED] drm_test_rect_rotate_inv =============
[20:21:24] ==================== [PASSED] drm_rect =====================
[20:21:24] ============================================================
[20:21:24] Testing complete. Ran 602 tests: passed: 602
[20:21:24] Elapsed time: 23.029s total, 1.666s configuring, 21.194s building, 0.135s running
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/ttm/tests/.kunitconfig
[20:21:24] Configuring KUnit Kernel ...
Regenerating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[20:21:25] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make all compile_commands.json ARCH=um O=.kunit --jobs=48
[20:21:33] Starting KUnit Kernel (1/1)...
[20:21:33] ============================================================
Running tests with:
$ .kunit/linux kunit.enable=1 mem=1G console=tty kunit_shutdown=halt
[20:21:33] ================= ttm_device (5 subtests) ==================
[20:21:33] [PASSED] ttm_device_init_basic
[20:21:33] [PASSED] ttm_device_init_multiple
[20:21:33] [PASSED] ttm_device_fini_basic
[20:21:33] [PASSED] ttm_device_init_no_vma_man
[20:21:33] ================== ttm_device_init_pools ==================
[20:21:33] [PASSED] No DMA allocations, no DMA32 required
[20:21:33] [PASSED] DMA allocations, DMA32 required
[20:21:33] [PASSED] No DMA allocations, DMA32 required
[20:21:33] [PASSED] DMA allocations, no DMA32 required
[20:21:33] ============== [PASSED] ttm_device_init_pools ==============
[20:21:33] =================== [PASSED] ttm_device ====================
[20:21:33] ================== ttm_pool (8 subtests) ===================
[20:21:33] ================== ttm_pool_alloc_basic ===================
[20:21:33] [PASSED] One page
[20:21:33] [PASSED] More than one page
[20:21:33] [PASSED] Above the allocation limit
[20:21:33] [PASSED] One page, with coherent DMA mappings enabled
[20:21:33] [PASSED] Above the allocation limit, with coherent DMA mappings enabled
[20:21:33] ============== [PASSED] ttm_pool_alloc_basic ===============
[20:21:33] ============== ttm_pool_alloc_basic_dma_addr ==============
[20:21:33] [PASSED] One page
[20:21:33] [PASSED] More than one page
[20:21:33] [PASSED] Above the allocation limit
[20:21:33] [PASSED] One page, with coherent DMA mappings enabled
[20:21:33] [PASSED] Above the allocation limit, with coherent DMA mappings enabled
[20:21:33] ========== [PASSED] ttm_pool_alloc_basic_dma_addr ==========
[20:21:33] [PASSED] ttm_pool_alloc_order_caching_match
[20:21:33] [PASSED] ttm_pool_alloc_caching_mismatch
[20:21:33] [PASSED] ttm_pool_alloc_order_mismatch
[20:21:33] [PASSED] ttm_pool_free_dma_alloc
[20:21:33] [PASSED] ttm_pool_free_no_dma_alloc
[20:21:33] [PASSED] ttm_pool_fini_basic
[20:21:33] ==================== [PASSED] ttm_pool =====================
[20:21:33] ================ ttm_resource (8 subtests) =================
[20:21:33] ================= ttm_resource_init_basic =================
[20:21:33] [PASSED] Init resource in TTM_PL_SYSTEM
[20:21:33] [PASSED] Init resource in TTM_PL_VRAM
[20:21:33] [PASSED] Init resource in a private placement
[20:21:33] [PASSED] Init resource in TTM_PL_SYSTEM, set placement flags
[20:21:33] ============= [PASSED] ttm_resource_init_basic =============
[20:21:33] [PASSED] ttm_resource_init_pinned
[20:21:33] [PASSED] ttm_resource_fini_basic
[20:21:33] [PASSED] ttm_resource_manager_init_basic
[20:21:33] [PASSED] ttm_resource_manager_usage_basic
[20:21:33] [PASSED] ttm_resource_manager_set_used_basic
[20:21:33] [PASSED] ttm_sys_man_alloc_basic
[20:21:33] [PASSED] ttm_sys_man_free_basic
[20:21:33] ================== [PASSED] ttm_resource ===================
[20:21:33] =================== ttm_tt (15 subtests) ===================
[20:21:33] ==================== ttm_tt_init_basic ====================
[20:21:33] [PASSED] Page-aligned size
[20:21:33] [PASSED] Extra pages requested
[20:21:33] ================ [PASSED] ttm_tt_init_basic ================
[20:21:33] [PASSED] ttm_tt_init_misaligned
[20:21:33] [PASSED] ttm_tt_fini_basic
[20:21:33] [PASSED] ttm_tt_fini_sg
[20:21:33] [PASSED] ttm_tt_fini_shmem
[20:21:33] [PASSED] ttm_tt_create_basic
[20:21:33] [PASSED] ttm_tt_create_invalid_bo_type
[20:21:33] [PASSED] ttm_tt_create_ttm_exists
[20:21:33] [PASSED] ttm_tt_create_failed
[20:21:33] [PASSED] ttm_tt_destroy_basic
[20:21:33] [PASSED] ttm_tt_populate_null_ttm
[20:21:33] [PASSED] ttm_tt_populate_populated_ttm
[20:21:33] [PASSED] ttm_tt_unpopulate_basic
[20:21:33] [PASSED] ttm_tt_unpopulate_empty_ttm
[20:21:33] [PASSED] ttm_tt_swapin_basic
[20:21:33] ===================== [PASSED] ttm_tt ======================
[20:21:33] =================== ttm_bo (14 subtests) ===================
[20:21:33] =========== ttm_bo_reserve_optimistic_no_ticket ===========
[20:21:33] [PASSED] Cannot be interrupted and sleeps
[20:21:33] [PASSED] Cannot be interrupted, locks straight away
[20:21:33] [PASSED] Can be interrupted, sleeps
[20:21:33] ======= [PASSED] ttm_bo_reserve_optimistic_no_ticket =======
[20:21:33] [PASSED] ttm_bo_reserve_locked_no_sleep
[20:21:33] [PASSED] ttm_bo_reserve_no_wait_ticket
[20:21:33] [PASSED] ttm_bo_reserve_double_resv
[20:21:33] [PASSED] ttm_bo_reserve_interrupted
[20:21:33] [PASSED] ttm_bo_reserve_deadlock
[20:21:33] [PASSED] ttm_bo_unreserve_basic
[20:21:33] [PASSED] ttm_bo_unreserve_pinned
[20:21:33] [PASSED] ttm_bo_unreserve_bulk
[20:21:33] [PASSED] ttm_bo_put_basic
[20:21:33] [PASSED] ttm_bo_put_shared_resv
[20:21:33] [PASSED] ttm_bo_pin_basic
[20:21:33] [PASSED] ttm_bo_pin_unpin_resource
[20:21:33] [PASSED] ttm_bo_multiple_pin_one_unpin
[20:21:33] ===================== [PASSED] ttm_bo ======================
[20:21:33] ============== ttm_bo_validate (22 subtests) ===============
[20:21:33] ============== ttm_bo_init_reserved_sys_man ===============
[20:21:33] [PASSED] Buffer object for userspace
[20:21:33] [PASSED] Kernel buffer object
[20:21:33] [PASSED] Shared buffer object
[20:21:33] ========== [PASSED] ttm_bo_init_reserved_sys_man ===========
[20:21:33] ============== ttm_bo_init_reserved_mock_man ==============
[20:21:33] [PASSED] Buffer object for userspace
[20:21:33] [PASSED] Kernel buffer object
[20:21:33] [PASSED] Shared buffer object
[20:21:33] ========== [PASSED] ttm_bo_init_reserved_mock_man ==========
[20:21:33] [PASSED] ttm_bo_init_reserved_resv
[20:21:33] ================== ttm_bo_validate_basic ==================
[20:21:33] [PASSED] Buffer object for userspace
[20:21:33] [PASSED] Kernel buffer object
[20:21:33] [PASSED] Shared buffer object
[20:21:33] ============== [PASSED] ttm_bo_validate_basic ==============
[20:21:33] [PASSED] ttm_bo_validate_invalid_placement
[20:21:33] ============= ttm_bo_validate_same_placement ==============
[20:21:33] [PASSED] System manager
[20:21:33] [PASSED] VRAM manager
[20:21:33] ========= [PASSED] ttm_bo_validate_same_placement ==========
[20:21:33] [PASSED] ttm_bo_validate_failed_alloc
[20:21:33] [PASSED] ttm_bo_validate_pinned
[20:21:33] [PASSED] ttm_bo_validate_busy_placement
[20:21:33] ================ ttm_bo_validate_multihop =================
[20:21:33] [PASSED] Buffer object for userspace
[20:21:33] [PASSED] Kernel buffer object
[20:21:33] [PASSED] Shared buffer object
[20:21:33] ============ [PASSED] ttm_bo_validate_multihop =============
[20:21:33] ========== ttm_bo_validate_no_placement_signaled ==========
[20:21:33] [PASSED] Buffer object in system domain, no page vector
[20:21:33] [PASSED] Buffer object in system domain with an existing page vector
[20:21:33] ====== [PASSED] ttm_bo_validate_no_placement_signaled ======
[20:21:33] ======== ttm_bo_validate_no_placement_not_signaled ========
[20:21:33] [PASSED] Buffer object for userspace
[20:21:33] [PASSED] Kernel buffer object
[20:21:33] [PASSED] Shared buffer object
[20:21:33] ==== [PASSED] ttm_bo_validate_no_placement_not_signaled ====
[20:21:33] [PASSED] ttm_bo_validate_move_fence_signaled
[20:21:33] ========= ttm_bo_validate_move_fence_not_signaled =========
[20:21:33] [PASSED] Waits for GPU
[20:21:33] [PASSED] Tries to lock straight away
[20:21:34] ===== [PASSED] ttm_bo_validate_move_fence_not_signaled =====
[20:21:34] [PASSED] ttm_bo_validate_swapout
[20:21:34] [PASSED] ttm_bo_validate_happy_evict
[20:21:34] [PASSED] ttm_bo_validate_all_pinned_evict
[20:21:34] [PASSED] ttm_bo_validate_allowed_only_evict
[20:21:34] [PASSED] ttm_bo_validate_deleted_evict
[20:21:34] [PASSED] ttm_bo_validate_busy_domain_evict
[20:21:34] [PASSED] ttm_bo_validate_evict_gutting
[20:21:34] [PASSED] ttm_bo_validate_recrusive_evict
stty: 'standard input': Inappropriate ioctl for device
[20:21:34] ================= [PASSED] ttm_bo_validate =================
[20:21:34] ============================================================
[20:21:34] Testing complete. Ran 102 tests: passed: 102
[20:21:34] Elapsed time: 9.940s total, 1.676s configuring, 7.597s building, 0.578s running
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel
^ permalink raw reply [flat|nested] 31+ messages in thread* ✓ CI.Build: success for drm/i915/display: conversions to struct intel_display (rev2)
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (12 preceding siblings ...)
2025-03-11 20:21 ` ✓ CI.KUnit: success " Patchwork
@ 2025-03-11 20:38 ` Patchwork
2025-03-11 20:40 ` ✓ CI.Hooks: " Patchwork
` (3 subsequent siblings)
17 siblings, 0 replies; 31+ messages in thread
From: Patchwork @ 2025-03-11 20:38 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-xe
== Series Details ==
Series: drm/i915/display: conversions to struct intel_display (rev2)
URL : https://patchwork.freedesktop.org/series/144749/
State : success
== Summary ==
lib/modules/6.14.0-rc6-xe+/kernel/arch/x86/events/amd/
lib/modules/6.14.0-rc6-xe+/kernel/arch/x86/events/amd/amd-uncore.ko
lib/modules/6.14.0-rc6-xe+/kernel/arch/x86/events/rapl.ko
lib/modules/6.14.0-rc6-xe+/kernel/arch/x86/kvm/
lib/modules/6.14.0-rc6-xe+/kernel/arch/x86/kvm/kvm.ko
lib/modules/6.14.0-rc6-xe+/kernel/arch/x86/kvm/kvm-intel.ko
lib/modules/6.14.0-rc6-xe+/kernel/arch/x86/kvm/kvm-amd.ko
lib/modules/6.14.0-rc6-xe+/kernel/kernel/
lib/modules/6.14.0-rc6-xe+/kernel/kernel/kheaders.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/
lib/modules/6.14.0-rc6-xe+/kernel/crypto/ecrdsa_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/xcbc.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/serpent_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/aria_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/crypto_simd.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/adiantum.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/tcrypt.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/crypto_engine.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/zstd.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/asymmetric_keys/
lib/modules/6.14.0-rc6-xe+/kernel/crypto/asymmetric_keys/pkcs7_test_key.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/asymmetric_keys/pkcs8_key_parser.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/des_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/xctr.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/authenc.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/sm4_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/camellia_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/sm3.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/pcrypt.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/aegis128.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/af_alg.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/algif_aead.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/cmac.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/sm3_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/aes_ti.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/chacha_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/poly1305_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/nhpoly1305.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/crc32_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/essiv.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/ccm.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/wp512.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/streebog_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/authencesn.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/echainiv.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/lrw.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/cryptd.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/crypto_user.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/algif_hash.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/polyval-generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/hctr2.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/842.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/pcbc.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/ansi_cprng.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/cast6_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/twofish_common.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/twofish_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/lz4hc.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/blowfish_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/md4.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/chacha20poly1305.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/curve25519-generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/lz4.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/rmd160.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/algif_skcipher.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/cast5_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/fcrypt.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/ecdsa_generic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/sm4.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/cast_common.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/blowfish_common.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/michael_mic.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/async_tx/
lib/modules/6.14.0-rc6-xe+/kernel/crypto/async_tx/async_xor.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/async_tx/async_tx.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/async_tx/async_memcpy.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/async_tx/async_pq.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/async_tx/async_raid6_recov.ko
lib/modules/6.14.0-rc6-xe+/kernel/crypto/algif_rng.ko
lib/modules/6.14.0-rc6-xe+/kernel/block/
lib/modules/6.14.0-rc6-xe+/kernel/block/bfq.ko
lib/modules/6.14.0-rc6-xe+/kernel/block/kyber-iosched.ko
lib/modules/6.14.0-rc6-xe+/build
lib/modules/6.14.0-rc6-xe+/modules.alias.bin
lib/modules/6.14.0-rc6-xe+/modules.builtin
lib/modules/6.14.0-rc6-xe+/modules.softdep
lib/modules/6.14.0-rc6-xe+/modules.alias
lib/modules/6.14.0-rc6-xe+/modules.order
lib/modules/6.14.0-rc6-xe+/modules.symbols
lib/modules/6.14.0-rc6-xe+/modules.dep.bin
+ mv kernel-nodebug.tar.gz ..
+ cd ..
+ rm -rf archive
++ date +%s
+ echo -e '\e[0Ksection_end:1741725483:package_x86_64_nodebug\r\e[0K'
+ sync
^[[0Ksection_end:1741725483:package_x86_64_nodebug
^[[0K
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel
^ permalink raw reply [flat|nested] 31+ messages in thread* ✓ CI.Hooks: success for drm/i915/display: conversions to struct intel_display (rev2)
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (13 preceding siblings ...)
2025-03-11 20:38 ` ✓ CI.Build: " Patchwork
@ 2025-03-11 20:40 ` Patchwork
2025-03-11 20:42 ` ✓ CI.checksparse: " Patchwork
` (2 subsequent siblings)
17 siblings, 0 replies; 31+ messages in thread
From: Patchwork @ 2025-03-11 20:40 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-xe
== Series Details ==
Series: drm/i915/display: conversions to struct intel_display (rev2)
URL : https://patchwork.freedesktop.org/series/144749/
State : success
== Summary ==
run-parts: executing /workspace/ci/hooks/00-showenv
+ export
+ grep -Ei '(^|\W)CI_'
declare -x CI_KERNEL_BUILD_DIR="/workspace/kernel/build64-default"
declare -x CI_KERNEL_SRC_DIR="/workspace/kernel"
declare -x CI_TOOLS_SRC_DIR="/workspace/ci"
declare -x CI_WORKSPACE_DIR="/workspace"
run-parts: executing /workspace/ci/hooks/10-build-W1
+ SRC_DIR=/workspace/kernel
+ RESTORE_DISPLAY_CONFIG=0
+ '[' -n /workspace/kernel/build64-default ']'
+ BUILD_DIR=/workspace/kernel/build64-default
+ cd /workspace/kernel
++ nproc
+ make -j48 O=/workspace/kernel/build64-default modules_prepare
make[1]: Entering directory '/workspace/kernel/build64-default'
GEN Makefile
DESCEND objtool
CALL ../scripts/checksyscalls.sh
INSTALL libsubcmd_headers
CC /workspace/kernel/build64-default/tools/objtool/libsubcmd/exec-cmd.o
CC /workspace/kernel/build64-default/tools/objtool/libsubcmd/help.o
CC /workspace/kernel/build64-default/tools/objtool/libsubcmd/pager.o
CC /workspace/kernel/build64-default/tools/objtool/libsubcmd/parse-options.o
CC /workspace/kernel/build64-default/tools/objtool/libsubcmd/run-command.o
CC /workspace/kernel/build64-default/tools/objtool/libsubcmd/sigchain.o
CC /workspace/kernel/build64-default/tools/objtool/libsubcmd/subcmd-config.o
LD /workspace/kernel/build64-default/tools/objtool/libsubcmd/libsubcmd-in.o
AR /workspace/kernel/build64-default/tools/objtool/libsubcmd/libsubcmd.a
CC /workspace/kernel/build64-default/tools/objtool/weak.o
CC /workspace/kernel/build64-default/tools/objtool/special.o
CC /workspace/kernel/build64-default/tools/objtool/check.o
CC /workspace/kernel/build64-default/tools/objtool/builtin-check.o
CC /workspace/kernel/build64-default/tools/objtool/elf.o
CC /workspace/kernel/build64-default/tools/objtool/arch/x86/special.o
CC /workspace/kernel/build64-default/tools/objtool/objtool.o
CC /workspace/kernel/build64-default/tools/objtool/arch/x86/decode.o
CC /workspace/kernel/build64-default/tools/objtool/orc_gen.o
CC /workspace/kernel/build64-default/tools/objtool/orc_dump.o
CC /workspace/kernel/build64-default/tools/objtool/libstring.o
CC /workspace/kernel/build64-default/tools/objtool/arch/x86/orc.o
CC /workspace/kernel/build64-default/tools/objtool/libctype.o
CC /workspace/kernel/build64-default/tools/objtool/str_error_r.o
CC /workspace/kernel/build64-default/tools/objtool/librbtree.o
LD /workspace/kernel/build64-default/tools/objtool/arch/x86/objtool-in.o
LD /workspace/kernel/build64-default/tools/objtool/objtool-in.o
LINK /workspace/kernel/build64-default/tools/objtool/objtool
make[1]: Leaving directory '/workspace/kernel/build64-default'
++ nproc
+ make -j48 O=/workspace/kernel/build64-default W=1 drivers/gpu/drm/xe
make[1]: Entering directory '/workspace/kernel/build64-default'
make[2]: Nothing to be done for 'drivers/gpu/drm/xe'.
make[1]: Leaving directory '/workspace/kernel/build64-default'
run-parts: executing /workspace/ci/hooks/11-build-32b
+++ realpath /workspace/ci/hooks/11-build-32b
++ dirname /workspace/ci/hooks/11-build-32b
+ THIS_SCRIPT_DIR=/workspace/ci/hooks
+ SRC_DIR=/workspace/kernel
+ TOOLS_SRC_DIR=/workspace/ci
+ '[' -n /workspace/kernel/build64-default ']'
+ BUILD_DIR=/workspace/kernel/build64-default
+ BUILD_DIR=/workspace/kernel/build64-default/build32
+ cd /workspace/kernel
+ mkdir -p /workspace/kernel/build64-default/build32
++ nproc
+ make -j48 ARCH=i386 O=/workspace/kernel/build64-default/build32 defconfig
make[1]: Entering directory '/workspace/kernel/build64-default/build32'
GEN Makefile
HOSTCC scripts/basic/fixdep
HOSTCC scripts/kconfig/conf.o
HOSTCC scripts/kconfig/confdata.o
HOSTCC scripts/kconfig/expr.o
LEX scripts/kconfig/lexer.lex.c
YACC scripts/kconfig/parser.tab.[ch]
HOSTCC scripts/kconfig/menu.o
HOSTCC scripts/kconfig/symbol.o
HOSTCC scripts/kconfig/preprocess.o
HOSTCC scripts/kconfig/util.o
HOSTCC scripts/kconfig/lexer.lex.o
HOSTCC scripts/kconfig/parser.tab.o
HOSTLD scripts/kconfig/conf
*** Default configuration is based on 'i386_defconfig'
#
# configuration written to .config
#
make[1]: Leaving directory '/workspace/kernel/build64-default/build32'
+ cd /workspace/kernel/build64-default/build32
+ /workspace/kernel/scripts/kconfig/merge_config.sh .config /workspace/ci/kernel/fragments/10-xe.fragment
Using .config as base
Merging /workspace/ci/kernel/fragments/10-xe.fragment
Value of CONFIG_DRM_XE is redefined by fragment /workspace/ci/kernel/fragments/10-xe.fragment:
Previous value: # CONFIG_DRM_XE is not set
New value: CONFIG_DRM_XE=m
GEN Makefile
WARNING: unmet direct dependencies detected for FB_IOMEM_HELPERS
Depends on [n]: HAS_IOMEM [=y] && FB_CORE [=n]
Selected by [m]:
- DRM_XE_DISPLAY [=y] && HAS_IOMEM [=y] && DRM [=y] && DRM_XE [=m] && DRM_XE [=m]=m [=m] && HAS_IOPORT [=y]
#
# configuration written to .config
#
Value requested for CONFIG_HAVE_UID16 not in final .config
Requested value: CONFIG_HAVE_UID16=y
Actual value:
Value requested for CONFIG_UID16 not in final .config
Requested value: CONFIG_UID16=y
Actual value:
Value requested for CONFIG_X86_32 not in final .config
Requested value: CONFIG_X86_32=y
Actual value:
Value requested for CONFIG_OUTPUT_FORMAT not in final .config
Requested value: CONFIG_OUTPUT_FORMAT="elf32-i386"
Actual value: CONFIG_OUTPUT_FORMAT="elf64-x86-64"
Value requested for CONFIG_ARCH_MMAP_RND_BITS_MIN not in final .config
Requested value: CONFIG_ARCH_MMAP_RND_BITS_MIN=8
Actual value: CONFIG_ARCH_MMAP_RND_BITS_MIN=28
Value requested for CONFIG_ARCH_MMAP_RND_BITS_MAX not in final .config
Requested value: CONFIG_ARCH_MMAP_RND_BITS_MAX=16
Actual value: CONFIG_ARCH_MMAP_RND_BITS_MAX=32
Value requested for CONFIG_PGTABLE_LEVELS not in final .config
Requested value: CONFIG_PGTABLE_LEVELS=2
Actual value: CONFIG_PGTABLE_LEVELS=5
Value requested for CONFIG_X86_BIGSMP not in final .config
Requested value: # CONFIG_X86_BIGSMP is not set
Actual value:
Value requested for CONFIG_X86_INTEL_QUARK not in final .config
Requested value: # CONFIG_X86_INTEL_QUARK is not set
Actual value:
Value requested for CONFIG_X86_RDC321X not in final .config
Requested value: # CONFIG_X86_RDC321X is not set
Actual value:
Value requested for CONFIG_X86_32_NON_STANDARD not in final .config
Requested value: # CONFIG_X86_32_NON_STANDARD is not set
Actual value:
Value requested for CONFIG_X86_32_IRIS not in final .config
Requested value: # CONFIG_X86_32_IRIS is not set
Actual value:
Value requested for CONFIG_M486SX not in final .config
Requested value: # CONFIG_M486SX is not set
Actual value:
Value requested for CONFIG_M486 not in final .config
Requested value: # CONFIG_M486 is not set
Actual value:
Value requested for CONFIG_M586 not in final .config
Requested value: # CONFIG_M586 is not set
Actual value:
Value requested for CONFIG_M586TSC not in final .config
Requested value: # CONFIG_M586TSC is not set
Actual value:
Value requested for CONFIG_M586MMX not in final .config
Requested value: # CONFIG_M586MMX is not set
Actual value:
Value requested for CONFIG_M686 not in final .config
Requested value: CONFIG_M686=y
Actual value:
Value requested for CONFIG_MPENTIUMII not in final .config
Requested value: # CONFIG_MPENTIUMII is not set
Actual value:
Value requested for CONFIG_MPENTIUMIII not in final .config
Requested value: # CONFIG_MPENTIUMIII is not set
Actual value:
Value requested for CONFIG_MPENTIUMM not in final .config
Requested value: # CONFIG_MPENTIUMM is not set
Actual value:
Value requested for CONFIG_MPENTIUM4 not in final .config
Requested value: # CONFIG_MPENTIUM4 is not set
Actual value:
Value requested for CONFIG_MK6 not in final .config
Requested value: # CONFIG_MK6 is not set
Actual value:
Value requested for CONFIG_MK7 not in final .config
Requested value: # CONFIG_MK7 is not set
Actual value:
Value requested for CONFIG_MCRUSOE not in final .config
Requested value: # CONFIG_MCRUSOE is not set
Actual value:
Value requested for CONFIG_MEFFICEON not in final .config
Requested value: # CONFIG_MEFFICEON is not set
Actual value:
Value requested for CONFIG_MWINCHIPC6 not in final .config
Requested value: # CONFIG_MWINCHIPC6 is not set
Actual value:
Value requested for CONFIG_MWINCHIP3D not in final .config
Requested value: # CONFIG_MWINCHIP3D is not set
Actual value:
Value requested for CONFIG_MELAN not in final .config
Requested value: # CONFIG_MELAN is not set
Actual value:
Value requested for CONFIG_MGEODEGX1 not in final .config
Requested value: # CONFIG_MGEODEGX1 is not set
Actual value:
Value requested for CONFIG_MGEODE_LX not in final .config
Requested value: # CONFIG_MGEODE_LX is not set
Actual value:
Value requested for CONFIG_MCYRIXIII not in final .config
Requested value: # CONFIG_MCYRIXIII is not set
Actual value:
Value requested for CONFIG_MVIAC3_2 not in final .config
Requested value: # CONFIG_MVIAC3_2 is not set
Actual value:
Value requested for CONFIG_MVIAC7 not in final .config
Requested value: # CONFIG_MVIAC7 is not set
Actual value:
Value requested for CONFIG_X86_GENERIC not in final .config
Requested value: # CONFIG_X86_GENERIC is not set
Actual value:
Value requested for CONFIG_X86_INTERNODE_CACHE_SHIFT not in final .config
Requested value: CONFIG_X86_INTERNODE_CACHE_SHIFT=5
Actual value: CONFIG_X86_INTERNODE_CACHE_SHIFT=6
Value requested for CONFIG_X86_L1_CACHE_SHIFT not in final .config
Requested value: CONFIG_X86_L1_CACHE_SHIFT=5
Actual value: CONFIG_X86_L1_CACHE_SHIFT=6
Value requested for CONFIG_X86_USE_PPRO_CHECKSUM not in final .config
Requested value: CONFIG_X86_USE_PPRO_CHECKSUM=y
Actual value:
Value requested for CONFIG_X86_MINIMUM_CPU_FAMILY not in final .config
Requested value: CONFIG_X86_MINIMUM_CPU_FAMILY=6
Actual value: CONFIG_X86_MINIMUM_CPU_FAMILY=64
Value requested for CONFIG_CPU_SUP_TRANSMETA_32 not in final .config
Requested value: CONFIG_CPU_SUP_TRANSMETA_32=y
Actual value:
Value requested for CONFIG_CPU_SUP_VORTEX_32 not in final .config
Requested value: CONFIG_CPU_SUP_VORTEX_32=y
Actual value:
Value requested for CONFIG_HPET_TIMER not in final .config
Requested value: # CONFIG_HPET_TIMER is not set
Actual value: CONFIG_HPET_TIMER=y
Value requested for CONFIG_NR_CPUS_RANGE_END not in final .config
Requested value: CONFIG_NR_CPUS_RANGE_END=8
Actual value: CONFIG_NR_CPUS_RANGE_END=512
Value requested for CONFIG_NR_CPUS_DEFAULT not in final .config
Requested value: CONFIG_NR_CPUS_DEFAULT=8
Actual value: CONFIG_NR_CPUS_DEFAULT=64
Value requested for CONFIG_X86_ANCIENT_MCE not in final .config
Requested value: # CONFIG_X86_ANCIENT_MCE is not set
Actual value:
Value requested for CONFIG_X86_LEGACY_VM86 not in final .config
Requested value: # CONFIG_X86_LEGACY_VM86 is not set
Actual value:
Value requested for CONFIG_X86_ESPFIX32 not in final .config
Requested value: CONFIG_X86_ESPFIX32=y
Actual value:
Value requested for CONFIG_TOSHIBA not in final .config
Requested value: # CONFIG_TOSHIBA is not set
Actual value:
Value requested for CONFIG_X86_REBOOTFIXUPS not in final .config
Requested value: # CONFIG_X86_REBOOTFIXUPS is not set
Actual value:
Value requested for CONFIG_MICROCODE_INITRD32 not in final .config
Requested value: CONFIG_MICROCODE_INITRD32=y
Actual value:
Value requested for CONFIG_NOHIGHMEM not in final .config
Requested value: # CONFIG_NOHIGHMEM is not set
Actual value:
Value requested for CONFIG_HIGHMEM4G not in final .config
Requested value: CONFIG_HIGHMEM4G=y
Actual value:
Value requested for CONFIG_HIGHMEM64G not in final .config
Requested value: # CONFIG_HIGHMEM64G is not set
Actual value:
Value requested for CONFIG_VMSPLIT_3G not in final .config
Requested value: CONFIG_VMSPLIT_3G=y
Actual value:
Value requested for CONFIG_VMSPLIT_3G_OPT not in final .config
Requested value: # CONFIG_VMSPLIT_3G_OPT is not set
Actual value:
Value requested for CONFIG_VMSPLIT_2G not in final .config
Requested value: # CONFIG_VMSPLIT_2G is not set
Actual value:
Value requested for CONFIG_VMSPLIT_2G_OPT not in final .config
Requested value: # CONFIG_VMSPLIT_2G_OPT is not set
Actual value:
Value requested for CONFIG_VMSPLIT_1G not in final .config
Requested value: # CONFIG_VMSPLIT_1G is not set
Actual value:
Value requested for CONFIG_PAGE_OFFSET not in final .config
Requested value: CONFIG_PAGE_OFFSET=0xC0000000
Actual value:
Value requested for CONFIG_HIGHMEM not in final .config
Requested value: CONFIG_HIGHMEM=y
Actual value:
Value requested for CONFIG_X86_PAE not in final .config
Requested value: # CONFIG_X86_PAE is not set
Actual value:
Value requested for CONFIG_ARCH_FLATMEM_ENABLE not in final .config
Requested value: CONFIG_ARCH_FLATMEM_ENABLE=y
Actual value:
Value requested for CONFIG_ARCH_SELECT_MEMORY_MODEL not in final .config
Requested value: CONFIG_ARCH_SELECT_MEMORY_MODEL=y
Actual value:
Value requested for CONFIG_ILLEGAL_POINTER_VALUE not in final .config
Requested value: CONFIG_ILLEGAL_POINTER_VALUE=0
Actual value: CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
Value requested for CONFIG_HIGHPTE not in final .config
Requested value: # CONFIG_HIGHPTE is not set
Actual value:
Value requested for CONFIG_COMPAT_VDSO not in final .config
Requested value: # CONFIG_COMPAT_VDSO is not set
Actual value:
Value requested for CONFIG_FUNCTION_PADDING_CFI not in final .config
Requested value: CONFIG_FUNCTION_PADDING_CFI=0
Actual value: CONFIG_FUNCTION_PADDING_CFI=11
Value requested for CONFIG_FUNCTION_PADDING_BYTES not in final .config
Requested value: CONFIG_FUNCTION_PADDING_BYTES=4
Actual value: CONFIG_FUNCTION_PADDING_BYTES=16
Value requested for CONFIG_APM not in final .config
Requested value: # CONFIG_APM is not set
Actual value:
Value requested for CONFIG_X86_POWERNOW_K6 not in final .config
Requested value: # CONFIG_X86_POWERNOW_K6 is not set
Actual value:
Value requested for CONFIG_X86_POWERNOW_K7 not in final .config
Requested value: # CONFIG_X86_POWERNOW_K7 is not set
Actual value:
Value requested for CONFIG_X86_GX_SUSPMOD not in final .config
Requested value: # CONFIG_X86_GX_SUSPMOD is not set
Actual value:
Value requested for CONFIG_X86_SPEEDSTEP_ICH not in final .config
Requested value: # CONFIG_X86_SPEEDSTEP_ICH is not set
Actual value:
Value requested for CONFIG_X86_SPEEDSTEP_SMI not in final .config
Requested value: # CONFIG_X86_SPEEDSTEP_SMI is not set
Actual value:
Value requested for CONFIG_X86_CPUFREQ_NFORCE2 not in final .config
Requested value: # CONFIG_X86_CPUFREQ_NFORCE2 is not set
Actual value:
Value requested for CONFIG_X86_LONGRUN not in final .config
Requested value: # CONFIG_X86_LONGRUN is not set
Actual value:
Value requested for CONFIG_X86_LONGHAUL not in final .config
Requested value: # CONFIG_X86_LONGHAUL is not set
Actual value:
Value requested for CONFIG_X86_E_POWERSAVER not in final .config
Requested value: # CONFIG_X86_E_POWERSAVER is not set
Actual value:
Value requested for CONFIG_PCI_GOBIOS not in final .config
Requested value: # CONFIG_PCI_GOBIOS is not set
Actual value:
Value requested for CONFIG_PCI_GOMMCONFIG not in final .config
Requested value: # CONFIG_PCI_GOMMCONFIG is not set
Actual value:
Value requested for CONFIG_PCI_GODIRECT not in final .config
Requested value: # CONFIG_PCI_GODIRECT is not set
Actual value:
Value requested for CONFIG_PCI_GOANY not in final .config
Requested value: CONFIG_PCI_GOANY=y
Actual value:
Value requested for CONFIG_PCI_BIOS not in final .config
Requested value: CONFIG_PCI_BIOS=y
Actual value:
Value requested for CONFIG_ISA not in final .config
Requested value: # CONFIG_ISA is not set
Actual value:
Value requested for CONFIG_SCx200 not in final .config
Requested value: # CONFIG_SCx200 is not set
Actual value:
Value requested for CONFIG_OLPC not in final .config
Requested value: # CONFIG_OLPC is not set
Actual value:
Value requested for CONFIG_ALIX not in final .config
Requested value: # CONFIG_ALIX is not set
Actual value:
Value requested for CONFIG_NET5501 not in final .config
Requested value: # CONFIG_NET5501 is not set
Actual value:
Value requested for CONFIG_GEOS not in final .config
Requested value: # CONFIG_GEOS is not set
Actual value:
Value requested for CONFIG_COMPAT_32 not in final .config
Requested value: CONFIG_COMPAT_32=y
Actual value:
Value requested for CONFIG_HAVE_ATOMIC_IOMAP not in final .config
Requested value: CONFIG_HAVE_ATOMIC_IOMAP=y
Actual value:
Value requested for CONFIG_ARCH_32BIT_OFF_T not in final .config
Requested value: CONFIG_ARCH_32BIT_OFF_T=y
Actual value:
Value requested for CONFIG_ARCH_WANT_IPC_PARSE_VERSION not in final .config
Requested value: CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
Actual value:
Value requested for CONFIG_MODULES_USE_ELF_REL not in final .config
Requested value: CONFIG_MODULES_USE_ELF_REL=y
Actual value:
Value requested for CONFIG_ARCH_MMAP_RND_BITS not in final .config
Requested value: CONFIG_ARCH_MMAP_RND_BITS=8
Actual value: CONFIG_ARCH_MMAP_RND_BITS=28
Value requested for CONFIG_CLONE_BACKWARDS not in final .config
Requested value: CONFIG_CLONE_BACKWARDS=y
Actual value:
Value requested for CONFIG_OLD_SIGSUSPEND3 not in final .config
Requested value: CONFIG_OLD_SIGSUSPEND3=y
Actual value:
Value requested for CONFIG_OLD_SIGACTION not in final .config
Requested value: CONFIG_OLD_SIGACTION=y
Actual value:
Value requested for CONFIG_ARCH_SPLIT_ARG64 not in final .config
Requested value: CONFIG_ARCH_SPLIT_ARG64=y
Actual value:
Value requested for CONFIG_FUNCTION_ALIGNMENT not in final .config
Requested value: CONFIG_FUNCTION_ALIGNMENT=4
Actual value: CONFIG_FUNCTION_ALIGNMENT=16
Value requested for CONFIG_SELECT_MEMORY_MODEL not in final .config
Requested value: CONFIG_SELECT_MEMORY_MODEL=y
Actual value:
Value requested for CONFIG_FLATMEM_MANUAL not in final .config
Requested value: CONFIG_FLATMEM_MANUAL=y
Actual value:
Value requested for CONFIG_SPARSEMEM_MANUAL not in final .config
Requested value: # CONFIG_SPARSEMEM_MANUAL is not set
Actual value:
Value requested for CONFIG_FLATMEM not in final .config
Requested value: CONFIG_FLATMEM=y
Actual value:
Value requested for CONFIG_SPARSEMEM_STATIC not in final .config
Requested value: CONFIG_SPARSEMEM_STATIC=y
Actual value:
Value requested for CONFIG_BOUNCE not in final .config
Requested value: CONFIG_BOUNCE=y
Actual value:
Value requested for CONFIG_KMAP_LOCAL not in final .config
Requested value: CONFIG_KMAP_LOCAL=y
Actual value:
Value requested for CONFIG_HOTPLUG_PCI_COMPAQ not in final .config
Requested value: # CONFIG_HOTPLUG_PCI_COMPAQ is not set
Actual value:
Value requested for CONFIG_HOTPLUG_PCI_IBM not in final .config
Requested value: # CONFIG_HOTPLUG_PCI_IBM is not set
Actual value:
Value requested for CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH not in final .config
Requested value: CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
Actual value:
Value requested for CONFIG_PCH_PHUB not in final .config
Requested value: # CONFIG_PCH_PHUB is not set
Actual value:
Value requested for CONFIG_SCSI_NSP32 not in final .config
Requested value: # CONFIG_SCSI_NSP32 is not set
Actual value:
Value requested for CONFIG_PATA_CS5520 not in final .config
Requested value: # CONFIG_PATA_CS5520 is not set
Actual value:
Value requested for CONFIG_PATA_CS5530 not in final .config
Requested value: # CONFIG_PATA_CS5530 is not set
Actual value:
Value requested for CONFIG_PATA_CS5535 not in final .config
Requested value: # CONFIG_PATA_CS5535 is not set
Actual value:
Value requested for CONFIG_PATA_CS5536 not in final .config
Requested value: # CONFIG_PATA_CS5536 is not set
Actual value:
Value requested for CONFIG_PATA_SC1200 not in final .config
Requested value: # CONFIG_PATA_SC1200 is not set
Actual value:
Value requested for CONFIG_PCH_GBE not in final .config
Requested value: # CONFIG_PCH_GBE is not set
Actual value:
Value requested for CONFIG_INPUT_WISTRON_BTNS not in final .config
Requested value: # CONFIG_INPUT_WISTRON_BTNS is not set
Actual value:
Value requested for CONFIG_SERIAL_TIMBERDALE not in final .config
Requested value: # CONFIG_SERIAL_TIMBERDALE is not set
Actual value:
Value requested for CONFIG_SERIAL_PCH_UART not in final .config
Requested value: # CONFIG_SERIAL_PCH_UART is not set
Actual value:
Value requested for CONFIG_HW_RANDOM_GEODE not in final .config
Requested value: CONFIG_HW_RANDOM_GEODE=y
Actual value:
Value requested for CONFIG_SONYPI not in final .config
Requested value: # CONFIG_SONYPI is not set
Actual value:
Value requested for CONFIG_PC8736x_GPIO not in final .config
Requested value: # CONFIG_PC8736x_GPIO is not set
Actual value:
Value requested for CONFIG_NSC_GPIO not in final .config
Requested value: # CONFIG_NSC_GPIO is not set
Actual value:
Value requested for CONFIG_I2C_EG20T not in final .config
Requested value: # CONFIG_I2C_EG20T is not set
Actual value:
Value requested for CONFIG_SCx200_ACB not in final .config
Requested value: # CONFIG_SCx200_ACB is not set
Actual value:
Value requested for CONFIG_PTP_1588_CLOCK_PCH not in final .config
Requested value: # CONFIG_PTP_1588_CLOCK_PCH is not set
Actual value:
Value requested for CONFIG_SBC8360_WDT not in final .config
Requested value: # CONFIG_SBC8360_WDT is not set
Actual value:
Value requested for CONFIG_SBC7240_WDT not in final .config
Requested value: # CONFIG_SBC7240_WDT is not set
Actual value:
Value requested for CONFIG_MFD_CS5535 not in final .config
Requested value: # CONFIG_MFD_CS5535 is not set
Actual value:
Value requested for CONFIG_AGP_ALI not in final .config
Requested value: # CONFIG_AGP_ALI is not set
Actual value:
Value requested for CONFIG_AGP_ATI not in final .config
Requested value: # CONFIG_AGP_ATI is not set
Actual value:
Value requested for CONFIG_AGP_AMD not in final .config
Requested value: # CONFIG_AGP_AMD is not set
Actual value:
Value requested for CONFIG_AGP_NVIDIA not in final .config
Requested value: # CONFIG_AGP_NVIDIA is not set
Actual value:
Value requested for CONFIG_AGP_SWORKS not in final .config
Requested value: # CONFIG_AGP_SWORKS is not set
Actual value:
Value requested for CONFIG_AGP_EFFICEON not in final .config
Requested value: # CONFIG_AGP_EFFICEON is not set
Actual value:
Value requested for CONFIG_SND_CS5530 not in final .config
Requested value: # CONFIG_SND_CS5530 is not set
Actual value:
Value requested for CONFIG_SND_CS5535AUDIO not in final .config
Requested value: # CONFIG_SND_CS5535AUDIO is not set
Actual value:
Value requested for CONFIG_SND_SIS7019 not in final .config
Requested value: # CONFIG_SND_SIS7019 is not set
Actual value:
Value requested for CONFIG_LEDS_OT200 not in final .config
Requested value: # CONFIG_LEDS_OT200 is not set
Actual value:
Value requested for CONFIG_PCH_DMA not in final .config
Requested value: # CONFIG_PCH_DMA is not set
Actual value:
Value requested for CONFIG_CLKSRC_I8253 not in final .config
Requested value: CONFIG_CLKSRC_I8253=y
Actual value:
Value requested for CONFIG_MAILBOX not in final .config
Requested value: # CONFIG_MAILBOX is not set
Actual value: CONFIG_MAILBOX=y
Value requested for CONFIG_CRYPTO_SERPENT_SSE2_586 not in final .config
Requested value: # CONFIG_CRYPTO_SERPENT_SSE2_586 is not set
Actual value:
Value requested for CONFIG_CRYPTO_TWOFISH_586 not in final .config
Requested value: # CONFIG_CRYPTO_TWOFISH_586 is not set
Actual value:
Value requested for CONFIG_CRYPTO_DEV_GEODE not in final .config
Requested value: # CONFIG_CRYPTO_DEV_GEODE is not set
Actual value:
Value requested for CONFIG_CRYPTO_DEV_HIFN_795X not in final .config
Requested value: # CONFIG_CRYPTO_DEV_HIFN_795X is not set
Actual value:
Value requested for CONFIG_CRYPTO_LIB_POLY1305_RSIZE not in final .config
Requested value: CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
Actual value: CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
Value requested for CONFIG_AUDIT_GENERIC not in final .config
Requested value: CONFIG_AUDIT_GENERIC=y
Actual value:
Value requested for CONFIG_GENERIC_VDSO_32 not in final .config
Requested value: CONFIG_GENERIC_VDSO_32=y
Actual value:
Value requested for CONFIG_DEBUG_KMAP_LOCAL not in final .config
Requested value: # CONFIG_DEBUG_KMAP_LOCAL is not set
Actual value:
Value requested for CONFIG_DEBUG_HIGHMEM not in final .config
Requested value: # CONFIG_DEBUG_HIGHMEM is not set
Actual value:
Value requested for CONFIG_HAVE_DEBUG_STACKOVERFLOW not in final .config
Requested value: CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
Actual value:
Value requested for CONFIG_DEBUG_STACKOVERFLOW not in final .config
Requested value: # CONFIG_DEBUG_STACKOVERFLOW is not set
Actual value:
Value requested for CONFIG_HAVE_FUNCTION_GRAPH_TRACER not in final .config
Requested value: CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
Actual value:
Value requested for CONFIG_HAVE_FUNCTION_GRAPH_FREGS not in final .config
Requested value: CONFIG_HAVE_FUNCTION_GRAPH_FREGS=y
Actual value:
Value requested for CONFIG_HAVE_FTRACE_GRAPH_FUNC not in final .config
Requested value: CONFIG_HAVE_FTRACE_GRAPH_FUNC=y
Actual value:
Value requested for CONFIG_DRM_KUNIT_TEST not in final .config
Requested value: CONFIG_DRM_KUNIT_TEST=m
Actual value:
Value requested for CONFIG_DRM_XE_WERROR not in final .config
Requested value: CONFIG_DRM_XE_WERROR=y
Actual value:
Value requested for CONFIG_DRM_XE_DEBUG not in final .config
Requested value: CONFIG_DRM_XE_DEBUG=y
Actual value:
Value requested for CONFIG_DRM_XE_DEBUG_MEM not in final .config
Requested value: CONFIG_DRM_XE_DEBUG_MEM=y
Actual value:
Value requested for CONFIG_DRM_XE_KUNIT_TEST not in final .config
Requested value: CONFIG_DRM_XE_KUNIT_TEST=m
Actual value:
++ nproc
+ make -j48 ARCH=i386 olddefconfig
GEN Makefile
WARNING: unmet direct dependencies detected for FB_IOMEM_HELPERS
Depends on [n]: HAS_IOMEM [=y] && FB_CORE [=n]
Selected by [m]:
- DRM_XE_DISPLAY [=y] && HAS_IOMEM [=y] && DRM [=y] && DRM_XE [=m] && DRM_XE [=m]=m [=m] && HAS_IOPORT [=y]
#
# configuration written to .config
#
++ nproc
+ make -j48 ARCH=i386
SYNC include/config/auto.conf.cmd
GEN Makefile
WARNING: unmet direct dependencies detected for FB_IOMEM_HELPERS
Depends on [n]: HAS_IOMEM [=y] && FB_CORE [=n]
Selected by [m]:
- DRM_XE_DISPLAY [=y] && HAS_IOMEM [=y] && DRM [=y] && DRM_XE [=m] && DRM_XE [=m]=m [=m] && HAS_IOPORT [=y]
WARNING: unmet direct dependencies detected for FB_IOMEM_HELPERS
Depends on [n]: HAS_IOMEM [=y] && FB_CORE [=n]
Selected by [m]:
- DRM_XE_DISPLAY [=y] && HAS_IOMEM [=y] && DRM [=y] && DRM_XE [=m] && DRM_XE [=m]=m [=m] && HAS_IOPORT [=y]
WARNING: unmet direct dependencies detected for FB_IOMEM_HELPERS
Depends on [n]: HAS_IOMEM [=y] && FB_CORE [=n]
Selected by [m]:
- DRM_XE_DISPLAY [=y] && HAS_IOMEM [=y] && DRM [=y] && DRM_XE [=m] && DRM_XE [=m]=m [=m] && HAS_IOPORT [=y]
GEN Makefile
WRAP arch/x86/include/generated/uapi/asm/errno.h
WRAP arch/x86/include/generated/uapi/asm/bpf_perf_event.h
WRAP arch/x86/include/generated/uapi/asm/fcntl.h
UPD include/generated/uapi/linux/version.h
WRAP arch/x86/include/generated/uapi/asm/ioctl.h
WRAP arch/x86/include/generated/uapi/asm/ioctls.h
WRAP arch/x86/include/generated/uapi/asm/ipcbuf.h
SYSHDR arch/x86/include/generated/uapi/asm/unistd_32.h
WRAP arch/x86/include/generated/uapi/asm/param.h
WRAP arch/x86/include/generated/uapi/asm/poll.h
SYSHDR arch/x86/include/generated/uapi/asm/unistd_64.h
WRAP arch/x86/include/generated/uapi/asm/resource.h
SYSHDR arch/x86/include/generated/uapi/asm/unistd_x32.h
WRAP arch/x86/include/generated/uapi/asm/socket.h
SYSTBL arch/x86/include/generated/asm/syscalls_32.h
WRAP arch/x86/include/generated/uapi/asm/sockios.h
WRAP arch/x86/include/generated/uapi/asm/termbits.h
WRAP arch/x86/include/generated/uapi/asm/termios.h
WRAP arch/x86/include/generated/uapi/asm/types.h
UPD include/generated/compile.h
HOSTCC arch/x86/tools/relocs_32.o
HOSTCC arch/x86/tools/relocs_64.o
HOSTCC arch/x86/tools/relocs_common.o
WRAP arch/x86/include/generated/asm/early_ioremap.h
WRAP arch/x86/include/generated/asm/fprobe.h
WRAP arch/x86/include/generated/asm/mcs_spinlock.h
WRAP arch/x86/include/generated/asm/mmzone.h
WRAP arch/x86/include/generated/asm/irq_regs.h
WRAP arch/x86/include/generated/asm/kmap_size.h
WRAP arch/x86/include/generated/asm/local64.h
WRAP arch/x86/include/generated/asm/mmiowb.h
WRAP arch/x86/include/generated/asm/module.lds.h
WRAP arch/x86/include/generated/asm/rwonce.h
HOSTCC scripts/kallsyms
HOSTCC scripts/sorttable
HOSTCC scripts/asn1_compiler
HOSTCC scripts/selinux/mdp/mdp
HOSTLD arch/x86/tools/relocs
UPD include/config/kernel.release
UPD include/generated/utsrelease.h
CC scripts/mod/empty.o
HOSTCC scripts/mod/mk_elfconfig
CC scripts/mod/devicetable-offsets.s
UPD scripts/mod/devicetable-offsets.h
MKELF scripts/mod/elfconfig.h
HOSTCC scripts/mod/modpost.o
HOSTCC scripts/mod/file2alias.o
HOSTCC scripts/mod/sumversion.o
HOSTCC scripts/mod/symsearch.o
HOSTLD scripts/mod/modpost
CC kernel/bounds.s
CHKSHA1 /workspace/kernel/include/linux/atomic/atomic-arch-fallback.h
CHKSHA1 /workspace/kernel/include/linux/atomic/atomic-instrumented.h
CHKSHA1 /workspace/kernel/include/linux/atomic/atomic-long.h
UPD include/generated/timeconst.h
UPD include/generated/bounds.h
CC arch/x86/kernel/asm-offsets.s
UPD include/generated/asm-offsets.h
CALL /workspace/kernel/scripts/checksyscalls.sh
LDS scripts/module.lds
CC init/main.o
HOSTCC usr/gen_init_cpio
CC init/do_mounts.o
CC certs/system_keyring.o
CC init/do_mounts_initrd.o
UPD init/utsversion-tmp.h
CC ipc/util.o
CC init/initramfs.o
CC mm/filemap.o
CC ipc/msgutil.o
CC init/calibrate.o
CC mm/mempool.o
CC arch/x86/realmode/init.o
CC security/commoncap.o
AS arch/x86/entry/entry.o
CC block/bdev.o
CC init/init_task.o
CC security/lsm_syscalls.o
CC block/fops.o
CC ipc/msg.o
AS arch/x86/lib/atomic64_cx8_32.o
CC mm/oom_kill.o
AS arch/x86/entry/entry_32.o
AR arch/x86/crypto/built-in.a
CC io_uring/io_uring.o
AR arch/x86/net/built-in.a
CC arch/x86/power/cpu.o
CC arch/x86/video/video-common.o
CC arch/x86/pci/i386.o
CC security/keys/gc.o
CC block/partitions/core.o
HOSTCC security/selinux/genheaders
AR arch/x86/entry/vsyscall/built-in.a
AS arch/x86/realmode/rm/header.o
CC security/integrity/iint.o
AR virt/lib/built-in.a
CC arch/x86/mm/pat/set_memory.o
CC net/core/sock.o
CC arch/x86/events/amd/core.o
AR arch/x86/platform/atom/built-in.a
CC arch/x86/virt/svm/cmdline.o
AR drivers/cache/built-in.a
AS arch/x86/realmode/rm/trampoline_32.o
CC block/partitions/msdos.o
CC lib/math/div64.o
CC arch/x86/kernel/fpu/init.o
AR virt/built-in.a
CC fs/notify/dnotify/dnotify.o
CC sound/core/seq/seq.o
AS arch/x86/lib/checksum_32.o
AR arch/x86/platform/ce4100/built-in.a
AR drivers/irqchip/built-in.a
CC block/bio.o
CC arch/x86/entry/vdso/vma.o
CC lib/crypto/mpi/generic_mpih-lshift.o
AS arch/x86/realmode/rm/stack.o
CC arch/x86/platform/efi/memmap.o
AR drivers/pwm/built-in.a
CC lib/zlib_inflate/inffast.o
AR drivers/bus/mhi/built-in.a
CC arch/x86/mm/pat/memtype.o
CC kernel/sched/core.o
AR drivers/bus/built-in.a
CC fs/nfs_common/nfsacl.o
CC arch/x86/lib/cmdline.o
AS arch/x86/realmode/rm/reboot.o
CC crypto/asymmetric_keys/asymmetric_type.o
AR drivers/leds/trigger/built-in.a
AS arch/x86/realmode/rm/wakeup_asm.o
AR drivers/leds/blink/built-in.a
CC arch/x86/realmode/rm/wakemain.o
AR drivers/leds/simple/built-in.a
AR arch/x86/virt/svm/built-in.a
CC drivers/leds/led-core.o
AR arch/x86/virt/vmx/built-in.a
AR arch/x86/virt/built-in.a
AS arch/x86/lib/cmpxchg8b_emu.o
CC fs/iomap/trace.o
CC lib/math/gcd.o
GEN security/selinux/flask.h security/selinux/av_permissions.h
CC security/selinux/avc.o
CC arch/x86/lib/cpu.o
CC arch/x86/realmode/rm/video-mode.o
CC lib/zlib_inflate/inflate.o
CC lib/math/lcm.o
CC lib/math/int_log.o
CC fs/quota/dquot.o
AS arch/x86/realmode/rm/copy.o
AS arch/x86/realmode/rm/bioscall.o
GEN usr/initramfs_data.cpio
CC arch/x86/realmode/rm/regs.o
COPY usr/initramfs_inc_data
AS usr/initramfs_data.o
HOSTCC certs/extract-cert
CC lib/math/int_pow.o
AR usr/built-in.a
CC arch/x86/kernel/fpu/bugs.o
CC arch/x86/realmode/rm/video-vga.o
CC lib/zlib_deflate/deflate.o
CC lib/math/int_sqrt.o
CC arch/x86/kernel/fpu/core.o
CC arch/x86/realmode/rm/video-vesa.o
CC lib/math/reciprocal_div.o
CC arch/x86/realmode/rm/video-bios.o
CC arch/x86/lib/delay.o
CC crypto/api.o
CC sound/core/seq/seq_lock.o
CC lib/math/rational.o
CC lib/crypto/mpi/generic_mpih-mul1.o
PASYMS arch/x86/realmode/rm/pasyms.h
AR arch/x86/video/built-in.a
CERT certs/x509_certificate_list
CERT certs/signing_key.x509
AS certs/system_certificates.o
LDS arch/x86/realmode/rm/realmode.lds
CC arch/x86/events/intel/core.o
AR certs/built-in.a
LD arch/x86/realmode/rm/realmode.elf
CC arch/x86/events/zhaoxin/core.o
AS arch/x86/lib/getuser.o
RELOCS arch/x86/realmode/rm/realmode.relocs
OBJCOPY arch/x86/realmode/rm/realmode.bin
CC security/integrity/integrity_audit.o
AS arch/x86/realmode/rmpiggy.o
CC lib/zlib_inflate/infutil.o
CC drivers/leds/led-class.o
CC lib/zlib_inflate/inftrees.o
CC arch/x86/events/core.o
AR arch/x86/realmode/built-in.a
CC arch/x86/events/intel/bts.o
CC lib/crypto/mpi/generic_mpih-mul2.o
CC fs/nfs_common/grace.o
CC arch/x86/pci/init.o
CC lib/zlib_inflate/inflate_syms.o
CC crypto/asymmetric_keys/restrict.o
AR fs/notify/dnotify/built-in.a
CC security/keys/key.o
CC arch/x86/entry/vdso/extable.o
CC fs/notify/inotify/inotify_fsnotify.o
CC arch/x86/platform/efi/quirks.o
CC arch/x86/mm/init.o
CC arch/x86/power/hibernate_32.o
GEN arch/x86/lib/inat-tables.c
CC arch/x86/lib/insn-eval.o
AS arch/x86/power/hibernate_asm_32.o
CC block/partitions/efi.o
CC arch/x86/lib/insn.o
CC arch/x86/platform/efi/efi.o
CC crypto/asymmetric_keys/signature.o
AR lib/math/built-in.a
CC security/min_addr.o
CC sound/core/seq/seq_clientmgr.o
CC fs/proc/task_mmu.o
CC sound/core/sound.o
CC kernel/locking/mutex.o
CC net/core/request_sock.o
CC ipc/sem.o
AR lib/zlib_inflate/built-in.a
CC sound/core/init.o
CC security/keys/keyring.o
CC arch/x86/kernel/fpu/regset.o
CC fs/iomap/iter.o
CC arch/x86/events/probe.o
CC arch/x86/events/amd/lbr.o
CC crypto/cipher.o
CC arch/x86/events/amd/ibs.o
CC drivers/leds/led-triggers.o
CC lib/zlib_deflate/deftree.o
CC fs/notify/inotify/inotify_user.o
CC lib/crypto/mpi/generic_mpih-mul3.o
CC arch/x86/lib/kaslr.o
CC arch/x86/mm/pat/memtype_interval.o
CC crypto/asymmetric_keys/public_key.o
CC arch/x86/pci/pcbios.o
AR security/integrity/built-in.a
CC arch/x86/power/hibernate.o
CC ipc/shm.o
CC init/version.o
CC fs/nfs_common/common.o
CC block/elevator.o
CC arch/x86/entry/syscall_32.o
LDS arch/x86/entry/vdso/vdso32/vdso32.lds
AR arch/x86/events/zhaoxin/built-in.a
CC fs/kernfs/mount.o
CC arch/x86/entry/common.o
CC fs/sysfs/file.o
AS arch/x86/entry/vdso/vdso32/note.o
AS arch/x86/entry/vdso/vdso32/system_call.o
CC arch/x86/pci/mmconfig_32.o
AR arch/x86/platform/geode/built-in.a
CC lib/crypto/mpi/generic_mpih-rshift.o
AS arch/x86/entry/vdso/vdso32/sigreturn.o
AR init/built-in.a
CC security/keys/keyctl.o
AR sound/drivers/opl3/built-in.a
AR sound/i2c/other/built-in.a
AR sound/drivers/opl4/built-in.a
CC arch/x86/entry/vdso/vdso32/vclock_gettime.o
CC arch/x86/platform/efi/efi_32.o
AR sound/i2c/built-in.a
AR sound/drivers/mpu401/built-in.a
ASN.1 crypto/asymmetric_keys/x509.asn1.[ch]
AR sound/drivers/vx/built-in.a
CC lib/lzo/lzo1x_compress.o
CC lib/lz4/lz4_decompress.o
CC arch/x86/lib/memcpy_32.o
AR sound/drivers/pcsp/built-in.a
AR sound/drivers/built-in.a
CC lib/zstd/zstd_decompress_module.o
AS arch/x86/lib/memmove_32.o
AR block/partitions/built-in.a
CC lib/xz/xz_dec_syms.o
CC security/security.o
CC lib/dim/dim.o
CC arch/x86/lib/misc.o
CC security/selinux/hooks.o
CC arch/x86/lib/pc-conf-reg.o
CC lib/lzo/lzo1x_decompress_safe.o
CC fs/quota/quota_v2.o
CC mm/fadvise.o
CC lib/zlib_deflate/deflate_syms.o
CC fs/iomap/buffered-io.o
AR arch/x86/mm/pat/built-in.a
CC arch/x86/mm/init_32.o
CC arch/x86/kernel/fpu/signal.o
AR drivers/leds/built-in.a
AS arch/x86/lib/putuser.o
CC drivers/pci/msi/pcidev_msi.o
AS arch/x86/lib/retpoline.o
CC drivers/pci/pcie/portdrv.o
ASN.1 crypto/asymmetric_keys/x509_akid.asn1.[ch]
CC crypto/asymmetric_keys/x509_loader.o
CC arch/x86/lib/string_32.o
AR drivers/pci/pwrctrl/built-in.a
CC arch/x86/kernel/fpu/xstate.o
CC drivers/pci/hotplug/pci_hotplug_core.o
CC kernel/locking/semaphore.o
AR arch/x86/power/built-in.a
CC net/ethernet/eth.o
CC lib/xz/xz_dec_stream.o
CC arch/x86/lib/strstr_32.o
CC lib/zstd/decompress/huf_decompress.o
AR fs/nfs_common/built-in.a
CC arch/x86/lib/usercopy.o
AR arch/x86/platform/iris/built-in.a
CC sound/core/seq/seq_memory.o
CC lib/dim/net_dim.o
CC lib/crypto/mpi/generic_mpih-sub1.o
AR net/802/built-in.a
AR fs/notify/inotify/built-in.a
CC lib/xz/xz_dec_lzma2.o
CC block/blk-core.o
AR fs/notify/fanotify/built-in.a
CC crypto/asymmetric_keys/x509_public_key.o
CC fs/notify/fsnotify.o
AR lib/zlib_deflate/built-in.a
CC lib/crypto/mpi/generic_mpih-add1.o
CC drivers/pci/hotplug/acpi_pcihp.o
AR lib/lzo/built-in.a
CC arch/x86/pci/direct.o
CC net/core/skbuff.o
AR drivers/pci/controller/dwc/built-in.a
CC arch/x86/entry/vdso/vdso32/vgetcpu.o
AR drivers/pci/controller/mobiveil/built-in.a
AR drivers/pci/controller/plda/built-in.a
CC fs/sysfs/dir.o
CC fs/kernfs/inode.o
AR drivers/pci/controller/built-in.a
CC arch/x86/mm/fault.o
CC arch/x86/pci/mmconfig-shared.o
CC drivers/pci/msi/api.o
HOSTCC arch/x86/entry/vdso/vdso2c
CC arch/x86/events/amd/uncore.o
AS arch/x86/platform/efi/efi_stub_32.o
CC arch/x86/platform/efi/runtime-map.o
CC arch/x86/lib/usercopy_32.o
CC fs/quota/quota_tree.o
CC io_uring/opdef.o
CC arch/x86/events/utils.o
CC lib/xz/xz_dec_bcj.o
CC lib/fonts/fonts.o
CC drivers/video/console/dummycon.o
CC sound/core/seq/seq_queue.o
CC security/keys/permission.o
CC fs/proc/inode.o
CC arch/x86/lib/msr-smp.o
CC kernel/locking/rwsem.o
CC block/blk-sysfs.o
CC kernel/power/qos.o
ASN.1 crypto/asymmetric_keys/pkcs7.asn1.[ch]
CC crypto/asymmetric_keys/pkcs7_trust.o
CC drivers/pci/pcie/rcec.o
CC ipc/syscall.o
CC arch/x86/entry/vdso/vdso32-setup.o
CC lib/crypto/mpi/mpicoder.o
CC lib/fonts/font_8x16.o
CC drivers/video/backlight/backlight.o
CC fs/sysfs/symlink.o
CC lib/crypto/memneq.o
CC arch/x86/lib/cache-smp.o
CC security/lsm_audit.o
AR drivers/pci/hotplug/built-in.a
CC net/sched/sch_generic.o
CC security/device_cgroup.o
AR lib/lz4/built-in.a
CC fs/iomap/direct-io.o
CC security/selinux/selinuxfs.o
CC fs/iomap/fiemap.o
CC mm/maccess.o
CC drivers/pci/msi/msi.o
CC security/keys/process_keys.o
VDSO arch/x86/entry/vdso/vdso32.so.dbg
CC arch/x86/lib/crc32-glue.o
AR lib/xz/built-in.a
OBJCOPY arch/x86/entry/vdso/vdso32.so
VDSO2C arch/x86/entry/vdso/vdso-image-32.c
CC fs/kernfs/dir.o
CC net/sched/sch_mq.o
CC lib/dim/rdma_dim.o
CC arch/x86/entry/vdso/vdso-image-32.o
AR arch/x86/platform/efi/built-in.a
CC crypto/asymmetric_keys/pkcs7_verify.o
CC arch/x86/platform/intel/iosf_mbi.o
CC fs/notify/notification.o
AR lib/fonts/built-in.a
AR arch/x86/kernel/fpu/built-in.a
CC lib/zstd/decompress/zstd_ddict.o
CC arch/x86/kernel/cpu/mce/core.o
CC drivers/video/console/vgacon.o
CC arch/x86/kernel/acpi/boot.o
CC arch/x86/pci/fixup.o
CC arch/x86/kernel/apic/apic.o
CC fs/kernfs/file.o
CC arch/x86/kernel/kprobes/core.o
CC lib/zstd/decompress/zstd_decompress.o
CC fs/kernfs/symlink.o
AR arch/x86/entry/vdso/built-in.a
AS arch/x86/entry/thunk.o
AR net/ethernet/built-in.a
CC lib/crypto/mpi/mpi-add.o
AR arch/x86/entry/built-in.a
CC fs/quota/quota.o
CC fs/devpts/inode.o
CC sound/core/seq/seq_fifo.o
AS arch/x86/lib/crc32-pclmul.o
AR lib/dim/built-in.a
CC drivers/pci/pcie/bwctrl.o
CC arch/x86/lib/msr.o
AR arch/x86/events/amd/built-in.a
CC drivers/pci/msi/irqdomain.o
CC fs/proc/root.o
AR drivers/idle/built-in.a
CC ipc/ipc_sysctl.o
AR drivers/char/ipmi/built-in.a
CC lib/zstd/decompress/zstd_decompress_block.o
CC io_uring/kbuf.o
CC fs/sysfs/mount.o
CC kernel/locking/percpu-rwsem.o
CC arch/x86/mm/ioremap.o
CC crypto/asymmetric_keys/x509.asn1.o
CC crypto/asymmetric_keys/x509_akid.asn1.o
CC crypto/asymmetric_keys/x509_cert_parser.o
CC arch/x86/kernel/acpi/sleep.o
AR drivers/video/backlight/built-in.a
AS arch/x86/kernel/acpi/wakeup_32.o
CC lib/zstd/zstd_common_module.o
CC mm/page-writeback.o
CC net/core/datagram.o
AR drivers/pci/switch/built-in.a
CC lib/crypto/utils.o
CC fs/notify/group.o
CC kernel/power/main.o
AR sound/isa/ad1816a/built-in.a
AR sound/isa/ad1848/built-in.a
AR sound/isa/cs423x/built-in.a
AR arch/x86/platform/intel/built-in.a
AR sound/isa/es1688/built-in.a
AR arch/x86/platform/intel-mid/built-in.a
AR sound/isa/galaxy/built-in.a
CC arch/x86/events/intel/ds.o
AR arch/x86/platform/intel-quark/built-in.a
AR sound/isa/gus/built-in.a
AR arch/x86/platform/olpc/built-in.a
AR sound/isa/msnd/built-in.a
AR arch/x86/platform/scx200/built-in.a
AR sound/isa/opti9xx/built-in.a
AR arch/x86/platform/ts5500/built-in.a
AR sound/isa/sb/built-in.a
AR arch/x86/platform/uv/built-in.a
AR arch/x86/platform/built-in.a
AR sound/isa/wavefront/built-in.a
CC ipc/mqueue.o
AR sound/isa/wss/built-in.a
AR sound/isa/built-in.a
CC arch/x86/events/intel/knc.o
CC net/core/stream.o
CC lib/crypto/mpi/mpi-bit.o
CC arch/x86/kernel/cpu/mtrr/mtrr.o
CC sound/core/seq/seq_prioq.o
CC sound/core/seq/seq_timer.o
CC arch/x86/mm/extable.o
CC fs/iomap/seek.o
CC fs/iomap/swapfile.o
CC security/keys/request_key.o
CC fs/notify/mark.o
CC crypto/asymmetric_keys/pkcs7.asn1.o
AR fs/devpts/built-in.a
CC arch/x86/kernel/cpu/microcode/core.o
CC drivers/pci/pcie/aspm.o
CC kernel/locking/spinlock.o
CC arch/x86/kernel/cpu/cacheinfo.o
CC arch/x86/pci/acpi.o
CC block/blk-flush.o
CC block/blk-settings.o
CC arch/x86/mm/mmap.o
AR drivers/video/console/built-in.a
CC crypto/asymmetric_keys/pkcs7_parser.o
AR drivers/video/fbdev/core/built-in.a
CC arch/x86/kernel/kprobes/opt.o
AR drivers/video/fbdev/omap/built-in.a
CC net/netlink/af_netlink.o
CC fs/proc/base.o
AR fs/kernfs/built-in.a
AR drivers/video/fbdev/omap2/omapfb/dss/built-in.a
AR drivers/video/fbdev/omap2/omapfb/displays/built-in.a
AR net/bpf/built-in.a
AR drivers/pci/msi/built-in.a
AR drivers/video/fbdev/omap2/omapfb/built-in.a
CC lib/zstd/common/debug.o
CC arch/x86/events/rapl.o
AR drivers/video/fbdev/omap2/built-in.a
CC fs/sysfs/group.o
AR drivers/video/fbdev/built-in.a
CC arch/x86/events/msr.o
AS arch/x86/lib/msr-reg.o
CC drivers/video/aperture.o
CC arch/x86/pci/legacy.o
CC arch/x86/kernel/acpi/cstate.o
CC arch/x86/lib/msr-reg-export.o
CC net/core/scm.o
CC sound/core/memory.o
CC security/keys/request_key_auth.o
CC kernel/locking/osq_lock.o
CC fs/quota/kqid.o
AS arch/x86/lib/hweight.o
CC arch/x86/lib/iomem.o
CC io_uring/rsrc.o
CC lib/crypto/mpi/mpi-cmp.o
CC kernel/sched/fair.o
CC arch/x86/kernel/cpu/mce/severity.o
CC mm/folio-compat.o
CC mm/readahead.o
CC kernel/locking/qspinlock.o
AR crypto/asymmetric_keys/built-in.a
CC sound/core/seq/seq_system.o
AR fs/iomap/built-in.a
CC arch/x86/kernel/cpu/mtrr/if.o
CC crypto/compress.o
CC net/sched/sch_frag.o
CC net/sched/sch_api.o
CC drivers/pci/pcie/pme.o
CC arch/x86/kernel/cpu/microcode/intel.o
CC kernel/power/console.o
CC lib/zstd/common/entropy_common.o
AR arch/x86/kernel/acpi/built-in.a
CC fs/quota/netlink.o
CC arch/x86/mm/pgtable.o
CC arch/x86/kernel/apic/apic_common.o
CC arch/x86/events/intel/lbr.o
CC arch/x86/pci/irq.o
CC arch/x86/lib/atomic64_32.o
CC io_uring/notif.o
AR fs/sysfs/built-in.a
CC mm/swap.o
CC fs/notify/fdinfo.o
CC net/sched/sch_blackhole.o
CC lib/zstd/common/error_private.o
CC arch/x86/lib/inat.o
CC lib/crypto/mpi/mpi-sub-ui.o
CC security/keys/user_defined.o
CC drivers/video/cmdline.o
CC arch/x86/events/intel/p4.o
CC block/blk-ioc.o
CC crypto/algapi.o
CC drivers/video/nomodeset.o
CC kernel/locking/rtmutex_api.o
AR arch/x86/kernel/kprobes/built-in.a
CC block/blk-map.o
AR arch/x86/lib/built-in.a
AR arch/x86/lib/lib.a
CC drivers/acpi/acpica/dsargs.o
CC drivers/pnp/pnpacpi/core.o
CC lib/zstd/common/fse_decompress.o
CC arch/x86/mm/physaddr.o
CC drivers/pnp/core.o
CC arch/x86/mm/tlb.o
CC arch/x86/kernel/apic/apic_noop.o
CC arch/x86/kernel/apic/ipi.o
CC arch/x86/kernel/cpu/mtrr/generic.o
CC sound/core/seq/seq_ports.o
CC drivers/video/hdmi.o
CC drivers/acpi/acpica/dscontrol.o
CC lib/zstd/common/zstd_common.o
LDS arch/x86/kernel/vmlinux.lds
CC block/blk-merge.o
CC lib/crypto/mpi/mpi-div.o
CC arch/x86/kernel/cpu/mce/genpool.o
CC net/sched/cls_api.o
CC kernel/power/process.o
CC drivers/pci/access.o
CC ipc/namespace.o
CC drivers/pnp/card.o
CC security/selinux/netlink.o
AR drivers/pci/pcie/built-in.a
AR drivers/amba/built-in.a
CC arch/x86/kernel/cpu/microcode/amd.o
CC arch/x86/kernel/cpu/mce/intel.o
AR fs/notify/built-in.a
CC kernel/printk/printk.o
CC security/keys/proc.o
CC kernel/irq/irqdesc.o
CC kernel/sched/build_policy.o
CC kernel/locking/qrwlock.o
AR fs/quota/built-in.a
CC drivers/acpi/acpica/dsdebug.o
AR lib/zstd/built-in.a
CC kernel/rcu/update.o
AR sound/ppc/built-in.a
AR sound/pci/ac97/built-in.a
AR drivers/acpi/pmic/built-in.a
CC sound/core/seq/seq_info.o
AR sound/pci/ali5451/built-in.a
CC security/keys/sysctl.o
AR sound/pci/asihpi/built-in.a
CC fs/netfs/buffered_read.o
AR sound/pci/au88x0/built-in.a
CC fs/ext4/balloc.o
CC fs/jbd2/transaction.o
AR sound/pci/aw2/built-in.a
CC drivers/pnp/pnpacpi/rsparser.o
AR sound/pci/ctxfi/built-in.a
AR sound/pci/ca0106/built-in.a
AR sound/pci/cs46xx/built-in.a
AS arch/x86/kernel/head_32.o
AR sound/pci/cs5535audio/built-in.a
AR sound/pci/lola/built-in.a
CC drivers/pnp/driver.o
AR sound/pci/lx6464es/built-in.a
CC drivers/pnp/resource.o
CC arch/x86/kernel/cpu/mce/amd.o
CC arch/x86/kernel/cpu/mce/threshold.o
AR sound/pci/echoaudio/built-in.a
AR sound/pci/emu10k1/built-in.a
CC sound/pci/hda/hda_bind.o
CC arch/x86/kernel/apic/vector.o
CC drivers/pci/bus.o
CC fs/ext4/bitmap.o
CC net/core/gen_stats.o
CC io_uring/tctx.o
CC drivers/acpi/acpica/dsfield.o
CC net/core/gen_estimator.o
CC ipc/mq_sysctl.o
CC arch/x86/pci/common.o
AR kernel/livepatch/built-in.a
AR kernel/locking/built-in.a
CC arch/x86/kernel/head32.o
CC lib/crypto/mpi/mpi-mod.o
CC arch/x86/kernel/cpu/scattered.o
CC fs/netfs/buffered_write.o
CC fs/proc/generic.o
AR drivers/video/built-in.a
CC net/sched/act_api.o
CC kernel/dma/mapping.o
CC crypto/scatterwalk.o
CC kernel/power/suspend.o
CC arch/x86/events/intel/p6.o
AR sound/pci/ice1712/built-in.a
CC sound/core/seq/seq_dummy.o
CC security/keys/keyctl_pkey.o
CC net/ethtool/ioctl.o
CC arch/x86/mm/cpu_entry_area.o
CC mm/truncate.o
CC kernel/irq/handle.o
CC security/selinux/nlmsgtab.o
CC mm/vmscan.o
CC arch/x86/kernel/cpu/mtrr/cleanup.o
AR sound/pci/korg1212/built-in.a
CC arch/x86/events/intel/pt.o
AR ipc/built-in.a
CC lib/argv_split.o
CC drivers/acpi/acpica/dsinit.o
CC net/ethtool/common.o
CC sound/core/control.o
AR arch/x86/kernel/cpu/microcode/built-in.a
CC net/sched/sch_fifo.o
CC sound/pci/hda/hda_codec.o
CC net/netlink/genetlink.o
CC lib/crypto/mpi/mpi-mul.o
CC drivers/acpi/dptf/int340x_thermal.o
AR drivers/pnp/pnpacpi/built-in.a
CC io_uring/filetable.o
CC block/blk-timeout.o
CC drivers/pci/probe.o
CC kernel/sched/build_utility.o
CC net/core/net_namespace.o
CC arch/x86/kernel/apic/init.o
AR sound/core/seq/built-in.a
CC drivers/acpi/acpica/dsmethod.o
CC kernel/irq/manage.o
CC kernel/irq/spurious.o
CC drivers/pnp/manager.o
CC drivers/acpi/acpica/dsmthdat.o
CC crypto/proc.o
CC arch/x86/pci/early.o
AR security/keys/built-in.a
CC arch/x86/pci/bus_numa.o
CC arch/x86/pci/amd_bus.o
CC arch/x86/kernel/apic/hw_nmi.o
CC arch/x86/mm/maccess.o
CC drivers/pci/host-bridge.o
CC mm/shrinker.o
CC fs/proc/array.o
CC lib/crypto/chacha.o
CC net/netfilter/core.o
AR drivers/acpi/dptf/built-in.a
CC arch/x86/kernel/cpu/mtrr/amd.o
CC kernel/irq/resend.o
CC kernel/irq/chip.o
CC fs/jbd2/commit.o
CC arch/x86/mm/pgprot.o
CC fs/netfs/direct_read.o
CC block/blk-lib.o
AR arch/x86/kernel/cpu/mce/built-in.a
CC arch/x86/kernel/cpu/mtrr/cyrix.o
CC lib/crypto/mpi/mpih-cmp.o
CC sound/core/misc.o
CC security/selinux/netif.o
CC drivers/acpi/acpica/dsobject.o
CC kernel/power/hibernate.o
CC kernel/entry/common.o
CC arch/x86/mm/pgtable_32.o
CC net/netfilter/nf_log.o
AR sound/arm/built-in.a
CC fs/proc/fd.o
CC fs/ext4/block_validity.o
CC crypto/aead.o
CC drivers/pnp/support.o
CC io_uring/rw.o
CC arch/x86/kernel/apic/io_apic.o
AR drivers/clk/actions/built-in.a
CC io_uring/net.o
AR drivers/clk/analogbits/built-in.a
AR drivers/clk/bcm/built-in.a
CC drivers/dma/dw/core.o
AR drivers/clk/imgtec/built-in.a
AR drivers/clk/imx/built-in.a
AR drivers/clk/ingenic/built-in.a
AR drivers/clk/mediatek/built-in.a
AR drivers/clk/microchip/built-in.a
AR drivers/clk/mstar/built-in.a
CC drivers/dma/hsu/hsu.o
AR drivers/dma/idxd/built-in.a
AR arch/x86/pci/built-in.a
AR drivers/clk/mvebu/built-in.a
CC arch/x86/kernel/ebda.o
CC net/sched/cls_cgroup.o
AR drivers/clk/ralink/built-in.a
AR drivers/clk/renesas/built-in.a
CC drivers/acpi/acpica/dsopcode.o
CC kernel/power/snapshot.o
CC arch/x86/events/intel/uncore.o
AR drivers/clk/socfpga/built-in.a
CC kernel/module/main.o
AR drivers/clk/sophgo/built-in.a
AR drivers/clk/sprd/built-in.a
CC arch/x86/events/intel/uncore_nhmex.o
AR drivers/clk/starfive/built-in.a
AR drivers/clk/sunxi-ng/built-in.a
AR drivers/clk/ti/built-in.a
AR drivers/clk/versatile/built-in.a
CC kernel/printk/printk_safe.o
AR drivers/clk/xilinx/built-in.a
CC lib/crypto/mpi/mpih-div.o
AR drivers/clk/built-in.a
CC arch/x86/kernel/cpu/mtrr/centaur.o
CC net/ipv4/netfilter/nf_defrag_ipv4.o
CC kernel/rcu/sync.o
CC fs/jbd2/recovery.o
CC sound/core/device.o
CC fs/proc/proc_tty.o
CC block/blk-mq.o
CC drivers/pnp/interface.o
CC arch/x86/mm/iomap_32.o
CC fs/netfs/direct_write.o
CC kernel/irq/dummychip.o
CC sound/pci/hda/hda_jack.o
CC security/selinux/netnode.o
CC drivers/acpi/acpica/dspkginit.o
CC fs/ramfs/inode.o
CC kernel/rcu/srcutree.o
CC crypto/geniv.o
CC net/core/secure_seq.o
CC fs/ext4/dir.o
CC arch/x86/kernel/cpu/mtrr/legacy.o
CC kernel/dma/direct.o
CC net/netlink/policy.o
CC kernel/entry/syscall_user_dispatch.o
CC io_uring/poll.o
AR sound/sh/built-in.a
CC drivers/dma/dw/dw.o
CC drivers/pci/remove.o
CC drivers/pci/pci.o
CC lib/bug.o
CC kernel/printk/nbcon.o
CC sound/core/info.o
CC sound/core/isadma.o
AR drivers/soc/apple/built-in.a
AR drivers/dma/hsu/built-in.a
AR drivers/soc/aspeed/built-in.a
CC net/ethtool/netlink.o
AR drivers/soc/bcm/built-in.a
AR drivers/soc/fsl/built-in.a
AR drivers/soc/fujitsu/built-in.a
AR drivers/soc/hisilicon/built-in.a
CC kernel/irq/devres.o
AR drivers/soc/imx/built-in.a
AR drivers/soc/ixp4xx/built-in.a
CC net/netfilter/nf_queue.o
CC drivers/acpi/acpica/dsutils.o
AR drivers/soc/loongson/built-in.a
AR drivers/soc/microchip/built-in.a
AR drivers/soc/mediatek/built-in.a
CC kernel/module/strict_rwx.o
CC fs/proc/cmdline.o
AR drivers/soc/nuvoton/built-in.a
CC arch/x86/mm/hugetlbpage.o
AR drivers/soc/pxa/built-in.a
AR arch/x86/kernel/cpu/mtrr/built-in.a
CC arch/x86/kernel/cpu/topology_common.o
AR drivers/soc/amlogic/built-in.a
AR drivers/soc/qcom/built-in.a
AR drivers/soc/renesas/built-in.a
CC drivers/pnp/quirks.o
AR drivers/soc/rockchip/built-in.a
AR drivers/soc/sunxi/built-in.a
AR drivers/soc/ti/built-in.a
CC lib/crypto/mpi/mpih-mul.o
CC arch/x86/kernel/cpu/topology_ext.o
AR drivers/soc/versatile/built-in.a
AR drivers/soc/xilinx/built-in.a
AR drivers/soc/built-in.a
CC net/sched/ematch.o
CC sound/core/vmaster.o
CC io_uring/eventfd.o
CC kernel/printk/printk_ringbuffer.o
CC drivers/pci/pci-driver.o
CC fs/ramfs/file-mmu.o
CC fs/netfs/iterator.o
CC fs/jbd2/checkpoint.o
CC net/ipv4/netfilter/nf_reject_ipv4.o
CC drivers/dma/dw/idma32.o
CC kernel/dma/ops_helpers.o
AR kernel/entry/built-in.a
CC arch/x86/kernel/platform-quirks.o
CC security/selinux/netport.o
CC drivers/acpi/acpica/dswexec.o
CC kernel/irq/kexec.o
CC drivers/pnp/system.o
CC net/ipv4/route.o
CC sound/pci/hda/hda_auto_parser.o
CC crypto/lskcipher.o
CC fs/ext4/ext4_jbd2.o
CC arch/x86/kernel/cpu/topology_amd.o
CC fs/proc/consoles.o
CC drivers/acpi/acpica/dswload.o
CC security/selinux/status.o
CC net/core/flow_dissector.o
CC net/ipv4/netfilter/ip_tables.o
CC fs/jbd2/revoke.o
AR net/netlink/built-in.a
CC fs/netfs/locking.o
CC block/blk-mq-tag.o
CC arch/x86/mm/dump_pagetables.o
CC arch/x86/kernel/apic/msi.o
CC arch/x86/events/intel/uncore_snb.o
CC mm/shmem.o
CC kernel/rcu/tree.o
CC fs/jbd2/journal.o
CC sound/core/ctljack.o
CC kernel/power/swap.o
CC fs/netfs/main.o
CC kernel/module/kmod.o
CC arch/x86/kernel/cpu/common.o
CC arch/x86/kernel/cpu/rdrand.o
CC kernel/irq/autoprobe.o
AR sound/synth/emux/built-in.a
AR sound/synth/built-in.a
CC sound/core/jack.o
CC kernel/rcu/rcu_segcblist.o
CC lib/crypto/mpi/mpi-pow.o
AR drivers/pnp/built-in.a
CC net/ethtool/bitset.o
CC arch/x86/kernel/process_32.o
CC drivers/acpi/acpica/dswload2.o
CC lib/crypto/aes.o
AR fs/ramfs/built-in.a
CC drivers/dma/dw/acpi.o
CC kernel/printk/sysctl.o
CC kernel/dma/remap.o
CC fs/proc/cpuinfo.o
CC drivers/pci/search.o
CC net/ipv4/netfilter/iptable_filter.o
CC block/blk-stat.o
AR net/sched/built-in.a
CC kernel/power/user.o
CC net/netfilter/nf_sockopt.o
CC fs/hugetlbfs/inode.o
CC io_uring/uring_cmd.o
CC fs/fat/cache.o
CC kernel/irq/irqdomain.o
CC fs/isofs/namei.o
AR kernel/printk/built-in.a
CC fs/nfs/client.o
CC drivers/acpi/acpica/dswscope.o
CC lib/crypto/arc4.o
CC fs/exportfs/expfs.o
CC arch/x86/mm/highmem_32.o
CC arch/x86/kernel/apic/probe_32.o
CC arch/x86/events/intel/uncore_snbep.o
AR drivers/dma/amd/built-in.a
CC fs/nfs/dir.o
CC crypto/skcipher.o
CC kernel/irq/proc.o
CC drivers/acpi/acpica/dswstate.o
AR kernel/sched/built-in.a
AR sound/usb/misc/built-in.a
CC sound/core/hwdep.o
AR sound/usb/usx2y/built-in.a
CC sound/pci/hda/hda_sysfs.o
AR sound/firewire/built-in.a
CC kernel/module/tree_lookup.o
AR sound/usb/caiaq/built-in.a
AR kernel/dma/built-in.a
CC drivers/virtio/virtio.o
CC drivers/virtio/virtio_ring.o
AR sound/usb/6fire/built-in.a
CC lib/crypto/mpi/mpiutil.o
CC fs/proc/devices.o
CC sound/core/timer.o
AR sound/usb/hiface/built-in.a
CC security/selinux/ss/ebitmap.o
AR sound/usb/bcd2000/built-in.a
AR drivers/dma/dw/built-in.a
AR sound/usb/built-in.a
AR drivers/dma/mediatek/built-in.a
CC lib/crypto/gf128mul.o
AR drivers/dma/qcom/built-in.a
CC fs/proc/interrupts.o
CC security/selinux/ss/hashtab.o
AR drivers/dma/stm32/built-in.a
AR drivers/dma/ti/built-in.a
AR drivers/dma/xilinx/built-in.a
CC drivers/dma/dmaengine.o
CC drivers/virtio/virtio_anchor.o
CC net/ethtool/strset.o
CC block/blk-mq-sysfs.o
CC sound/core/hrtimer.o
AR arch/x86/kernel/apic/built-in.a
CC lib/buildid.o
CC fs/ext4/extents.o
CC net/xfrm/xfrm_policy.o
CC mm/util.o
CC drivers/acpi/acpica/evevent.o
CC kernel/power/poweroff.o
CC fs/isofs/inode.o
AR fs/exportfs/built-in.a
CC arch/x86/events/intel/uncore_discovery.o
AR arch/x86/mm/built-in.a
CC fs/netfs/misc.o
AR sound/sparc/built-in.a
CC drivers/dma/virt-dma.o
CC net/netfilter/utils.o
CC sound/core/pcm.o
CC net/ipv4/netfilter/iptable_mangle.o
CC fs/fat/dir.o
CC kernel/module/kallsyms.o
AR sound/pci/mixart/built-in.a
CC net/ethtool/linkinfo.o
CC arch/x86/events/intel/cstate.o
CC kernel/time/time.o
CC fs/proc/loadavg.o
AR lib/crypto/mpi/built-in.a
CC kernel/futex/core.o
CC lib/crypto/blake2s.o
AR kernel/power/built-in.a
CC lib/clz_tab.o
CC net/ipv4/inetpeer.o
CC sound/pci/hda/hda_controller.o
CC drivers/virtio/virtio_pci_modern_dev.o
CC fs/proc/meminfo.o
CC fs/isofs/dir.o
CC fs/lockd/clntlock.o
CC arch/x86/kernel/cpu/match.o
CC drivers/acpi/acpica/evgpe.o
CC net/netfilter/nfnetlink.o
CC io_uring/openclose.o
CC kernel/irq/migration.o
CC fs/lockd/clntproc.o
CC security/selinux/ss/symtab.o
CC drivers/pci/rom.o
CC crypto/seqiv.o
CC lib/crypto/blake2s-generic.o
CC net/core/sysctl_net_core.o
CC block/blk-mq-cpumap.o
AR fs/hugetlbfs/built-in.a
CC drivers/acpi/x86/apple.o
CC fs/nfs/file.o
CC drivers/acpi/tables.o
CC arch/x86/kernel/cpu/bugs.o
CC arch/x86/kernel/cpu/aperfmperf.o
CC security/selinux/ss/sidtab.o
CC drivers/acpi/acpica/evgpeblk.o
CC fs/isofs/util.o
CC kernel/irq/cpuhotplug.o
CC kernel/module/procfs.o
CC drivers/dma/acpi-dma.o
CC kernel/module/sysfs.o
CC drivers/virtio/virtio_pci_legacy_dev.o
CC fs/netfs/objects.o
CC fs/proc/stat.o
CC sound/pci/hda/hda_proc.o
CC fs/isofs/rock.o
CC sound/core/pcm_native.o
CC fs/ext4/extents_status.o
CC net/ipv4/protocol.o
CC drivers/pci/setup-res.o
CC kernel/futex/syscalls.o
CC mm/mmzone.o
CC lib/crypto/sha1.o
CC net/ethtool/linkmodes.o
CC net/ipv4/netfilter/ipt_REJECT.o
CC kernel/time/timer.o
AR fs/jbd2/built-in.a
CC lib/cmdline.o
CC drivers/tty/vt/vt_ioctl.o
CC drivers/char/hw_random/core.o
AR drivers/iommu/amd/built-in.a
CC crypto/echainiv.o
CC drivers/acpi/acpica/evgpeinit.o
AR drivers/iommu/intel/built-in.a
AR drivers/iommu/arm/arm-smmu/built-in.a
CC drivers/acpi/x86/cmos_rtc.o
AR drivers/iommu/arm/arm-smmu-v3/built-in.a
AR drivers/iommu/arm/built-in.a
AR drivers/iommu/iommufd/built-in.a
CC io_uring/sqpoll.o
CC drivers/tty/hvc/hvc_console.o
AR drivers/iommu/riscv/built-in.a
CC fs/proc/uptime.o
CC drivers/iommu/iommu.o
CC block/blk-mq-sched.o
CC crypto/ahash.o
CC arch/x86/kernel/signal.o
CC block/ioctl.o
CC drivers/iommu/iommu-traces.o
CC io_uring/xattr.o
CC lib/crypto/sha256.o
CC drivers/char/agp/backend.o
CC net/netfilter/nfnetlink_log.o
AR arch/x86/events/intel/built-in.a
CC drivers/virtio/virtio_pci_modern.o
AR arch/x86/events/built-in.a
CC fs/fat/fatent.o
CC drivers/acpi/acpica/evgpeutil.o
CC drivers/char/agp/generic.o
CC kernel/irq/pm.o
CC mm/vmstat.o
CC net/core/dev.o
CC net/xfrm/xfrm_state.o
AR drivers/dma/built-in.a
CC security/selinux/ss/avtab.o
AR kernel/module/built-in.a
CC arch/x86/kernel/signal_32.o
AR drivers/gpu/host1x/built-in.a
CC drivers/pci/irq.o
AR drivers/gpu/drm/tests/built-in.a
AR drivers/gpu/drm/arm/built-in.a
CC drivers/pci/vpd.o
AR drivers/gpu/drm/clients/built-in.a
CC drivers/acpi/x86/lpss.o
CC drivers/gpu/drm/display/drm_display_helper_mod.o
CC fs/netfs/read_collect.o
CC fs/lockd/clntxdr.o
CC fs/proc/util.o
CC fs/isofs/export.o
CC drivers/char/hw_random/intel-rng.o
CC fs/ext4/file.o
CC kernel/futex/pi.o
CC drivers/gpu/drm/ttm/ttm_tt.o
CC drivers/iommu/iommu-sysfs.o
CC drivers/acpi/acpica/evglock.o
AR lib/crypto/built-in.a
CC lib/cpumask.o
CC net/ethtool/rss.o
CC sound/pci/hda/hda_hwdep.o
CC [M] net/ipv4/netfilter/iptable_nat.o
AR drivers/tty/hvc/built-in.a
CC fs/nls/nls_base.o
CC drivers/connector/cn_queue.o
CC drivers/base/power/sysfs.o
CC drivers/tty/vt/vc_screen.o
CC drivers/gpu/drm/display/drm_dp_dual_mode_helper.o
CC drivers/block/loop.o
CC fs/netfs/read_pgpriv2.o
CC drivers/virtio/virtio_pci_common.o
AR kernel/rcu/built-in.a
CC net/ethtool/linkstate.o
CC kernel/irq/msi.o
CC arch/x86/kernel/cpu/cpuid-deps.o
CC crypto/shash.o
CC drivers/acpi/acpica/evhandler.o
CC block/genhd.o
CC net/ethtool/debug.o
CC fs/proc/version.o
CC drivers/connector/connector.o
CC sound/pci/hda/hda_intel.o
CC fs/lockd/host.o
CC fs/isofs/joliet.o
CC drivers/acpi/x86/s2idle.o
CC fs/nfs/getroot.o
CC fs/nls/nls_cp437.o
CC drivers/char/hw_random/amd-rng.o
CC drivers/acpi/acpica/evmisc.o
CC drivers/char/agp/isoch.o
CC lib/ctype.o
CC drivers/pci/setup-bus.o
CC lib/dec_and_lock.o
CC kernel/futex/requeue.o
CC arch/x86/kernel/cpu/umwait.o
CC io_uring/nop.o
CC drivers/base/power/generic_ops.o
CC fs/fat/file.o
CC drivers/gpu/drm/display/drm_dp_helper.o
CC drivers/gpu/drm/i915/i915_config.o
CC security/selinux/ss/policydb.o
CC drivers/gpu/drm/ttm/ttm_bo.o
CC lib/decompress.o
CC kernel/time/hrtimer.o
CC net/netfilter/nf_conntrack_core.o
CC lib/decompress_bunzip2.o
CC fs/proc/softirqs.o
CC drivers/gpu/drm/i915/i915_driver.o
CC fs/nls/nls_ascii.o
CC drivers/acpi/acpica/evregion.o
CC mm/backing-dev.o
AR fs/unicode/built-in.a
CC security/selinux/ss/services.o
CC drivers/tty/vt/selection.o
CC net/xfrm/xfrm_hash.o
CC drivers/tty/serial/8250/8250_core.o
AR net/ipv4/netfilter/built-in.a
CC kernel/cgroup/cgroup.o
CC drivers/base/firmware_loader/builtin/main.o
CC drivers/gpu/drm/i915/i915_drm_client.o
CC drivers/iommu/dma-iommu.o
CC fs/netfs/read_retry.o
CC drivers/base/firmware_loader/main.o
CC fs/isofs/compress.o
CC fs/fat/inode.o
CC drivers/virtio/virtio_pci_legacy.o
CC drivers/base/power/common.o
CC net/ipv4/ip_input.o
CC drivers/char/hw_random/geode-rng.o
CC sound/core/pcm_lib.o
CC crypto/akcipher.o
AR drivers/gpu/vga/built-in.a
CC drivers/virtio/virtio_pci_admin_legacy_io.o
CC net/ethtool/wol.o
CC fs/nls/nls_iso8859-1.o
CC drivers/char/agp/amd64-agp.o
MKCAP arch/x86/kernel/cpu/capflags.c
CC kernel/futex/waitwake.o
CC kernel/irq/affinity.o
CC drivers/acpi/acpica/evrgnini.o
AR drivers/base/firmware_loader/builtin/built-in.a
CC drivers/virtio/virtio_input.o
CC drivers/connector/cn_proc.o
CC drivers/acpi/x86/utils.o
CC fs/proc/namespaces.o
CC io_uring/fs.o
CC fs/ext4/fsmap.o
CC block/ioprio.o
CC fs/nfs/inode.o
CC block/badblocks.o
CC fs/nls/nls_utf8.o
CC lib/decompress_inflate.o
CC fs/lockd/svc.o
CC drivers/block/virtio_blk.o
CC drivers/base/power/qos.o
CC drivers/char/agp/intel-agp.o
CC drivers/tty/vt/keyboard.o
CC drivers/acpi/acpica/evsci.o
CC drivers/gpu/drm/ttm/ttm_bo_util.o
CC drivers/char/agp/intel-gtt.o
CC kernel/irq/matrix.o
CC drivers/char/hw_random/via-rng.o
CC io_uring/splice.o
AR fs/isofs/built-in.a
AR drivers/tty/ipwireless/built-in.a
CC crypto/sig.o
AR sound/pci/hda/built-in.a
AR sound/pci/nm256/built-in.a
AR sound/pci/oxygen/built-in.a
AR sound/pci/pcxhr/built-in.a
AR sound/pci/riptide/built-in.a
AR fs/nls/built-in.a
CC mm/mm_init.o
CC drivers/tty/serial/8250/8250_platform.o
AR sound/pci/rme9652/built-in.a
CC drivers/tty/serial/8250/8250_pnp.o
CC drivers/acpi/x86/blacklist.o
AR sound/pci/trident/built-in.a
AR sound/pci/ymfpci/built-in.a
AR drivers/base/firmware_loader/built-in.a
AR sound/pci/vx222/built-in.a
CC fs/netfs/read_single.o
AR kernel/futex/built-in.a
AR sound/pci/built-in.a
CC net/ipv4/ip_fragment.o
CC block/blk-rq-qos.o
CC drivers/tty/serial/8250/8250_rsa.o
CC drivers/gpu/drm/display/drm_dp_mst_topology.o
CC drivers/acpi/acpica/evxface.o
CC drivers/gpu/drm/display/drm_dsc_helper.o
CC drivers/virtio/virtio_dma_buf.o
CC lib/decompress_unlz4.o
CC net/core/dev_addr_lists.o
CC net/ethtool/features.o
AR drivers/char/hw_random/built-in.a
CC drivers/gpu/drm/display/drm_hdcp_helper.o
CC drivers/pci/vc.o
CC kernel/time/sleep_timeout.o
CC fs/proc/self.o
CC drivers/pci/mmap.o
CC drivers/gpu/drm/display/drm_hdmi_helper.o
CC drivers/gpu/drm/i915/i915_getparam.o
CC drivers/iommu/iova.o
CC drivers/acpi/acpica/evxfevnt.o
CC drivers/tty/serial/8250/8250_port.o
CC net/xfrm/xfrm_input.o
AR drivers/acpi/x86/built-in.a
AR drivers/connector/built-in.a
CC kernel/trace/trace_clock.o
CC lib/decompress_unlzma.o
CC drivers/tty/vt/vt.o
CC fs/fat/misc.o
CC kernel/time/timekeeping.o
CC fs/netfs/rolling_buffer.o
CC net/ipv4/ip_forward.o
CC io_uring/sync.o
CC fs/ext4/fsync.o
CC crypto/kpp.o
CC fs/nfs/super.o
CC drivers/misc/eeprom/eeprom_93cx6.o
AR drivers/virtio/built-in.a
CC kernel/time/ntp.o
CC drivers/gpu/drm/i915/i915_ioctl.o
AR drivers/char/agp/built-in.a
CC fs/proc/thread_self.o
CC drivers/char/mem.o
CC sound/core/pcm_misc.o
CC drivers/base/power/runtime.o
CC drivers/gpu/drm/ttm/ttm_bo_vm.o
AR drivers/block/built-in.a
CC kernel/trace/ring_buffer.o
CC fs/lockd/svclock.o
CC block/disk-events.o
CC drivers/acpi/acpica/evxfgpe.o
CC drivers/pci/devres.o
CC net/xfrm/xfrm_output.o
CC net/xfrm/xfrm_sysctl.o
AR sound/spi/built-in.a
CC fs/proc/proc_sysctl.o
CC net/ipv4/ip_options.o
AR kernel/irq/built-in.a
CC net/xfrm/xfrm_replay.o
CC net/core/dst.o
CC kernel/bpf/core.o
CC arch/x86/kernel/traps.o
CC drivers/pci/proc.o
AR drivers/misc/eeprom/built-in.a
CC net/netfilter/nf_conntrack_standalone.o
AR drivers/misc/cb710/built-in.a
AR drivers/misc/lis3lv02d/built-in.a
AR drivers/misc/cardreader/built-in.a
CC net/ethtool/privflags.o
AR drivers/misc/keba/built-in.a
AR drivers/misc/built-in.a
CC lib/decompress_unlzo.o
CC fs/lockd/svcshare.o
CC drivers/gpu/drm/display/drm_scdc_helper.o
AR drivers/iommu/built-in.a
CC block/blk-ia-ranges.o
CC mm/percpu.o
CC drivers/tty/serial/serial_core.o
CC mm/slab_common.o
CC fs/nfs/io.o
CC drivers/acpi/acpica/evxfregn.o
CC drivers/base/regmap/regmap.o
CC fs/fat/nfs.o
CC sound/core/pcm_memory.o
CC io_uring/msg_ring.o
ASN.1 crypto/rsapubkey.asn1.[ch]
ASN.1 crypto/rsaprivkey.asn1.[ch]
CC crypto/rsa.o
CC fs/netfs/write_collect.o
CC mm/compaction.o
CC drivers/acpi/osi.o
CC drivers/gpu/drm/ttm/ttm_module.o
CC security/selinux/ss/conditional.o
CC drivers/char/random.o
CC sound/core/memalloc.o
CC drivers/gpu/drm/i915/i915_irq.o
CC drivers/acpi/acpica/exconcat.o
CC lib/decompress_unxz.o
CC drivers/base/power/wakeirq.o
CC crypto/rsa_helper.o
CC drivers/pci/pci-sysfs.o
CC drivers/base/power/main.o
CC fs/ext4/hash.o
CC fs/ext4/ialloc.o
CC block/early-lookup.o
CC drivers/gpu/drm/ttm/ttm_execbuf_util.o
CC fs/autofs/init.o
CC fs/nfs/direct.o
CC drivers/acpi/acpica/exconfig.o
CC fs/autofs/inode.o
CC kernel/time/clocksource.o
CC net/unix/af_unix.o
CC block/bounce.o
CC fs/fat/namei_vfat.o
CC net/packet/af_packet.o
CC net/ipv6/netfilter/ip6_tables.o
CC fs/proc/proc_net.o
CC net/ethtool/rings.o
CC net/ipv6/netfilter/ip6table_filter.o
CC drivers/tty/tty_io.o
CC net/ipv4/ip_output.o
CC net/netfilter/nf_conntrack_expect.o
CC drivers/tty/serial/8250/8250_dma.o
CC crypto/rsa-pkcs1pad.o
CC net/xfrm/xfrm_device.o
CC net/ipv6/netfilter/ip6table_mangle.o
CC net/unix/garbage.o
CC io_uring/advise.o
CC fs/lockd/svcproc.o
CC lib/decompress_unzstd.o
CC fs/lockd/svcsubs.o
CC sound/core/pcm_timer.o
CC drivers/acpi/acpica/exconvrt.o
CC drivers/gpu/drm/ttm/ttm_range_manager.o
CC fs/netfs/write_issue.o
CC fs/lockd/mon.o
AR sound/parisc/built-in.a
CC drivers/gpu/drm/i915/i915_mitigations.o
CC net/core/netevent.o
CC security/selinux/ss/mls.o
CC fs/autofs/root.o
CC lib/dump_stack.o
CC drivers/acpi/acpica/excreate.o
COPY drivers/tty/vt/defkeymap.c
CC fs/proc/kcore.o
CC drivers/tty/vt/consolemap.o
CC drivers/char/misc.o
AR drivers/gpu/drm/display/built-in.a
CC net/core/neighbour.o
CC kernel/time/jiffies.o
CC lib/earlycpio.o
CC crypto/rsassa-pkcs1.o
CC drivers/tty/serial/8250/8250_dwlib.o
CC sound/core/seq_device.o
CC kernel/cgroup/rstat.o
CC drivers/pci/slot.o
CC io_uring/epoll.o
CC block/bsg.o
CC net/unix/sysctl_net_unix.o
CC drivers/gpu/drm/ttm/ttm_resource.o
CC net/ethtool/channels.o
CC drivers/acpi/acpica/exdebug.o
CC net/xfrm/xfrm_nat_keepalive.o
CC net/xfrm/xfrm_algo.o
CC fs/fat/namei_msdos.o
CC net/xfrm/xfrm_user.o
CC kernel/time/timer_list.o
CC net/core/rtnetlink.o
CC fs/netfs/write_retry.o
CC net/core/utils.o
CC lib/extable.o
CC kernel/trace/trace.o
CC net/core/link_watch.o
CC net/ipv6/netfilter/nf_defrag_ipv6_hooks.o
CC drivers/char/virtio_console.o
CC net/ipv4/ip_sockglue.o
CC net/netfilter/nf_conntrack_helper.o
CC fs/lockd/trace.o
CC drivers/gpu/drm/i915/i915_module.o
CC drivers/base/power/wakeup.o
AR kernel/bpf/built-in.a
CC drivers/char/hpet.o
AR sound/core/built-in.a
AR sound/pcmcia/vx/built-in.a
AR sound/pcmcia/pdaudiocf/built-in.a
CC drivers/acpi/acpica/exdump.o
AR sound/pcmcia/built-in.a
CC crypto/acompress.o
AR sound/mips/built-in.a
AR sound/soc/built-in.a
AR sound/atmel/built-in.a
CC drivers/tty/serial/8250/8250_pcilib.o
CC sound/hda/hda_bus_type.o
CC sound/hda/hdac_bus.o
CC fs/autofs/symlink.o
AR net/dsa/built-in.a
CC drivers/char/nvram.o
CC block/blk-cgroup.o
HOSTCC drivers/tty/vt/conmakehash
CC fs/proc/vmcore.o
CC io_uring/statx.o
CC drivers/tty/serial/serial_base_bus.o
CC drivers/base/regmap/regcache.o
CC drivers/pci/pci-acpi.o
AR drivers/gpu/drm/renesas/rcar-du/built-in.a
CC lib/flex_proportions.o
AR drivers/gpu/drm/renesas/rz-du/built-in.a
AR drivers/gpu/drm/renesas/built-in.a
CC mm/show_mem.o
CC drivers/gpu/drm/ttm/ttm_pool.o
CC fs/nfs/pagelist.o
CC fs/ext4/indirect.o
CC security/selinux/ss/context.o
CC drivers/acpi/acpica/exfield.o
CC drivers/acpi/acpica/exfldio.o
CC drivers/tty/vt/defkeymap.o
CC kernel/time/timeconv.o
AR sound/x86/built-in.a
CC drivers/acpi/osl.o
CC kernel/cgroup/namespace.o
CC net/ethtool/coalesce.o
CONMK drivers/tty/vt/consolemap_deftbl.c
CC drivers/tty/vt/consolemap_deftbl.o
AR drivers/tty/vt/built-in.a
CC lib/idr.o
CC lib/iomem_copy.o
AR fs/netfs/built-in.a
CC lib/irq_regs.o
CC mm/interval_tree.o
AR fs/fat/built-in.a
CC drivers/tty/serial/8250/8250_early.o
AR net/unix/built-in.a
CC arch/x86/kernel/idt.o
CC drivers/pci/iomap.o
AR drivers/gpu/drm/omapdrm/built-in.a
CC kernel/time/timecounter.o
CC drivers/base/component.o
AR drivers/base/test/built-in.a
CC kernel/trace/trace_output.o
CC fs/autofs/waitq.o
CC fs/proc/kmsg.o
CC block/blk-ioprio.o
CC kernel/time/alarmtimer.o
CC drivers/gpu/drm/ttm/ttm_device.o
CC drivers/base/regmap/regcache-rbtree.o
CC sound/hda/hdac_device.o
CC crypto/scompress.o
CC drivers/gpu/drm/i915/i915_params.o
CC security/selinux/netlabel.o
CC drivers/acpi/acpica/exmisc.o
CC arch/x86/kernel/cpu/powerflags.o
CC drivers/tty/serial/serial_ctrl.o
CC net/ipv6/netfilter/nf_conntrack_reasm.o
CC io_uring/timeout.o
CC kernel/trace/trace_seq.o
CC drivers/base/core.o
CC arch/x86/kernel/cpu/topology.o
CC crypto/algboss.o
CC fs/lockd/xdr.o
CC drivers/base/power/wakeup_stats.o
CC kernel/cgroup/cgroup-v1.o
CC lib/is_single_threaded.o
CC drivers/acpi/acpica/exmutex.o
AR drivers/mfd/built-in.a
CC drivers/pci/quirks.o
CC block/blk-iolatency.o
CC fs/9p/vfs_super.o
AR drivers/char/built-in.a
CC net/netfilter/nf_conntrack_proto.o
CC drivers/acpi/utils.o
CC fs/nfs/read.o
CC kernel/time/posix-timers.o
CC fs/lockd/clnt4xdr.o
CC fs/proc/page.o
CC drivers/tty/serial/8250/8250_exar.o
CC drivers/base/bus.o
CC fs/ext4/inline.o
CC net/ipv4/inet_hashtables.o
CC lib/klist.o
CC mm/list_lru.o
CC fs/9p/vfs_inode.o
CC drivers/base/regmap/regcache-flat.o
CC fs/nfs/symlink.o
CC arch/x86/kernel/irq.o
CC kernel/time/posix-cpu-timers.o
CC arch/x86/kernel/cpu/proc.o
CC drivers/gpu/drm/ttm/ttm_sys_manager.o
CC drivers/acpi/acpica/exnames.o
CC drivers/base/power/trace.o
CC fs/autofs/expire.o
AR net/packet/built-in.a
CC net/ipv4/inet_timewait_sock.o
CC net/core/filter.o
CC arch/x86/kernel/cpu/feat_ctl.o
AR drivers/gpu/drm/tilcdc/built-in.a
CC fs/nfs/unlink.o
CC drivers/acpi/acpica/exoparg1.o
CC net/ethtool/pause.o
CC drivers/gpu/drm/i915/i915_pci.o
CC lib/kobject.o
CC sound/hda/hdac_sysfs.o
CC crypto/testmgr.o
CC drivers/gpu/drm/i915/i915_scatterlist.o
AR drivers/nfc/built-in.a
CC drivers/acpi/acpica/exoparg2.o
CC net/ethtool/eee.o
CC fs/autofs/dev-ioctl.o
CC io_uring/fdinfo.o
CC drivers/gpu/drm/ttm/ttm_backup.o
AR fs/proc/built-in.a
CC io_uring/cancel.o
CC drivers/base/regmap/regcache-maple.o
CC net/netfilter/nf_conntrack_proto_generic.o
CC net/netfilter/nf_conntrack_proto_tcp.o
CC crypto/cmac.o
AR security/selinux/built-in.a
AR security/built-in.a
CC kernel/cgroup/freezer.o
CC fs/nfs/write.o
CC drivers/pci/pci-label.o
AR net/xfrm/built-in.a
CC arch/x86/kernel/cpu/intel.o
CC block/blk-iocost.o
CC sound/hda/hdac_regmap.o
CC net/ipv4/inet_connection_sock.o
CC mm/workingset.o
CC drivers/tty/serial/8250/8250_lpss.o
CC net/ipv6/netfilter/nf_reject_ipv6.o
AR drivers/base/power/built-in.a
CC fs/lockd/xdr4.o
CC kernel/events/core.o
CC drivers/acpi/acpica/exoparg3.o
CC fs/ext4/inode.o
CC kernel/fork.o
CC crypto/hmac.o
CC lib/kobject_uevent.o
CC net/ipv4/tcp.o
CC drivers/gpu/drm/ttm/ttm_agp_backend.o
CC net/ipv6/af_inet6.o
CC drivers/tty/serial/serial_port.o
CC drivers/gpu/drm/virtio/virtgpu_drv.o
CC drivers/tty/serial/earlycon.o
CC fs/9p/vfs_inode_dotl.o
CC kernel/time/posix-clock.o
CC drivers/base/regmap/regmap-debugfs.o
CC net/sunrpc/auth_gss/auth_gss.o
CC net/sunrpc/clnt.o
CC drivers/acpi/acpica/exoparg6.o
CC block/mq-deadline.o
CC drivers/gpu/drm/i915/i915_switcheroo.o
CC kernel/events/ring_buffer.o
AR fs/autofs/built-in.a
CC drivers/pci/vgaarb.o
CC net/netfilter/nf_conntrack_proto_udp.o
CC arch/x86/kernel/cpu/tsx.o
CC fs/9p/vfs_addr.o
CC arch/x86/kernel/irq_32.o
CC net/ethtool/tsinfo.o
CC io_uring/waitid.o
CC drivers/tty/n_tty.o
CC kernel/exec_domain.o
CC sound/hda/hdac_controller.o
CC drivers/tty/serial/8250/8250_mid.o
CC mm/debug.o
CC crypto/crypto_null.o
CC net/sunrpc/auth_gss/gss_mech_switch.o
CC kernel/cgroup/legacy_freezer.o
CC drivers/acpi/acpica/exprep.o
AR drivers/gpu/drm/ttm/built-in.a
CC drivers/base/dd.o
AR drivers/dax/hmem/built-in.a
AR drivers/dax/built-in.a
CC fs/lockd/svc4proc.o
CC drivers/gpu/drm/i915/i915_sysfs.o
CC net/ipv6/anycast.o
CC arch/x86/kernel/cpu/intel_epb.o
CC lib/logic_pio.o
CC drivers/gpu/drm/virtio/virtgpu_kms.o
AR sound/xen/built-in.a
CC block/kyber-iosched.o
CC kernel/time/itimer.o
AR fs/hostfs/built-in.a
AR drivers/base/regmap/built-in.a
CC block/blk-mq-debugfs.o
CC kernel/trace/trace_stat.o
CC drivers/acpi/acpica/exregion.o
CC fs/9p/vfs_file.o
CC net/core/sock_diag.o
CC kernel/panic.o
CC drivers/tty/tty_ioctl.o
CC fs/ext4/ioctl.o
CC arch/x86/kernel/cpu/amd.o
CC kernel/time/clockevents.o
CC net/ipv6/netfilter/ip6t_ipv6header.o
CC drivers/dma-buf/dma-buf.o
CC lib/maple_tree.o
CC crypto/md5.o
CC drivers/tty/serial/8250/8250_pci.o
CC net/ipv6/netfilter/ip6t_REJECT.o
AR drivers/gpu/drm/imx/built-in.a
CC drivers/dma-buf/dma-fence.o
CC kernel/cpu.o
CC kernel/cgroup/pids.o
CC io_uring/register.o
CC sound/hda/hdac_stream.o
CC mm/gup.o
CC drivers/acpi/acpica/exresnte.o
CC kernel/exit.o
AR drivers/pci/built-in.a
CC drivers/acpi/acpica/exresolv.o
CC kernel/softirq.o
CC drivers/dma-buf/dma-fence-array.o
CC net/ethtool/cabletest.o
CC net/netfilter/nf_conntrack_proto_icmp.o
CC drivers/base/syscore.o
CC net/netfilter/nf_conntrack_extend.o
CC drivers/gpu/drm/virtio/virtgpu_gem.o
CC drivers/gpu/drm/i915/i915_utils.o
CC fs/debugfs/inode.o
CC crypto/sha256_generic.o
CC kernel/trace/trace_printk.o
AR sound/virtio/built-in.a
CC fs/9p/vfs_dir.o
AR drivers/gpu/drm/panel/built-in.a
AR drivers/gpu/drm/bridge/analogix/built-in.a
AR net/wireless/tests/built-in.a
AR drivers/gpu/drm/bridge/cadence/built-in.a
CC net/wireless/core.o
AR drivers/gpu/drm/bridge/imx/built-in.a
CC drivers/acpi/acpica/exresop.o
CC fs/debugfs/file.o
AR drivers/gpu/drm/bridge/synopsys/built-in.a
AR drivers/gpu/drm/bridge/built-in.a
CC fs/lockd/procfs.o
CC kernel/time/tick-common.o
CC kernel/time/tick-broadcast.o
CC kernel/time/tick-broadcast-hrtimer.o
CC drivers/acpi/acpica/exserial.o
CC kernel/time/tick-oneshot.o
CC kernel/cgroup/rdma.o
CC lib/memcat_p.o
CC drivers/acpi/reboot.o
AR drivers/gpu/drm/hisilicon/built-in.a
CC sound/sound_core.o
CC arch/x86/kernel/cpu/hygon.o
CC fs/nfs/namespace.o
CC mm/mmap_lock.o
CC net/sunrpc/auth_gss/svcauth_gss.o
CC fs/9p/vfs_dentry.o
CC drivers/base/driver.o
CC kernel/trace/pid_list.o
CC drivers/acpi/acpica/exstore.o
CC net/netfilter/nf_conntrack_acct.o
CC crypto/sha512_generic.o
CC net/ipv6/ip6_output.o
CC sound/hda/array.o
CC net/wireless/sysfs.o
CC block/blk-pm.o
CC arch/x86/kernel/dumpstack_32.o
AR net/ipv6/netfilter/built-in.a
CC fs/9p/v9fs.o
CC drivers/dma-buf/dma-fence-chain.o
CC fs/ext4/mballoc.o
CC kernel/events/callchain.o
CC drivers/gpu/drm/virtio/virtgpu_vram.o
CC drivers/base/class.o
CC arch/x86/kernel/cpu/centaur.o
CC net/wireless/radiotap.o
AR fs/lockd/built-in.a
CC fs/nfs/mount_clnt.o
CC drivers/tty/serial/8250/8250_pericom.o
CC block/holder.o
CC kernel/cgroup/cpuset.o
CC drivers/gpu/drm/i915/intel_clock_gating.o
CC net/core/dev_ioctl.o
CC net/ethtool/tunnels.o
CC kernel/resource.o
CC crypto/sha3_generic.o
CC drivers/acpi/acpica/exstoren.o
CC kernel/sysctl.o
CC net/ipv4/tcp_input.o
CC net/sunrpc/auth_gss/gss_rpc_upcall.o
CC net/core/tso.o
CC kernel/time/tick-sched.o
CC net/wireless/util.o
CC io_uring/truncate.o
CC arch/x86/kernel/time.o
CC net/core/sock_reuseport.o
CC arch/x86/kernel/cpu/transmeta.o
CC sound/hda/hdmi_chmap.o
AR fs/debugfs/built-in.a
CC mm/highmem.o
CC net/ethtool/fec.o
CC drivers/dma-buf/dma-fence-unwrap.o
CC net/ethtool/eeprom.o
CC drivers/acpi/acpica/exstorob.o
CC sound/hda/trace.o
AR drivers/gpu/drm/mxsfb/built-in.a
CC fs/9p/fid.o
CC kernel/trace/trace_sched_switch.o
CC drivers/gpu/drm/virtio/virtgpu_display.o
CC crypto/ecb.o
CC sound/last.o
CC net/sunrpc/xprt.o
CC mm/memory.o
AR block/built-in.a
CC kernel/time/timer_migration.o
AR drivers/cxl/core/built-in.a
AR drivers/cxl/built-in.a
CC fs/nfs/nfstrace.o
CC fs/ext4/migrate.o
CC drivers/base/platform.o
CC net/netfilter/nf_conntrack_seqadj.o
AR drivers/tty/serial/8250/built-in.a
AR drivers/tty/serial/built-in.a
CC drivers/tty/tty_ldisc.o
CC drivers/tty/tty_buffer.o
CC fs/tracefs/inode.o
CC drivers/acpi/acpica/exsystem.o
CC net/core/fib_notifier.o
CC drivers/dma-buf/dma-resv.o
CC net/sunrpc/auth_gss/gss_rpc_xdr.o
CC arch/x86/kernel/cpu/zhaoxin.o
CC fs/9p/xattr.o
CC crypto/cbc.o
CC drivers/macintosh/mac_hid.o
CC io_uring/memmap.o
CC drivers/acpi/acpica/extrace.o
AR net/mac80211/tests/built-in.a
CC kernel/time/vsyscall.o
CC net/mac80211/main.o
CC drivers/gpu/drm/i915/intel_cpu_info.o
CC kernel/trace/trace_nop.o
CC arch/x86/kernel/ioport.o
CC net/core/xdp.o
CC arch/x86/kernel/cpu/vortex.o
CC drivers/acpi/nvs.o
CC drivers/acpi/acpica/exutils.o
CC drivers/gpu/drm/i915/intel_device_info.o
CC drivers/gpu/drm/virtio/virtgpu_vq.o
CC drivers/acpi/wakeup.o
CC sound/hda/hdac_component.o
CC lib/nmi_backtrace.o
CC [M] fs/efivarfs/inode.o
CC net/sunrpc/auth_gss/trace.o
CC net/ethtool/stats.o
CC drivers/base/cpu.o
CC crypto/ctr.o
CC drivers/tty/tty_port.o
CC net/sunrpc/auth_gss/gss_krb5_mech.o
CC kernel/events/hw_breakpoint.o
CC net/sunrpc/socklib.o
CC lib/objpool.o
CC arch/x86/kernel/cpu/perfctr-watchdog.o
CC net/ethtool/phc_vclocks.o
CC sound/hda/hdac_i915.o
AR drivers/macintosh/built-in.a
CC fs/nfs/export.o
CC fs/tracefs/event_inode.o
AR fs/9p/built-in.a
CC drivers/acpi/acpica/hwacpi.o
CC kernel/events/uprobes.o
CC drivers/base/firmware.o
CC drivers/acpi/sleep.o
CC drivers/dma-buf/sync_file.o
CC mm/mincore.o
AR drivers/gpu/drm/tiny/built-in.a
CC io_uring/alloc_cache.o
CC fs/open.o
CC net/sunrpc/xprtsock.o
CC drivers/tty/tty_mutex.o
CC kernel/trace/blktrace.o
CC crypto/gcm.o
CC [M] fs/efivarfs/file.o
CC sound/hda/intel-dsp-config.o
CC net/netfilter/nf_conntrack_proto_icmpv6.o
CC kernel/cgroup/misc.o
CC kernel/cgroup/debug.o
CC arch/x86/kernel/dumpstack.o
CC drivers/acpi/acpica/hwesleep.o
CC io_uring/io-wq.o
CC drivers/gpu/drm/i915/intel_memory_region.o
CC fs/read_write.o
CC drivers/acpi/device_sysfs.o
CC kernel/time/timekeeping_debug.o
CC kernel/time/namespace.o
CC net/ipv6/ip6_input.o
CC net/ethtool/mm.o
CC arch/x86/kernel/cpu/vmware.o
CC drivers/base/init.o
CC fs/nfs/sysfs.o
AR drivers/dma-buf/built-in.a
CC net/ipv4/tcp_output.o
CC drivers/acpi/acpica/hwgpe.o
CC fs/ext4/mmp.o
CC drivers/tty/tty_ldsem.o
CC drivers/gpu/drm/virtio/virtgpu_fence.o
CC net/mac80211/status.o
CC [M] fs/efivarfs/super.o
CC mm/mlock.o
CC net/wireless/reg.o
AR fs/tracefs/built-in.a
CC fs/file_table.o
AR drivers/gpu/drm/xlnx/built-in.a
CC net/netfilter/nf_conntrack_netlink.o
CC mm/mmap.o
CC drivers/acpi/acpica/hwregs.o
CC net/ipv6/addrconf.o
CC sound/hda/intel-nhlt.o
CC net/ethtool/module.o
CC net/sunrpc/auth_gss/gss_krb5_seal.o
CC [M] fs/efivarfs/vars.o
AR kernel/cgroup/built-in.a
CC kernel/trace/trace_events.o
CC drivers/gpu/drm/i915/intel_pcode.o
CC net/netfilter/nf_conntrack_ftp.o
AR drivers/gpu/drm/gud/built-in.a
CC drivers/base/map.o
AR drivers/scsi/pcmcia/built-in.a
CC arch/x86/kernel/cpu/hypervisor.o
CC drivers/scsi/scsi.o
CC crypto/ccm.o
AR kernel/time/built-in.a
CC crypto/aes_generic.o
CC crypto/authenc.o
CC net/sunrpc/auth_gss/gss_krb5_unseal.o
CC drivers/tty/tty_baudrate.o
CC drivers/acpi/acpica/hwsleep.o
CC sound/hda/intel-sdw-acpi.o
CC arch/x86/kernel/cpu/mshyperv.o
CC drivers/acpi/acpica/hwvalid.o
CC drivers/tty/tty_jobctrl.o
CC arch/x86/kernel/nmi.o
CC drivers/gpu/drm/virtio/virtgpu_object.o
CC kernel/trace/trace_export.o
CC net/ipv6/addrlabel.o
CC net/core/flow_offload.o
CC drivers/base/devres.o
CC io_uring/futex.o
CC net/wireless/scan.o
CC drivers/gpu/drm/i915/intel_region_ttm.o
CC lib/plist.o
CC crypto/authencesn.o
AR drivers/nvme/common/built-in.a
CC arch/x86/kernel/cpu/debugfs.o
AR drivers/nvme/host/built-in.a
CC net/sunrpc/sched.o
AR drivers/nvme/target/built-in.a
LD [M] fs/efivarfs/efivarfs.o
AR drivers/nvme/built-in.a
CC drivers/tty/n_null.o
CC drivers/base/attribute_container.o
CC net/sunrpc/auth_gss/gss_krb5_wrap.o
AR kernel/events/built-in.a
CC fs/ext4/move_extent.o
CC fs/ext4/namei.o
CC drivers/acpi/acpica/hwxface.o
CC net/sunrpc/auth.o
AR sound/hda/built-in.a
AR sound/built-in.a
CC kernel/capability.o
CC arch/x86/kernel/ldt.o
CC net/ethtool/cmis_fw_update.o
CC net/ethtool/cmis_cdb.o
CC net/ipv4/tcp_timer.o
CC drivers/base/transport_class.o
AR drivers/gpu/drm/solomon/built-in.a
CC net/netfilter/nf_conntrack_irc.o
CC lib/radix-tree.o
CC drivers/acpi/device_pm.o
CC mm/mmu_gather.o
CC net/core/gro.o
CC drivers/acpi/acpica/hwxfsleep.o
CC fs/ext4/page-io.o
CC net/netlabel/netlabel_user.o
CC drivers/base/topology.o
CC fs/nfs/fs_context.o
CC drivers/gpu/drm/virtio/virtgpu_debugfs.o
CC drivers/tty/pty.o
CC drivers/gpu/drm/i915/intel_runtime_pm.o
CC net/netfilter/nf_conntrack_sip.o
CC fs/super.o
CC arch/x86/kernel/cpu/bus_lock.o
CC net/rfkill/core.o
CC net/netlabel/netlabel_kapi.o
CC kernel/ptrace.o
CC net/core/netdev-genl.o
CC drivers/scsi/hosts.o
CC net/wireless/nl80211.o
CC io_uring/napi.o
CC drivers/ata/libata-core.o
CC drivers/acpi/acpica/hwpci.o
AR drivers/net/phy/mediatek/built-in.a
AR drivers/net/phy/qcom/built-in.a
CC drivers/net/phy/realtek/realtek_main.o
CC crypto/lzo.o
AR drivers/net/pse-pd/built-in.a
CC net/sunrpc/auth_null.o
CC fs/nfs/nfsroot.o
CC net/sunrpc/auth_gss/gss_krb5_crypto.o
CC drivers/base/container.o
CC [M] drivers/gpu/drm/scheduler/sched_main.o
CC drivers/net/mdio/acpi_mdio.o
CC drivers/net/mdio/fwnode_mdio.o
CC kernel/user.o
CC mm/mprotect.o
CC drivers/firewire/init_ohci1394_dma.o
CC drivers/acpi/acpica/nsaccess.o
CC drivers/gpu/drm/virtio/virtgpu_plane.o
CC net/ethtool/pse-pd.o
CC net/mac80211/driver-ops.o
CC lib/ratelimit.o
CC fs/nfs/sysctl.o
CC drivers/tty/tty_audit.o
CC drivers/cdrom/cdrom.o
CC kernel/trace/trace_event_perf.o
CC fs/char_dev.o
HOSTCC drivers/gpu/drm/xe/xe_gen_wa_oob
CC net/wireless/mlme.o
CC drivers/base/property.o
CC lib/rbtree.o
AR drivers/net/pcs/built-in.a
CC drivers/net/phy/mdio-boardinfo.o
CC arch/x86/kernel/setup.o
CC arch/x86/kernel/cpu/capflags.o
AR arch/x86/kernel/cpu/built-in.a
CC crypto/lzo-rle.o
GEN xe_wa_oob.c xe_wa_oob.h
CC net/netlabel/netlabel_domainhash.o
CC net/rfkill/input.o
CC [M] drivers/gpu/drm/xe/xe_bb.o
CC drivers/scsi/scsi_ioctl.o
CC drivers/gpu/drm/virtio/virtgpu_ioctl.o
CC drivers/acpi/acpica/nsalloc.o
CC drivers/gpu/drm/i915/intel_sbi.o
CC net/netlabel/netlabel_addrlist.o
CC lib/seq_buf.o
AR drivers/firewire/built-in.a
CC net/9p/mod.o
CC net/core/netdev-genl-gen.o
CC [M] drivers/gpu/drm/scheduler/sched_fence.o
CC crypto/rng.o
AR drivers/net/mdio/built-in.a
CC fs/nfs/nfs3super.o
CC arch/x86/kernel/x86_init.o
CC arch/x86/kernel/i8259.o
CC drivers/tty/sysrq.o
AR drivers/auxdisplay/built-in.a
CC lib/siphash.o
CC kernel/trace/trace_events_filter.o
CC drivers/acpi/acpica/nsarguments.o
CC net/ipv4/tcp_ipv4.o
AR net/rfkill/built-in.a
CC drivers/net/phy/realtek/realtek_hwmon.o
CC net/netfilter/nf_nat_core.o
CC kernel/trace/trace_events_trigger.o
CC drivers/acpi/acpica/nsconvert.o
CC drivers/net/phy/stubs.o
AR io_uring/built-in.a
CC net/mac80211/sta_info.o
CC kernel/signal.o
CC net/mac80211/wep.o
CC mm/mremap.o
CC drivers/acpi/proc.o
CC net/ipv4/tcp_minisocks.o
CC net/ethtool/plca.o
CC net/sunrpc/auth_gss/gss_krb5_keys.o
CC drivers/base/cacheinfo.o
CC [M] drivers/gpu/drm/xe/xe_bo.o
CC net/netfilter/nf_nat_proto.o
CC arch/x86/kernel/irqinit.o
CC [M] drivers/gpu/drm/scheduler/sched_entity.o
CC net/9p/client.o
CC net/ipv6/route.o
CC kernel/sys.o
CC drivers/scsi/scsicam.o
CC lib/string.o
CC drivers/gpu/drm/virtio/virtgpu_prime.o
CC drivers/net/phy/mdio_devres.o
CC net/mac80211/aead_api.o
CC drivers/acpi/acpica/nsdump.o
CC kernel/trace/trace_eprobe.o
CC fs/stat.o
CC drivers/ata/libata-scsi.o
CC net/core/gso.o
CC lib/timerqueue.o
CC drivers/gpu/drm/i915/intel_step.o
CC drivers/gpu/drm/drm_atomic.o
CC crypto/drbg.o
CC fs/nfs/nfs3client.o
CC lib/union_find.o
CC lib/vsprintf.o
CC drivers/acpi/acpica/nseval.o
AR drivers/net/phy/realtek/built-in.a
CC fs/nfs/nfs3proc.o
CC net/netlabel/netlabel_mgmt.o
AR drivers/tty/built-in.a
AR drivers/net/ethernet/3com/built-in.a
CC kernel/umh.o
CC drivers/acpi/bus.o
CC drivers/net/ethernet/8390/ne2k-pci.o
CC fs/ext4/readpage.o
CC fs/nfs/nfs3xdr.o
AR drivers/cdrom/built-in.a
CC drivers/gpu/drm/virtio/virtgpu_trace_points.o
CC drivers/base/swnode.o
LD [M] drivers/gpu/drm/scheduler/gpu-sched.o
CC drivers/scsi/scsi_error.o
CC drivers/gpu/drm/virtio/virtgpu_submit.o
CC drivers/base/faux.o
CC drivers/base/auxiliary.o
CC arch/x86/kernel/jump_label.o
CC fs/nfs/nfs3acl.o
CC drivers/net/phy/phy.o
CC drivers/acpi/acpica/nsinit.o
CC net/ethtool/phy.o
CC crypto/jitterentropy.o
CC mm/msync.o
CC drivers/gpu/drm/drm_atomic_uapi.o
CC fs/exec.o
AR net/sunrpc/auth_gss/built-in.a
CC net/ipv6/ip6_fib.o
CC fs/ext4/resize.o
CC net/netfilter/nf_nat_helper.o
CC net/9p/error.o
CC drivers/pcmcia/cs.o
AR drivers/net/wireless/admtek/built-in.a
CC crypto/jitterentropy-kcapi.o
CC drivers/gpu/drm/i915/intel_uncore.o
AR drivers/net/wireless/ath/built-in.a
AR drivers/net/wireless/atmel/built-in.a
AR drivers/net/wireless/broadcom/built-in.a
AR drivers/net/wireless/intel/built-in.a
AR drivers/net/wireless/intersil/built-in.a
AR drivers/net/wireless/marvell/built-in.a
AR drivers/net/wireless/mediatek/built-in.a
AR drivers/net/wireless/microchip/built-in.a
CC [M] drivers/gpu/drm/xe/xe_bo_evict.o
CC drivers/acpi/acpica/nsload.o
AR drivers/net/wireless/purelifi/built-in.a
AR drivers/net/wireless/quantenna/built-in.a
AR drivers/net/wireless/ralink/built-in.a
CC net/core/net-sysfs.o
AR drivers/net/wireless/realtek/built-in.a
CC drivers/ata/libata-eh.o
AR drivers/net/wireless/rsi/built-in.a
CC net/mac80211/wpa.o
CC lib/win_minmax.o
AR drivers/net/wireless/silabs/built-in.a
AR drivers/net/wireless/st/built-in.a
AR drivers/net/wireless/ti/built-in.a
AR drivers/net/wireless/zydas/built-in.a
CC arch/x86/kernel/irq_work.o
CC kernel/trace/trace_kprobe.o
CC drivers/usb/common/common.o
AR drivers/net/wireless/virtual/built-in.a
AR drivers/net/wireless/built-in.a
CC drivers/gpu/drm/i915/intel_uncore_trace.o
CC crypto/ghash-generic.o
CC crypto/hash_info.o
CC drivers/acpi/acpica/nsnames.o
CC drivers/input/serio/serio.o
CC drivers/input/serio/i8042.o
CC arch/x86/kernel/probe_roms.o
AR drivers/gpu/drm/virtio/built-in.a
CC arch/x86/kernel/sys_ia32.o
CC net/ipv6/ipv6_sockglue.o
CC drivers/base/devtmpfs.o
CC drivers/net/ethernet/8390/8390.o
CC mm/page_vma_mapped.o
CC net/9p/protocol.o
CC drivers/ata/libata-transport.o
CC drivers/scsi/scsi_lib.o
CC net/core/hotdata.o
CC net/netlabel/netlabel_unlabeled.o
CC fs/ext4/super.o
CC drivers/gpu/drm/i915/intel_wakeref.o
CC crypto/rsapubkey.asn1.o
CC drivers/acpi/glue.o
CC crypto/rsaprivkey.asn1.o
AR crypto/built-in.a
CC net/ethtool/tsconfig.o
CC drivers/usb/core/usb.o
CC drivers/acpi/acpica/nsobject.o
CC drivers/pcmcia/socket_sysfs.o
CC fs/pipe.o
CC net/mac80211/scan.o
CC net/wireless/ibss.o
CC drivers/usb/common/debug.o
CC drivers/input/serio/serport.o
CC drivers/net/phy/phy-c45.o
CC [M] drivers/gpu/drm/xe/xe_devcoredump.o
CC arch/x86/kernel/ksysfs.o
CC drivers/acpi/acpica/nsparse.o
CC fs/ext4/symlink.o
AR drivers/usb/common/built-in.a
CC lib/xarray.o
AR drivers/net/usb/built-in.a
CC drivers/acpi/scan.o
CC net/core/netdev_rx_queue.o
CC drivers/gpu/drm/i915/vlv_sideband.o
CC net/netfilter/nf_nat_masquerade.o
AR drivers/usb/phy/built-in.a
CC drivers/pcmcia/cardbus.o
CC lib/lockref.o
CC fs/nfs/nfs4proc.o
CC mm/pagewalk.o
CC net/9p/trans_common.o
CC drivers/base/module.o
CC net/ipv4/tcp_cong.o
CC drivers/pcmcia/ds.o
CC drivers/acpi/acpica/nspredef.o
CC drivers/gpu/drm/drm_auth.o
CC net/wireless/sme.o
CC fs/nfs/nfs4xdr.o
CC drivers/net/mii.o
CC [M] drivers/gpu/drm/xe/xe_device.o
CC net/ipv4/tcp_metrics.o
AR drivers/net/ethernet/8390/built-in.a
AR drivers/net/ethernet/adaptec/built-in.a
AR drivers/net/ethernet/agere/built-in.a
AR drivers/net/ethernet/alacritech/built-in.a
AR drivers/net/ethernet/alteon/built-in.a
AR drivers/net/ethernet/amazon/built-in.a
AR drivers/net/ethernet/amd/built-in.a
CC drivers/net/phy/phy-core.o
AR drivers/net/ethernet/aquantia/built-in.a
CC arch/x86/kernel/bootflag.o
AR drivers/net/ethernet/arc/built-in.a
AR drivers/net/ethernet/asix/built-in.a
AR drivers/net/ethernet/atheros/built-in.a
AR drivers/net/ethernet/cadence/built-in.a
CC drivers/input/serio/libps2.o
CC drivers/acpi/mipi-disco-img.o
CC drivers/net/ethernet/broadcom/bnx2.o
AR drivers/net/ethernet/brocade/built-in.a
CC drivers/base/auxiliary_sysfs.o
CC net/sunrpc/auth_tls.o
CC drivers/usb/core/hub.o
CC drivers/acpi/resource.o
CC drivers/acpi/acpi_processor.o
AR net/ethtool/built-in.a
CC drivers/acpi/acpica/nsprepkg.o
CC [M] drivers/gpu/drm/xe/xe_device_sysfs.o
CC lib/bcd.o
CC net/9p/trans_fd.o
CC drivers/usb/mon/mon_main.o
CC drivers/input/keyboard/atkbd.o
CC net/core/net-procfs.o
CC drivers/base/devcoredump.o
CC mm/pgtable-generic.o
CC drivers/gpu/drm/i915/vlv_suspend.o
CC drivers/usb/core/hcd.o
CC net/netlabel/netlabel_cipso_v4.o
CC fs/namei.o
CC drivers/acpi/processor_core.o
CC net/ipv6/ndisc.o
CC net/wireless/chan.o
CC kernel/trace/error_report-traces.o
CC drivers/net/ethernet/broadcom/tg3.o
CC arch/x86/kernel/e820.o
CC net/dns_resolver/dns_key.o
CC drivers/acpi/acpica/nsrepair.o
CC drivers/scsi/constants.o
CC drivers/ata/libata-trace.o
CC lib/sort.o
AR drivers/net/ethernet/cavium/common/built-in.a
AR drivers/net/ethernet/cavium/thunder/built-in.a
AR drivers/net/ethernet/cavium/liquidio/built-in.a
AR drivers/net/ethernet/cavium/octeon/built-in.a
AR drivers/net/ethernet/cavium/built-in.a
CC net/netfilter/nf_nat_ftp.o
AR drivers/input/serio/built-in.a
AR drivers/net/ethernet/chelsio/built-in.a
CC lib/parser.o
CC net/sunrpc/auth_unix.o
CC net/9p/trans_virtio.o
AR drivers/net/ethernet/cisco/built-in.a
CC fs/nfs/nfs4state.o
CC drivers/pcmcia/pcmcia_resource.o
CC drivers/gpu/drm/i915/soc/intel_dram.o
CC drivers/usb/mon/mon_stat.o
CC drivers/acpi/acpica/nsrepair2.o
CC net/mac80211/offchannel.o
CC net/ipv4/tcp_fastopen.o
CC arch/x86/kernel/pci-dma.o
CC net/ipv6/udp.o
CC drivers/net/phy/phy_device.o
CC drivers/base/platform-msi.o
CC lib/debug_locks.o
CC drivers/pcmcia/cistpl.o
CC net/core/netpoll.o
CC mm/rmap.o
CC fs/fcntl.o
CC [M] drivers/gpu/drm/xe/xe_dma_buf.o
CC drivers/pcmcia/pcmcia_cis.o
CC kernel/workqueue.o
CC drivers/usb/host/pci-quirks.o
CC lib/random32.o
CC net/dns_resolver/dns_query.o
CC drivers/usb/class/usblp.o
CC kernel/trace/power-traces.o
CC drivers/acpi/acpica/nssearch.o
AR drivers/input/keyboard/built-in.a
CC drivers/scsi/scsi_lib_dma.o
CC drivers/input/mouse/psmouse-base.o
CC drivers/usb/storage/scsiglue.o
CC drivers/usb/mon/mon_text.o
CC drivers/base/physical_location.o
CC drivers/pcmcia/rsrc_mgr.o
CC drivers/gpu/drm/drm_blend.o
CC lib/bust_spinlocks.o
CC drivers/rtc/lib.o
CC drivers/net/loopback.o
CC net/netlabel/netlabel_calipso.o
CC drivers/ata/libata-sata.o
CC drivers/acpi/acpica/nsutils.o
CC drivers/pcmcia/rsrc_nonstatic.o
CC arch/x86/kernel/quirks.o
CC net/netfilter/nf_nat_irc.o
CC net/sunrpc/svc.o
CC drivers/usb/core/urb.o
CC fs/ext4/sysfs.o
AR net/dns_resolver/built-in.a
CC drivers/base/trace.o
CC drivers/scsi/scsi_scan.o
CC drivers/input/mouse/synaptics.o
CC drivers/gpu/drm/i915/soc/intel_gmch.o
AR net/9p/built-in.a
CC net/core/fib_rules.o
CC [M] drivers/gpu/drm/xe/xe_drm_client.o
CC net/mac80211/ht.o
AR drivers/usb/class/built-in.a
CC [M] drivers/gpu/drm/xe/xe_eu_stall.o
CC drivers/usb/host/ehci-hcd.o
CC [M] drivers/gpu/drm/xe/xe_exec.o
CC lib/kasprintf.o
AR drivers/input/joystick/built-in.a
CC drivers/gpu/drm/i915/soc/intel_pch.o
CC drivers/rtc/class.o
CC drivers/usb/storage/protocol.o
CC net/netfilter/nf_nat_sip.o
CC drivers/acpi/acpica/nswalk.o
CC drivers/usb/mon/mon_bin.o
CC net/ipv4/tcp_rate.o
CC drivers/input/mouse/focaltech.o
CC net/ipv6/udplite.o
CC lib/bitmap.o
CC arch/x86/kernel/kdebugfs.o
CC drivers/i2c/algos/i2c-algo-bit.o
CC drivers/rtc/interface.o
CC drivers/gpu/drm/drm_bridge.o
CC drivers/acpi/acpica/nsxfeval.o
CC drivers/net/netconsole.o
AR drivers/base/built-in.a
CC drivers/gpu/drm/i915/soc/intel_rom.o
CC drivers/usb/core/message.o
AR net/netlabel/built-in.a
CC drivers/pcmcia/yenta_socket.o
CC drivers/net/phy/linkmode.o
CC drivers/usb/host/ehci-pci.o
CC drivers/acpi/acpica/nsxfname.o
CC drivers/ata/libata-sff.o
CC net/wireless/ethtool.o
CC drivers/usb/storage/transport.o
GEN drivers/scsi/scsi_devinfo_tbl.c
CC mm/vmalloc.o
CC drivers/acpi/processor_pdc.o
CC kernel/trace/rpm-traces.o
CC net/mac80211/agg-tx.o
CC net/ipv6/raw.o
CC net/sunrpc/svcsock.o
CC drivers/net/virtio_net.o
CC kernel/pid.o
AR drivers/input/tablet/built-in.a
CC drivers/usb/host/ohci-hcd.o
CC fs/nfs/nfs4renewd.o
AR drivers/usb/misc/built-in.a
CC arch/x86/kernel/alternative.o
CC net/mac80211/agg-rx.o
CC drivers/usb/early/ehci-dbgp.o
CC drivers/scsi/scsi_devinfo.o
CC drivers/acpi/acpica/nsxfobj.o
AR drivers/usb/mon/built-in.a
CC drivers/gpu/drm/drm_cache.o
CC lib/scatterlist.o
CC fs/ioctl.o
CC drivers/input/mouse/alps.o
CC drivers/usb/storage/usb.o
CC drivers/i2c/busses/i2c-i801.o
CC net/wireless/mesh.o
AR drivers/i2c/algos/built-in.a
CC drivers/usb/host/ohci-pci.o
CC net/netfilter/x_tables.o
CC fs/ext4/xattr.o
CC mm/vma.o
CC drivers/net/phy/phy_link_topology.o
CC net/ipv4/tcp_recovery.o
CC [M] drivers/gpu/drm/xe/xe_exec_queue.o
CC drivers/acpi/acpica/psargs.o
CC fs/nfs/nfs4super.o
CC net/core/net-traces.o
AR drivers/net/ethernet/cortina/built-in.a
CC drivers/usb/core/driver.o
CC drivers/gpu/drm/i915/i915_memcpy.o
CC drivers/acpi/ec.o
CC drivers/gpu/drm/i915/i915_mm.o
CC drivers/usb/storage/initializers.o
CC kernel/trace/trace_dynevent.o
CC kernel/trace/trace_probe.o
CC drivers/ata/libata-pmp.o
CC arch/x86/kernel/i8253.o
CC drivers/scsi/scsi_sysctl.o
AR drivers/usb/early/built-in.a
AR drivers/pcmcia/built-in.a
CC net/mac80211/vht.o
CC drivers/rtc/nvmem.o
CC fs/nfs/nfs4file.o
CC fs/nfs/delegation.o
CC kernel/trace/trace_uprobe.o
CC drivers/acpi/acpica/psloop.o
CC net/netfilter/xt_tcpudp.o
AR drivers/i2c/muxes/built-in.a
CC fs/ext4/xattr_hurd.o
CC net/handshake/alert.o
CC net/ipv4/tcp_ulp.o
CC net/ipv4/tcp_offload.o
CC drivers/rtc/dev.o
AR drivers/i3c/built-in.a
CC drivers/input/mouse/byd.o
CC arch/x86/kernel/hw_breakpoint.o
CC drivers/net/phy/mdio_bus.o
CC lib/list_sort.o
CC drivers/usb/storage/sierra_ms.o
AR drivers/i2c/busses/built-in.a
CC drivers/i2c/i2c-boardinfo.o
CC lib/uuid.o
CC drivers/acpi/acpica/psobject.o
CC net/handshake/genl.o
CC drivers/ata/libata-acpi.o
CC drivers/scsi/scsi_proc.o
CC lib/iov_iter.o
AR drivers/input/touchscreen/built-in.a
CC drivers/net/net_failover.o
CC mm/process_vm_access.o
CC drivers/gpu/drm/drm_color_mgmt.o
CC drivers/gpu/drm/i915/i915_sw_fence.o
CC drivers/i2c/i2c-core-base.o
CC drivers/usb/core/config.o
CC net/core/selftests.o
CC net/ipv6/icmp.o
CC net/netfilter/xt_CONNSECMARK.o
CC drivers/usb/storage/option_ms.o
CC net/wireless/ap.o
CC drivers/acpi/acpica/psopcode.o
CC drivers/usb/host/uhci-hcd.o
CC arch/x86/kernel/tsc.o
CC drivers/rtc/proc.o
CC drivers/input/mouse/logips2pp.o
CC [M] drivers/gpu/drm/xe/xe_execlist.o
CC arch/x86/kernel/tsc_msr.o
CC drivers/rtc/sysfs.o
CC drivers/scsi/scsi_debugfs.o
CC net/core/ptp_classifier.o
CC fs/readdir.o
CC net/devres.o
CC drivers/usb/core/file.o
CC net/ipv4/tcp_plb.o
CC kernel/task_work.o
CC drivers/acpi/acpica/psopinfo.o
CC drivers/gpu/drm/i915/i915_sw_fence_work.o
CC fs/nfs/nfs4idmap.o
CC net/ipv6/mcast.o
CC [M] drivers/gpu/drm/xe/xe_force_wake.o
AR drivers/input/misc/built-in.a
AR drivers/net/ethernet/dec/tulip/built-in.a
CC drivers/rtc/rtc-mc146818-lib.o
CC drivers/i2c/i2c-core-smbus.o
AR drivers/net/ethernet/dec/built-in.a
CC fs/select.o
CC net/socket.o
CC drivers/acpi/dock.o
CC net/sunrpc/svcauth.o
CC drivers/usb/host/xhci.o
CC net/core/netprio_cgroup.o
CC net/handshake/netlink.o
CC drivers/ata/libata-pata-timings.o
CC drivers/usb/storage/usual-tables.o
CC kernel/trace/rethook.o
CC drivers/input/mouse/lifebook.o
CC drivers/acpi/acpica/psparse.o
CC drivers/gpu/drm/i915/i915_syncmap.o
CC drivers/usb/core/buffer.o
CC drivers/net/phy/mdio_device.o
CC lib/clz_ctz.o
CC arch/x86/kernel/io_delay.o
CC drivers/scsi/scsi_trace.o
CC drivers/usb/host/xhci-mem.o
CC mm/page_alloc.o
CC mm/page_frag_cache.o
CC drivers/acpi/pci_root.o
CC net/mac80211/he.o
AR drivers/media/i2c/built-in.a
AR drivers/media/tuners/built-in.a
CC net/netfilter/xt_NFLOG.o
AR drivers/media/rc/keymaps/built-in.a
AR drivers/media/rc/built-in.a
AR drivers/media/common/b2c2/built-in.a
CC net/sysctl_net.o
AR drivers/media/common/saa7146/built-in.a
AR drivers/media/common/siano/built-in.a
AR drivers/media/common/v4l2-tpg/built-in.a
CC net/ipv6/reassembly.o
AR drivers/media/common/videobuf2/built-in.a
AR drivers/media/common/built-in.a
CC drivers/net/phy/swphy.o
CC net/handshake/request.o
AR drivers/media/platform/allegro-dvt/built-in.a
CC drivers/ata/ahci.o
AR drivers/media/platform/amlogic/meson-ge2d/built-in.a
AR drivers/media/platform/amlogic/built-in.a
CC net/handshake/tlshd.o
AR drivers/media/platform/amphion/built-in.a
AR drivers/media/platform/aspeed/built-in.a
CC drivers/acpi/acpica/psscope.o
AR drivers/media/platform/atmel/built-in.a
CC drivers/rtc/rtc-cmos.o
AR drivers/media/platform/broadcom/built-in.a
AR drivers/usb/storage/built-in.a
AR drivers/media/platform/cadence/built-in.a
CC drivers/gpu/drm/i915/i915_user_extensions.o
CC fs/nfs/callback.o
CC mm/init-mm.o
AR drivers/media/platform/chips-media/coda/built-in.a
CC drivers/input/mouse/trackpoint.o
AR drivers/media/platform/imagination/built-in.a
AR drivers/media/platform/chips-media/wave5/built-in.a
CC arch/x86/kernel/rtc.o
CC net/netfilter/xt_SECMARK.o
AR drivers/media/platform/chips-media/built-in.a
AR drivers/media/platform/intel/built-in.a
AR drivers/media/platform/marvell/built-in.a
AR drivers/media/platform/mediatek/jpeg/built-in.a
AR drivers/media/platform/mediatek/mdp/built-in.a
AR drivers/media/platform/mediatek/vcodec/common/built-in.a
AR drivers/media/platform/mediatek/vcodec/encoder/built-in.a
AR drivers/media/platform/mediatek/vcodec/decoder/built-in.a
CC arch/x86/kernel/resource.o
AR drivers/media/platform/mediatek/vcodec/built-in.a
AR drivers/media/platform/mediatek/vpu/built-in.a
CC [M] drivers/gpu/drm/xe/xe_ggtt.o
AR drivers/media/platform/mediatek/mdp3/built-in.a
AR drivers/media/platform/mediatek/built-in.a
AR kernel/trace/built-in.a
CC fs/ext4/xattr_trusted.o
CC kernel/extable.o
AR drivers/media/platform/microchip/built-in.a
CC drivers/usb/core/sysfs.o
AR drivers/media/platform/nuvoton/built-in.a
AR drivers/media/platform/nvidia/tegra-vde/built-in.a
CC net/ipv4/datagram.o
AR drivers/media/platform/nvidia/built-in.a
CC lib/bsearch.o
AR drivers/media/platform/nxp/dw100/built-in.a
AR drivers/media/platform/nxp/imx-jpeg/built-in.a
AR drivers/media/platform/nxp/imx8-isi/built-in.a
AR drivers/media/platform/nxp/built-in.a
CC drivers/acpi/acpica/pstree.o
CC net/handshake/trace.o
AR drivers/media/platform/qcom/camss/built-in.a
AR drivers/media/platform/qcom/venus/built-in.a
AR drivers/media/platform/qcom/built-in.a
CC drivers/gpu/drm/i915/i915_debugfs.o
CC net/sunrpc/svcauth_unix.o
AR drivers/media/platform/raspberrypi/pisp_be/built-in.a
AR drivers/media/platform/renesas/rcar-vin/built-in.a
CC drivers/scsi/scsi_logging.o
AR drivers/media/platform/raspberrypi/rp1-cfe/built-in.a
AR drivers/media/platform/raspberrypi/built-in.a
AR drivers/media/platform/renesas/rzg2l-cru/built-in.a
AR drivers/media/platform/renesas/vsp1/built-in.a
AS arch/x86/kernel/irqflags.o
CC drivers/i2c/i2c-core-acpi.o
AR drivers/media/platform/renesas/built-in.a
CC net/sunrpc/addr.o
CC arch/x86/kernel/static_call.o
CC drivers/usb/core/endpoint.o
AR drivers/media/platform/rockchip/rga/built-in.a
AR drivers/media/platform/rockchip/rkisp1/built-in.a
AR drivers/media/platform/rockchip/built-in.a
AR drivers/media/platform/samsung/exynos-gsc/built-in.a
AR drivers/media/platform/samsung/exynos4-is/built-in.a
CC drivers/gpu/drm/drm_connector.o
AR drivers/media/platform/samsung/s3c-camif/built-in.a
AR drivers/media/platform/samsung/s5p-g2d/built-in.a
AR drivers/media/platform/samsung/s5p-jpeg/built-in.a
CC net/ipv6/tcp_ipv6.o
CC drivers/gpu/drm/i915/i915_debugfs_params.o
AR drivers/media/platform/samsung/s5p-mfc/built-in.a
AR drivers/media/platform/samsung/built-in.a
CC drivers/scsi/scsi_pm.o
AR drivers/media/platform/st/sti/bdisp/built-in.a
CC drivers/input/input.o
AR drivers/media/platform/st/sti/c8sectpfe/built-in.a
AR drivers/media/platform/st/sti/delta/built-in.a
AR drivers/media/platform/st/sti/hva/built-in.a
AR drivers/media/platform/st/stm32/built-in.a
AR drivers/media/platform/st/built-in.a
CC drivers/gpu/drm/drm_crtc.o
CC mm/memblock.o
CC drivers/acpi/acpica/psutils.o
CC drivers/net/phy/fixed_phy.o
AR drivers/pps/clients/built-in.a
AR drivers/media/platform/sunxi/sun4i-csi/built-in.a
CC drivers/input/mouse/cypress_ps2.o
CC drivers/pps/pps.o
AR drivers/media/platform/sunxi/sun6i-csi/built-in.a
AR drivers/media/platform/sunxi/sun6i-mipi-csi2/built-in.a
CC drivers/pps/kapi.o
AR drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/built-in.a
AR drivers/media/platform/sunxi/sun8i-di/built-in.a
AR drivers/media/platform/sunxi/sun8i-rotate/built-in.a
AR drivers/media/platform/sunxi/built-in.a
CC net/ipv4/raw.o
AR drivers/media/platform/ti/am437x/built-in.a
AR drivers/media/platform/ti/cal/built-in.a
AR drivers/media/platform/ti/vpe/built-in.a
AR drivers/media/platform/ti/davinci/built-in.a
CC lib/find_bit.o
AR drivers/media/platform/ti/j721e-csi2rx/built-in.a
CC drivers/acpi/acpica/pswalk.o
AR drivers/media/platform/ti/omap/built-in.a
CC arch/x86/kernel/process.o
AR drivers/media/platform/ti/omap3isp/built-in.a
CC net/netfilter/xt_TCPMSS.o
CC lib/llist.o
AR drivers/media/platform/ti/built-in.a
CC fs/ext4/xattr_user.o
AR drivers/media/platform/verisilicon/built-in.a
AR drivers/rtc/built-in.a
AR drivers/media/platform/via/built-in.a
CC fs/ext4/fast_commit.o
CC drivers/pps/sysfs.o
AR drivers/media/platform/xilinx/built-in.a
AR drivers/media/platform/built-in.a
CC kernel/params.o
AR drivers/media/pci/ttpci/built-in.a
CC drivers/i2c/i2c-smbus.o
AR drivers/media/pci/b2c2/built-in.a
AR drivers/media/pci/pluto2/built-in.a
AR drivers/media/pci/dm1105/built-in.a
CC drivers/ata/libahci.o
CC net/mac80211/s1g.o
CC net/wireless/trace.o
AR drivers/media/pci/pt1/built-in.a
CC fs/nfs/callback_xdr.o
AR drivers/media/pci/pt3/built-in.a
AR drivers/media/pci/mantis/built-in.a
CC net/mac80211/ibss.o
AR drivers/media/pci/ngene/built-in.a
AR drivers/media/pci/ddbridge/built-in.a
AR drivers/media/pci/saa7146/built-in.a
CC lib/lwq.o
AR drivers/media/pci/smipcie/built-in.a
CC drivers/gpu/drm/drm_displayid.o
CC net/wireless/ocb.o
AR drivers/media/pci/netup_unidvb/built-in.a
CC drivers/usb/core/devio.o
AR drivers/media/pci/intel/ipu3/built-in.a
AR drivers/media/pci/intel/ivsc/built-in.a
AR drivers/media/pci/intel/built-in.a
CC fs/ext4/orphan.o
CC drivers/acpi/acpica/psxface.o
AR drivers/media/pci/built-in.a
CC fs/ext4/acl.o
AR drivers/media/usb/b2c2/built-in.a
AR drivers/media/usb/dvb-usb/built-in.a
AR drivers/media/usb/dvb-usb-v2/built-in.a
AR drivers/media/usb/s2255/built-in.a
CC [M] drivers/gpu/drm/xe/xe_gpu_scheduler.o
AR drivers/media/usb/siano/built-in.a
CC drivers/acpi/pci_link.o
AR drivers/media/usb/ttusb-budget/built-in.a
CC drivers/acpi/acpica/rsaddr.o
CC lib/memweight.o
CC drivers/scsi/scsi_bsg.o
AR drivers/media/usb/ttusb-dec/built-in.a
CC drivers/gpu/drm/drm_drv.o
AR drivers/media/usb/built-in.a
AR drivers/pps/built-in.a
CC drivers/gpu/drm/drm_dumb_buffers.o
AR drivers/media/mmc/siano/built-in.a
AR drivers/media/mmc/built-in.a
CC drivers/usb/host/xhci-ext-caps.o
AR drivers/media/firewire/built-in.a
AR drivers/media/spi/built-in.a
AR drivers/media/test-drivers/built-in.a
CC lib/kfifo.o
AR drivers/media/built-in.a
CC drivers/input/mouse/psmouse-smbus.o
CC drivers/usb/host/xhci-ring.o
CC drivers/input/input-compat.o
CC drivers/gpu/drm/i915/i915_pmu.o
CC drivers/input/input-mt.o
CC net/core/netclassid_cgroup.o
CC net/core/dst_cache.o
CC drivers/usb/host/xhci-hub.o
CC net/ipv6/ping.o
CC net/netfilter/xt_conntrack.o
CC drivers/input/input-poller.o
CC [M] drivers/gpu/drm/xe/xe_gsc.o
CC drivers/acpi/acpica/rscalc.o
CC lib/percpu-refcount.o
AR drivers/net/phy/built-in.a
CC net/ipv4/udp.o
CC arch/x86/kernel/ptrace.o
AR net/handshake/built-in.a
AR drivers/i2c/built-in.a
CC fs/nfs/callback_proc.o
CC fs/ext4/xattr_security.o
CC drivers/acpi/pci_irq.o
CC arch/x86/kernel/tls.o
CC mm/slub.o
CC kernel/kthread.o
CC drivers/scsi/scsi_common.o
CC net/sunrpc/rpcb_clnt.o
CC drivers/usb/host/xhci-dbg.o
CC net/mac80211/iface.o
CC drivers/usb/core/notify.o
CC drivers/acpi/acpica/rscreate.o
CC net/mac80211/link.o
CC drivers/gpu/drm/drm_edid.o
AR drivers/net/ethernet/dlink/built-in.a
CC [M] drivers/gpu/drm/xe/xe_gsc_debugfs.o
CC drivers/usb/host/xhci-trace.o
CC kernel/sys_ni.o
AR drivers/input/mouse/built-in.a
CC net/ipv6/exthdrs.o
CC fs/nfs/nfs4namespace.o
CC lib/rhashtable.o
CC mm/madvise.o
CC drivers/scsi/scsi_transport_spi.o
CC net/ipv4/udplite.o
CC drivers/input/ff-core.o
CC mm/page_io.o
CC [M] drivers/gpu/drm/xe/xe_gsc_proxy.o
CC net/mac80211/rate.o
CC drivers/acpi/acpica/rsdumpinfo.o
CC net/core/gro_cells.o
CC net/ipv6/datagram.o
CC drivers/ata/ata_piix.o
CC drivers/gpu/drm/i915/gt/gen2_engine_cs.o
CC drivers/usb/host/xhci-debugfs.o
CC mm/swap_state.o
CC mm/swapfile.o
CC [M] drivers/gpu/drm/xe/xe_gsc_submit.o
AR drivers/net/ethernet/emulex/built-in.a
CC [M] drivers/gpu/drm/xe/xe_gt.o
CC drivers/usb/host/xhci-pci.o
CC mm/swap_slots.o
CC arch/x86/kernel/step.o
CC drivers/acpi/acpica/rsinfo.o
CC fs/dcache.o
CC net/netfilter/xt_policy.o
CC drivers/gpu/drm/i915/gt/gen6_engine_cs.o
CC drivers/acpi/acpica/rsio.o
CC net/ipv4/udp_offload.o
CC net/core/failover.o
CC kernel/nsproxy.o
CC net/wireless/pmsr.o
AR fs/ext4/built-in.a
CC fs/inode.o
CC drivers/input/touchscreen.o
CC drivers/usb/core/generic.o
CC drivers/acpi/acpica/rsirq.o
CC drivers/gpu/drm/i915/gt/gen6_ppgtt.o
CC drivers/gpu/drm/drm_eld.o
AR drivers/net/ethernet/broadcom/built-in.a
CC drivers/gpu/drm/drm_encoder.o
CC drivers/gpu/drm/i915/gt/gen7_renderclear.o
AR drivers/net/ethernet/engleder/built-in.a
AR drivers/net/ethernet/ezchip/built-in.a
CC drivers/ata/pata_amd.o
AR drivers/net/ethernet/fujitsu/built-in.a
AR drivers/net/ethernet/fungible/built-in.a
AR drivers/net/ethernet/google/built-in.a
AR drivers/net/ethernet/hisilicon/built-in.a
AR drivers/net/ethernet/huawei/built-in.a
CC lib/base64.o
CC drivers/net/ethernet/intel/e1000/e1000_main.o
CC drivers/net/ethernet/intel/e1000e/82571.o
CC drivers/net/ethernet/intel/e1000/e1000_hw.o
GEN net/wireless/shipped-certs.c
CC arch/x86/kernel/i8237.o
CC fs/attr.o
CC lib/once.o
CC drivers/acpi/acpica/rslist.o
CC lib/refcount.o
CC net/ipv4/arp.o
CC fs/nfs/nfs4getroot.o
CC mm/dmapool.o
CC kernel/notifier.o
CC drivers/net/ethernet/intel/e1000/e1000_ethtool.o
CC arch/x86/kernel/stacktrace.o
CC drivers/input/ff-memless.o
CC drivers/scsi/virtio_scsi.o
CC net/sunrpc/timer.o
CC net/ipv4/icmp.o
CC drivers/usb/core/quirks.o
CC drivers/ata/pata_oldpiix.o
CC net/sunrpc/xdr.o
CC net/ipv6/ip6_flowlabel.o
CC drivers/acpi/acpica/rsmemory.o
CC lib/rcuref.o
CC arch/x86/kernel/reboot.o
CC drivers/acpi/acpi_apd.o
CC drivers/net/ethernet/intel/e100.o
CC drivers/input/sparse-keymap.o
CC net/netfilter/xt_state.o
CC [M] drivers/gpu/drm/xe/xe_gt_ccs_mode.o
CC drivers/net/ethernet/intel/e1000e/ich8lan.o
AR net/core/built-in.a
CC kernel/ksysfs.o
CC arch/x86/kernel/msr.o
CC lib/usercopy.o
CC drivers/acpi/acpi_platform.o
CC net/ipv6/inet6_connection_sock.o
CC net/sunrpc/sunrpc_syms.o
CC drivers/usb/core/devices.o
CC drivers/acpi/acpica/rsmisc.o
CC [M] net/netfilter/nf_log_syslog.o
CC fs/nfs/nfs4client.o
CC drivers/gpu/drm/i915/gt/gen8_engine_cs.o
CC [M] drivers/gpu/drm/xe/xe_gt_clock.o
CC drivers/net/ethernet/intel/e1000/e1000_param.o
CC drivers/net/ethernet/intel/e1000e/80003es2lan.o
CC lib/errseq.o
CC drivers/gpu/drm/i915/gt/gen8_ppgtt.o
AR drivers/usb/host/built-in.a
AR drivers/net/ethernet/i825xx/built-in.a
CC net/sunrpc/cache.o
CC drivers/ata/pata_sch.o
CC drivers/ata/pata_mpiix.o
CC fs/bad_inode.o
CC lib/bucket_locks.o
CC lib/generic-radix-tree.o
CC drivers/input/vivaldi-fmap.o
CC lib/bitmap-str.o
CC fs/file.o
CC drivers/gpu/drm/i915/gt/intel_breadcrumbs.o
CC drivers/acpi/acpica/rsserial.o
CC drivers/gpu/drm/drm_file.o
CC kernel/cred.o
CC drivers/scsi/sd.o
CC net/ipv6/udp_offload.o
CC arch/x86/kernel/cpuid.o
AR drivers/net/ethernet/microsoft/built-in.a
CC arch/x86/kernel/early-quirks.o
CC arch/x86/kernel/smp.o
CC fs/filesystems.o
CC drivers/scsi/sr.o
CC net/mac80211/michael.o
AR drivers/net/ethernet/litex/built-in.a
CC drivers/net/ethernet/intel/e1000e/mac.o
CC drivers/input/input-leds.o
CC drivers/gpu/drm/drm_fourcc.o
CC drivers/usb/core/phy.o
CC fs/namespace.o
CC drivers/ata/ata_generic.o
CC [M] net/netfilter/xt_mark.o
CC drivers/acpi/acpica/rsutils.o
CC drivers/gpu/drm/drm_framebuffer.o
CC [M] drivers/gpu/drm/xe/xe_gt_freq.o
CC drivers/acpi/acpica/rsxface.o
CC net/mac80211/tkip.o
CC drivers/acpi/acpi_pnp.o
CC drivers/ptp/ptp_clock.o
CC drivers/power/supply/power_supply_core.o
CC net/wireless/shipped-certs.o
CC drivers/hwmon/hwmon.o
CC mm/hugetlb.o
CC lib/string_helpers.o
CC drivers/input/evdev.o
CC net/ipv4/devinet.o
CC [M] drivers/gpu/drm/xe/xe_gt_idle.o
CC drivers/power/supply/power_supply_sysfs.o
CC net/sunrpc/rpc_pipe.o
CC kernel/reboot.o
AR drivers/net/ethernet/marvell/octeon_ep/built-in.a
AR drivers/net/ethernet/marvell/octeon_ep_vf/built-in.a
AR drivers/net/ethernet/marvell/octeontx2/built-in.a
AR drivers/net/ethernet/mellanox/built-in.a
CC drivers/acpi/acpica/tbdata.o
CC net/mac80211/aes_cmac.o
AR drivers/net/ethernet/marvell/prestera/built-in.a
CC drivers/net/ethernet/marvell/sky2.o
CC drivers/gpu/drm/drm_gem.o
CC drivers/gpu/drm/drm_ioctl.o
CC fs/nfs/nfs4session.o
CC drivers/ptp/ptp_chardev.o
AR drivers/thermal/broadcom/built-in.a
CC arch/x86/kernel/smpboot.o
CC lib/hexdump.o
AR drivers/thermal/renesas/built-in.a
AR drivers/watchdog/built-in.a
AR drivers/thermal/samsung/built-in.a
CC drivers/ptp/ptp_sysfs.o
CC drivers/thermal/intel/intel_tcc.o
CC mm/mmu_notifier.o
CC drivers/usb/core/port.o
AR drivers/ata/built-in.a
CC lib/kstrtox.o
CC drivers/thermal/intel/therm_throt.o
CC [M] drivers/gpu/drm/xe/xe_gt_mcr.o
CC drivers/ptp/ptp_vclock.o
CC net/ipv4/af_inet.o
CC drivers/gpu/drm/i915/gt/intel_context.o
CC fs/nfs/dns_resolve.o
CC drivers/acpi/power.o
CC fs/seq_file.o
CC drivers/ptp/ptp_kvm_x86.o
CC net/ipv6/seg6.o
CC [M] net/netfilter/xt_nat.o
CC drivers/ptp/ptp_kvm_common.o
CC lib/iomap.o
CC drivers/gpu/drm/drm_lease.o
CC drivers/acpi/acpica/tbfadt.o
CC drivers/power/supply/power_supply_leds.o
CC drivers/scsi/sr_ioctl.o
CC arch/x86/kernel/tsc_sync.o
CC lib/iomap_copy.o
CC kernel/async.o
CC drivers/power/supply/power_supply_hwmon.o
CC drivers/acpi/event.o
CC net/ipv4/igmp.o
CC drivers/gpu/drm/i915/gt/intel_context_sseu.o
AR drivers/input/built-in.a
CC drivers/net/ethernet/intel/e1000e/manage.o
CC drivers/scsi/sr_vendor.o
CC net/ipv6/fib6_notifier.o
AR drivers/net/ethernet/intel/e1000/built-in.a
AR drivers/net/ethernet/meta/built-in.a
CC [M] drivers/gpu/drm/xe/xe_gt_pagefault.o
CC kernel/range.o
CC lib/devres.o
CC drivers/scsi/sg.o
CC drivers/gpu/drm/i915/gt/intel_engine_cs.o
CC drivers/acpi/acpica/tbfind.o
CC drivers/net/ethernet/intel/e1000e/nvm.o
AR drivers/hwmon/built-in.a
CC drivers/acpi/evged.o
CC mm/migrate.o
AR drivers/thermal/st/built-in.a
CC [M] drivers/thermal/intel/x86_pkg_temp_thermal.o
CC drivers/gpu/drm/drm_managed.o
AR drivers/thermal/qcom/built-in.a
CC drivers/acpi/sysfs.o
CC kernel/smpboot.o
CC fs/nfs/nfs4trace.o
CC net/ipv6/rpl.o
CC drivers/usb/core/hcd-pci.o
CC drivers/scsi/scsi_sysfs.o
AR drivers/ptp/built-in.a
AR drivers/power/supply/built-in.a
CC drivers/acpi/acpica/tbinstal.o
AR drivers/power/built-in.a
CC kernel/ucount.o
CC [M] net/netfilter/xt_LOG.o
CC net/mac80211/aes_gmac.o
CC drivers/acpi/property.o
CC net/ipv6/ioam6.o
CC fs/xattr.o
CC drivers/net/ethernet/intel/e1000e/phy.o
CC arch/x86/kernel/setup_percpu.o
CC fs/nfs/nfs4sysctl.o
CC drivers/usb/core/usb-acpi.o
CC net/sunrpc/sysfs.o
CC fs/libfs.o
CC drivers/acpi/debugfs.o
AR drivers/net/ethernet/micrel/built-in.a
CC net/ipv4/fib_frontend.o
CC kernel/regset.o
CC lib/check_signature.o
CC drivers/gpu/drm/i915/gt/intel_engine_heartbeat.o
CC drivers/md/md.o
CC lib/interval_tree.o
CC drivers/cpufreq/cpufreq.o
CC drivers/acpi/acpica/tbprint.o
CC drivers/gpu/drm/drm_mm.o
AR drivers/net/ethernet/microchip/built-in.a
AR drivers/mmc/built-in.a
CC drivers/gpu/drm/drm_mode_config.o
CC drivers/cpuidle/governors/menu.o
AR drivers/ufs/built-in.a
CC drivers/acpi/acpi_lpat.o
CC drivers/cpuidle/cpuidle.o
CC drivers/cpufreq/freq_table.o
CC lib/assoc_array.o
AR drivers/thermal/intel/built-in.a
AR drivers/thermal/tegra/built-in.a
AR drivers/thermal/mediatek/built-in.a
CC drivers/thermal/thermal_core.o
CC drivers/acpi/acpica/tbutils.o
CC fs/fs-writeback.o
CC kernel/ksyms_common.o
CC drivers/md/md-bitmap.o
CC drivers/cpuidle/governors/haltpoll.o
CC [M] net/netfilter/xt_MASQUERADE.o
CC mm/page_counter.o
CC lib/bitrev.o
CC drivers/cpuidle/driver.o
CC drivers/thermal/thermal_sysfs.o
CC arch/x86/kernel/mpparse.o
CC net/mac80211/fils_aead.o
AR drivers/usb/core/built-in.a
AR drivers/usb/built-in.a
CC net/sunrpc/svc_xprt.o
AR drivers/firmware/arm_ffa/built-in.a
AR drivers/firmware/arm_scmi/built-in.a
AR drivers/net/ethernet/mscc/built-in.a
CC drivers/acpi/acpi_pcc.o
CC drivers/gpu/drm/drm_mode_object.o
CC net/ipv6/sysctl_net_ipv6.o
AR drivers/firmware/broadcom/built-in.a
CC drivers/gpu/drm/drm_modes.o
AR drivers/firmware/cirrus/test/built-in.a
CC mm/hugetlb_cgroup.o
AR drivers/firmware/cirrus/built-in.a
AR drivers/firmware/meson/built-in.a
CC drivers/acpi/acpica/tbxface.o
AR drivers/firmware/microchip/built-in.a
CC [M] drivers/gpu/drm/xe/xe_gt_sysfs.o
CC drivers/md/md-autodetect.o
CC drivers/acpi/acpica/tbxfload.o
CC mm/early_ioremap.o
CC net/ipv6/xfrm6_policy.o
CC drivers/firmware/efi/libstub/efi-stub-helper.o
CC drivers/firmware/efi/efi-bgrt.o
CC drivers/cpufreq/cpufreq_performance.o
CC mm/secretmem.o
CC net/ipv4/fib_semantics.o
CC kernel/groups.o
CC lib/crc-ccitt.o
CC drivers/acpi/acpica/tbxfroot.o
AR drivers/net/ethernet/myricom/built-in.a
CC drivers/gpu/drm/i915/gt/intel_engine_pm.o
AR drivers/scsi/built-in.a
CC arch/x86/kernel/trace_clock.o
CC drivers/thermal/thermal_trip.o
CC drivers/acpi/ac.o
CC drivers/firmware/efi/efi.o
CC drivers/cpuidle/governor.o
CC drivers/cpuidle/sysfs.o
CC drivers/net/ethernet/intel/e1000e/param.o
CC net/ipv6/xfrm6_state.o
CC drivers/cpufreq/cpufreq_userspace.o
AR drivers/crypto/stm32/built-in.a
AR drivers/crypto/xilinx/built-in.a
AR drivers/cpuidle/governors/built-in.a
CC net/mac80211/cfg.o
CC net/mac80211/ethtool.o
AR drivers/crypto/hisilicon/built-in.a
CC drivers/acpi/button.o
AR drivers/crypto/intel/keembay/built-in.a
CC [M] drivers/gpu/drm/xe/xe_gt_throttle.o
AR drivers/crypto/intel/ixp4xx/built-in.a
AR drivers/crypto/intel/built-in.a
CC lib/crc16.o
AR drivers/crypto/starfive/built-in.a
AR drivers/crypto/built-in.a
CC [M] net/netfilter/xt_addrtype.o
CC net/ipv6/xfrm6_input.o
CC drivers/acpi/acpica/utaddress.o
AR drivers/firmware/imx/built-in.a
CC drivers/md/dm.o
CC arch/x86/kernel/trace.o
CC net/ipv6/xfrm6_output.o
CC net/sunrpc/xprtmultipath.o
CC net/sunrpc/stats.o
AR drivers/net/ethernet/marvell/built-in.a
CC [M] drivers/gpu/drm/xe/xe_gt_tlb_invalidation.o
HOSTCC lib/gen_crc32table
CC net/ipv6/xfrm6_protocol.o
CC net/mac80211/rx.o
CC arch/x86/kernel/rethook.o
CC fs/pnode.o
CC drivers/firmware/efi/libstub/gop.o
CC net/ipv4/fib_trie.o
CC drivers/firmware/efi/libstub/secureboot.o
CC drivers/thermal/thermal_helpers.o
CC net/mac80211/spectmgmt.o
CC net/ipv6/netfilter.o
CC drivers/net/ethernet/intel/e1000e/ethtool.o
CC net/mac80211/tx.o
AR drivers/net/ethernet/natsemi/built-in.a
CC fs/splice.o
CC lib/xxhash.o
CC drivers/net/ethernet/intel/e1000e/netdev.o
CC drivers/cpuidle/poll_state.o
CC mm/hmm.o
CC arch/x86/kernel/vmcore_info_32.o
CC drivers/thermal/thermal_thresholds.o
CC kernel/kcmp.o
CC drivers/acpi/fan_core.o
CC drivers/acpi/acpica/utalloc.o
CC drivers/cpufreq/cpufreq_ondemand.o
CC drivers/clocksource/acpi_pm.o
CC drivers/cpuidle/cpuidle-haltpoll.o
CC drivers/gpu/drm/drm_modeset_lock.o
CC drivers/hid/usbhid/hid-core.o
CC net/ipv4/fib_notifier.o
CC mm/memfd.o
CC drivers/gpu/drm/i915/gt/intel_engine_user.o
CC drivers/acpi/fan_attr.o
CC drivers/acpi/acpica/utascii.o
AR drivers/net/ethernet/neterion/built-in.a
CC drivers/gpu/drm/i915/gt/intel_execlists_submission.o
CC drivers/acpi/fan_hwmon.o
CC drivers/acpi/acpica/utbuffer.o
CC drivers/thermal/thermal_netlink.o
CC drivers/acpi/acpica/utcksum.o
CC drivers/clocksource/i8253.o
CC lib/genalloc.o
CC kernel/freezer.o
CC net/ipv6/proc.o
CC drivers/firmware/efi/libstub/tpm.o
CC arch/x86/kernel/machine_kexec_32.o
CC drivers/gpu/drm/drm_plane.o
AR drivers/cpuidle/built-in.a
AR drivers/platform/x86/amd/built-in.a
AR drivers/platform/x86/intel/built-in.a
CC drivers/platform/x86/wmi.o
CC drivers/cpufreq/cpufreq_governor.o
CC [M] drivers/gpu/drm/xe/xe_gt_topology.o
CC drivers/hid/hid-core.o
CC lib/percpu_counter.o
CC drivers/acpi/acpica/utcopy.o
CC net/mac80211/key.o
CC drivers/thermal/thermal_hwmon.o
CC kernel/profile.o
CC drivers/md/dm-table.o
AR net/netfilter/built-in.a
CC drivers/md/dm-target.o
CC drivers/thermal/gov_step_wise.o
AR drivers/clocksource/built-in.a
CC net/mac80211/util.o
CC net/ipv6/syncookies.o
CC lib/audit.o
AR drivers/platform/surface/built-in.a
CC drivers/hid/usbhid/hiddev.o
CC drivers/firmware/efi/vars.o
CC drivers/firmware/efi/reboot.o
AR drivers/firmware/psci/built-in.a
CC drivers/hid/hid-input.o
CC net/mac80211/parse.o
AR fs/nfs/built-in.a
CC net/mac80211/wme.o
AR drivers/firmware/qcom/built-in.a
AS arch/x86/kernel/relocate_kernel_32.o
CC drivers/mailbox/mailbox.o
AR drivers/perf/built-in.a
CC drivers/cpufreq/cpufreq_governor_attr_set.o
CC fs/sync.o
CC drivers/firmware/efi/libstub/file.o
CC mm/ptdump.o
CC drivers/acpi/acpi_video.o
CC drivers/acpi/acpica/utexcep.o
CC drivers/hid/usbhid/hid-pidff.o
CC drivers/md/dm-linear.o
AR drivers/firmware/smccc/built-in.a
CC lib/syscall.o
CC drivers/acpi/acpica/utdebug.o
CC [M] drivers/gpu/drm/xe/xe_guc.o
CC drivers/hid/hid-quirks.o
CC arch/x86/kernel/crash_dump_32.o
CC net/ipv4/inet_fragment.o
AR drivers/net/ethernet/netronome/built-in.a
CC drivers/acpi/video_detect.o
CC drivers/firmware/efi/memattr.o
CC net/sunrpc/sysctl.o
AR drivers/firmware/tegra/built-in.a
CC drivers/firmware/efi/libstub/mem.o
AR drivers/hwtracing/intel_th/built-in.a
CC drivers/acpi/acpica/utdecode.o
AR drivers/net/ethernet/ni/built-in.a
CC mm/execmem.o
CC [M] drivers/gpu/drm/xe/xe_guc_ads.o
CC kernel/stacktrace.o
CC drivers/gpu/drm/i915/gt/intel_ggtt.o
CC drivers/platform/x86/wmi-bmof.o
AR drivers/firmware/xilinx/built-in.a
CC [M] drivers/gpu/drm/xe/xe_guc_buf.o
CC net/ipv4/ping.o
CC drivers/cpufreq/acpi-cpufreq.o
CC drivers/mailbox/pcc.o
CC fs/utimes.o
AR drivers/thermal/built-in.a
CC net/ipv4/ip_tunnel_core.o
CC net/ipv6/calipso.o
CC drivers/platform/x86/eeepc-laptop.o
CC drivers/net/ethernet/nvidia/forcedeth.o
CC arch/x86/kernel/crash.o
CC drivers/hid/hid-debug.o
CC drivers/acpi/acpica/utdelete.o
CC lib/errname.o
CC lib/nlattr.o
CC lib/cpu_rmap.o
CC drivers/md/dm-stripe.o
CC net/mac80211/chan.o
CC drivers/firmware/dmi_scan.o
CC drivers/cpufreq/amd-pstate.o
AR drivers/android/built-in.a
CC [M] drivers/gpu/drm/xe/xe_guc_capture.o
CC drivers/firmware/efi/libstub/random.o
CC drivers/platform/x86/p2sb.o
CC drivers/md/dm-ioctl.o
CC lib/dynamic_queue_limits.o
CC drivers/gpu/drm/i915/gt/intel_ggtt_fencing.o
CC drivers/firmware/efi/tpm.o
CC kernel/dma.o
CC drivers/firmware/efi/libstub/randomalloc.o
AR mm/built-in.a
CC lib/glob.o
AR drivers/mailbox/built-in.a
CC drivers/gpu/drm/drm_prime.o
CC drivers/acpi/acpica/uterror.o
CC drivers/gpu/drm/i915/gt/intel_gt.o
AR net/sunrpc/built-in.a
AR drivers/nvmem/layouts/built-in.a
CC drivers/firmware/efi/libstub/pci.o
CC drivers/nvmem/core.o
CC drivers/firmware/dmi-id.o
CC fs/d_path.o
CC arch/x86/kernel/module.o
CC drivers/firmware/efi/memmap.o
CC drivers/md/dm-io.o
AR net/wireless/built-in.a
AR drivers/hid/usbhid/built-in.a
CC drivers/firmware/efi/capsule.o
CC net/mac80211/trace.o
CC fs/stack.o
CC lib/strncpy_from_user.o
CC drivers/acpi/acpica/uteval.o
CC drivers/gpu/drm/drm_print.o
CC arch/x86/kernel/doublefault_32.o
CC kernel/smp.o
CC drivers/cpufreq/amd-pstate-trace.o
CC drivers/cpufreq/intel_pstate.o
CC drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.o
AR drivers/platform/x86/built-in.a
AR drivers/platform/built-in.a
CC net/ipv6/ah6.o
CC kernel/uid16.o
CC net/ipv4/gre_offload.o
CC net/mac80211/mlme.o
CC drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.o
CC lib/strnlen_user.o
CC drivers/md/dm-kcopyd.o
CC drivers/acpi/acpica/utglobal.o
CC net/ipv6/esp6.o
CC [M] drivers/gpu/drm/xe/xe_guc_ct.o
CC drivers/gpu/drm/drm_property.o
CC drivers/firmware/efi/libstub/skip_spaces.o
CC drivers/hid/hidraw.o
CC [M] drivers/gpu/drm/xe/xe_guc_db_mgr.o
CC drivers/firmware/efi/libstub/lib-cmdline.o
CC drivers/md/dm-sysfs.o
CC drivers/hid/hid-generic.o
CC drivers/gpu/drm/i915/gt/intel_gt_clock_utils.o
CC drivers/acpi/acpica/uthex.o
CC drivers/net/ethernet/intel/e1000e/ptp.o
CC fs/fs_struct.o
CC net/ipv6/sit.o
CC net/ipv4/metrics.o
CC drivers/acpi/processor_driver.o
CC drivers/firmware/efi/libstub/lib-ctype.o
CC drivers/firmware/efi/libstub/alignedmem.o
CC lib/net_utils.o
AR drivers/net/ethernet/oki-semi/built-in.a
AR drivers/net/ethernet/packetengines/built-in.a
CC drivers/acpi/acpica/utids.o
CC drivers/acpi/acpica/utinit.o
CC drivers/hid/hid-a4tech.o
CC net/ipv4/netlink.o
CC drivers/firmware/memmap.o
CC drivers/firmware/efi/esrt.o
CC net/ipv4/nexthop.o
CC drivers/gpu/drm/i915/gt/intel_gt_debugfs.o
CC drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.o
CC drivers/acpi/processor_thermal.o
AR drivers/nvmem/built-in.a
CC drivers/acpi/acpica/utlock.o
CC fs/statfs.o
CC net/ipv6/addrconf_core.o
CC arch/x86/kernel/early_printk.o
CC drivers/acpi/acpica/utmath.o
CC drivers/gpu/drm/i915/gt/intel_gt_irq.o
CC drivers/hid/hid-apple.o
AR drivers/net/ethernet/qlogic/built-in.a
CC fs/fs_pin.o
CC arch/x86/kernel/hpet.o
CC drivers/gpu/drm/i915/gt/intel_gt_mcr.o
CC drivers/gpu/drm/i915/gt/intel_gt_pm.o
CC net/mac80211/tdls.o
CC [M] drivers/gpu/drm/xe/xe_guc_engine_activity.o
CC drivers/md/dm-stats.o
CC kernel/kallsyms.o
CC drivers/firmware/efi/libstub/relocate.o
CC drivers/gpu/drm/drm_rect.o
CC drivers/acpi/acpica/utmisc.o
CC net/ipv6/exthdrs_core.o
CC lib/sg_pool.o
CC kernel/acct.o
CC drivers/firmware/efi/runtime-wrappers.o
CC drivers/md/dm-rq.o
CC drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.o
CC net/ipv4/udp_tunnel_stub.o
CC net/ipv6/ip6_checksum.o
CC net/ipv4/ip_tunnel.o
CC lib/stackdepot.o
CC kernel/vmcore_info.o
CC net/ipv6/ip6_icmp.o
CC net/mac80211/ocb.o
CC drivers/acpi/processor_idle.o
CC drivers/hid/hid-belkin.o
CC drivers/md/dm-io-rewind.o
CC kernel/elfcorehdr.o
CC net/ipv4/sysctl_net_ipv4.o
CC drivers/acpi/acpica/utmutex.o
CC [M] drivers/gpu/drm/xe/xe_guc_hwconfig.o
CC drivers/firmware/efi/capsule-loader.o
CC drivers/firmware/efi/libstub/printk.o
CC lib/asn1_decoder.o
CC fs/nsfs.o
AR drivers/net/ethernet/intel/e1000e/built-in.a
AR drivers/net/ethernet/qualcomm/emac/built-in.a
AR drivers/net/ethernet/intel/built-in.a
AR drivers/net/ethernet/qualcomm/built-in.a
CC net/mac80211/airtime.o
CC [M] drivers/gpu/drm/xe/xe_guc_id_mgr.o
CC drivers/acpi/acpica/utnonansi.o
CC drivers/firmware/efi/libstub/vsprintf.o
CC drivers/firmware/efi/libstub/x86-stub.o
CC drivers/hid/hid-cherry.o
CC drivers/md/dm-builtin.o
CC drivers/gpu/drm/i915/gt/intel_gt_pm_irq.o
CC drivers/gpu/drm/drm_syncobj.o
CC drivers/firmware/efi/earlycon.o
CC fs/fs_types.o
AR drivers/net/ethernet/nvidia/built-in.a
CC drivers/net/ethernet/realtek/8139too.o
CC arch/x86/kernel/amd_nb.o
CC net/ipv4/proc.o
CC [M] drivers/gpu/drm/xe/xe_guc_klv_helpers.o
CC drivers/net/ethernet/realtek/r8169_main.o
CC drivers/md/dm-raid1.o
AR drivers/cpufreq/built-in.a
CC [M] drivers/gpu/drm/xe/xe_guc_log.o
CC drivers/gpu/drm/i915/gt/intel_gt_requests.o
CC drivers/firmware/efi/libstub/smbios.o
CC net/ipv6/output_core.o
CC drivers/acpi/acpica/utobject.o
CC net/mac80211/eht.o
CC kernel/crash_reserve.o
CC drivers/net/ethernet/realtek/r8169_firmware.o
GEN lib/oid_registry_data.c
CC drivers/gpu/drm/drm_sysfs.o
CC lib/ucs2_string.o
CC [M] drivers/gpu/drm/xe/xe_guc_pc.o
CC net/ipv4/fib_rules.o
CC kernel/kexec_core.o
CC kernel/crash_core.o
CC [M] drivers/gpu/drm/xe/xe_guc_submit.o
CC drivers/acpi/processor_throttling.o
CC arch/x86/kernel/amd_node.o
CC drivers/hid/hid-chicony.o
CC net/ipv6/protocol.o
CC lib/sbitmap.o
CC drivers/md/dm-log.o
CC drivers/acpi/acpica/utosi.o
CC drivers/gpu/drm/i915/gt/intel_gt_sysfs.o
CC fs/fs_context.o
AR drivers/net/ethernet/renesas/built-in.a
CC net/mac80211/led.o
STUBCPY drivers/firmware/efi/libstub/alignedmem.stub.o
CC net/ipv4/ipmr.o
CC drivers/net/ethernet/realtek/r8169_phy_config.o
CC lib/group_cpus.o
CC kernel/kexec.o
CC drivers/md/dm-region-hash.o
CC drivers/acpi/acpica/utownerid.o
CC drivers/hid/hid-cypress.o
AR drivers/net/ethernet/rdc/built-in.a
CC kernel/utsname.o
AR drivers/net/ethernet/rocker/built-in.a
STUBCPY drivers/firmware/efi/libstub/efi-stub-helper.stub.o
CC drivers/md/dm-zero.o
CC drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.o
CC drivers/acpi/acpica/utpredef.o
STUBCPY drivers/firmware/efi/libstub/file.stub.o
STUBCPY drivers/firmware/efi/libstub/gop.stub.o
STUBCPY drivers/firmware/efi/libstub/lib-cmdline.stub.o
CC net/ipv6/ip6_offload.o
STUBCPY drivers/firmware/efi/libstub/lib-ctype.stub.o
STUBCPY drivers/firmware/efi/libstub/mem.stub.o
STUBCPY drivers/firmware/efi/libstub/pci.stub.o
STUBCPY drivers/firmware/efi/libstub/printk.stub.o
STUBCPY drivers/firmware/efi/libstub/random.stub.o
STUBCPY drivers/firmware/efi/libstub/randomalloc.stub.o
STUBCPY drivers/firmware/efi/libstub/relocate.stub.o
STUBCPY drivers/firmware/efi/libstub/secureboot.stub.o
STUBCPY drivers/firmware/efi/libstub/skip_spaces.stub.o
CC net/mac80211/pm.o
CC net/mac80211/rc80211_minstrel_ht.o
STUBCPY drivers/firmware/efi/libstub/smbios.stub.o
CC drivers/acpi/acpica/utresdecode.o
STUBCPY drivers/firmware/efi/libstub/tpm.stub.o
STUBCPY drivers/firmware/efi/libstub/vsprintf.stub.o
STUBCPY drivers/firmware/efi/libstub/x86-stub.stub.o
AR drivers/firmware/efi/libstub/lib.a
CC fs/fs_parser.o
AR drivers/firmware/efi/built-in.a
AR drivers/net/ethernet/samsung/built-in.a
CC arch/x86/kernel/kvm.o
AR drivers/firmware/built-in.a
CC arch/x86/kernel/kvmclock.o
CC lib/fw_table.o
CC drivers/hid/hid-ezkey.o
CC net/mac80211/wbrf.o
CC drivers/gpu/drm/drm_trace_points.o
CC net/ipv6/tcpv6_offload.o
CC drivers/gpu/drm/i915/gt/intel_gtt.o
CC fs/fsopen.o
AR drivers/net/ethernet/seeq/built-in.a
CC arch/x86/kernel/paravirt.o
CC net/ipv6/exthdrs_offload.o
AR drivers/net/ethernet/silan/built-in.a
CC drivers/acpi/acpica/utresrc.o
CC drivers/acpi/processor_perflib.o
CC drivers/hid/hid-gyration.o
AR lib/lib.a
AR drivers/net/ethernet/sis/built-in.a
CC [M] drivers/gpu/drm/xe/xe_heci_gsc.o
CC drivers/acpi/acpica/utstate.o
CC drivers/acpi/container.o
CC drivers/gpu/drm/drm_vblank.o
CC drivers/gpu/drm/i915/gt/intel_llc.o
CC kernel/pid_namespace.o
CC drivers/gpu/drm/drm_vblank_work.o
CC drivers/acpi/thermal_lib.o
CC fs/init.o
CC [M] drivers/gpu/drm/xe/xe_huc.o
CC drivers/acpi/thermal.o
CC net/ipv4/ipmr_base.o
CC [M] drivers/gpu/drm/xe/xe_hw_engine.o
GEN lib/crc32table.h
AR drivers/net/ethernet/sfc/built-in.a
CC fs/kernel_read_file.o
CC fs/mnt_idmapping.o
AR drivers/md/built-in.a
CC drivers/gpu/drm/drm_vma_manager.o
CC kernel/stop_machine.o
CC net/ipv6/inet6_hashtables.o
CC drivers/acpi/nhlt.o
CC lib/oid_registry.o
CC net/ipv4/syncookies.o
CC drivers/hid/hid-ite.o
CC drivers/acpi/acpica/utstring.o
CC drivers/gpu/drm/i915/gt/intel_lrc.o
CC drivers/gpu/drm/i915/gt/intel_migrate.o
AR drivers/net/ethernet/smsc/built-in.a
CC drivers/hid/hid-kensington.o
CC drivers/gpu/drm/drm_writeback.o
CC drivers/gpu/drm/i915/gt/intel_mocs.o
CC net/ipv4/tunnel4.o
CC kernel/audit.o
CC drivers/acpi/acpica/utstrsuppt.o
CC arch/x86/kernel/pvclock.o
AR drivers/net/ethernet/socionext/built-in.a
CC [M] drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.o
CC lib/crc32.o
CC fs/remap_range.o
CC net/ipv4/ipconfig.o
CC drivers/acpi/acpi_memhotplug.o
CC kernel/auditfilter.o
CC drivers/gpu/drm/i915/gt/intel_ppgtt.o
CC net/ipv4/netfilter.o
CC drivers/hid/hid-lg.o
CC [M] drivers/gpu/drm/xe/xe_hw_engine_group.o
CC net/ipv6/mcast_snoop.o
CC drivers/acpi/acpica/utstrtoul64.o
CC drivers/acpi/acpica/utxface.o
CC kernel/auditsc.o
CC kernel/audit_watch.o
AR drivers/net/ethernet/stmicro/built-in.a
CC kernel/audit_fsnotify.o
CC drivers/hid/hid-lgff.o
CC fs/pidfs.o
CC drivers/acpi/acpica/utxfinit.o
CC drivers/gpu/drm/drm_panel.o
CC [M] drivers/gpu/drm/xe/xe_hw_fence.o
CC drivers/acpi/acpica/utxferror.o
CC net/ipv4/tcp_cubic.o
CC [M] drivers/gpu/drm/xe/xe_irq.o
CC kernel/audit_tree.o
AR lib/built-in.a
CC fs/buffer.o
CC drivers/acpi/acpica/utxfmutex.o
CC drivers/gpu/drm/i915/gt/intel_rc6.o
CC drivers/acpi/ioapic.o
CC [M] drivers/gpu/drm/xe/xe_lrc.o
CC fs/mpage.o
CC net/ipv4/tcp_sigpool.o
AR drivers/net/ethernet/sun/built-in.a
AR drivers/net/ethernet/tehuti/built-in.a
CC net/ipv4/cipso_ipv4.o
CC drivers/hid/hid-lg4ff.o
CC arch/x86/kernel/pcspeaker.o
CC [M] drivers/gpu/drm/xe/xe_migrate.o
CC kernel/kprobes.o
CC drivers/acpi/battery.o
CC [M] drivers/gpu/drm/xe/xe_mmio.o
CC drivers/gpu/drm/i915/gt/intel_region_lmem.o
CC kernel/seccomp.o
CC arch/x86/kernel/check.o
AR drivers/acpi/acpica/built-in.a
AR drivers/net/ethernet/ti/built-in.a
CC arch/x86/kernel/uprobes.o
AR drivers/net/ethernet/vertexcom/built-in.a
CC fs/proc_namespace.o
CC net/ipv4/xfrm4_policy.o
CC fs/direct-io.o
CC fs/eventpoll.o
CC drivers/gpu/drm/drm_pci.o
CC [M] drivers/gpu/drm/xe/xe_mocs.o
CC drivers/gpu/drm/i915/gt/intel_renderstate.o
CC net/ipv4/xfrm4_state.o
CC fs/anon_inodes.o
CC drivers/hid/hid-lg-g15.o
CC arch/x86/kernel/perf_regs.o
CC drivers/gpu/drm/drm_debugfs.o
CC drivers/gpu/drm/i915/gt/intel_reset.o
CC fs/signalfd.o
AR drivers/net/ethernet/realtek/built-in.a
CC net/ipv4/xfrm4_input.o
AR drivers/net/ethernet/via/built-in.a
AR drivers/net/ethernet/wangxun/built-in.a
AR drivers/net/ethernet/wiznet/built-in.a
CC drivers/hid/hid-microsoft.o
AR drivers/net/ethernet/xilinx/built-in.a
AR drivers/net/ethernet/xircom/built-in.a
CC [M] drivers/gpu/drm/xe/xe_module.o
AR drivers/net/ethernet/synopsys/built-in.a
AR net/ipv6/built-in.a
AR drivers/net/ethernet/pensando/built-in.a
CC kernel/relay.o
AR drivers/net/ethernet/built-in.a
CC drivers/hid/hid-monterey.o
CC arch/x86/kernel/tracepoint.o
CC drivers/hid/hid-ntrig.o
AR drivers/net/built-in.a
CC drivers/gpu/drm/drm_debugfs_crc.o
CC arch/x86/kernel/itmt.o
CC kernel/utsname_sysctl.o
CC fs/timerfd.o
CC drivers/gpu/drm/i915/gt/intel_ring.o
CC [M] drivers/gpu/drm/xe/xe_oa.o
CC kernel/delayacct.o
CC net/ipv4/xfrm4_output.o
CC drivers/gpu/drm/drm_panel_orientation_quirks.o
CC arch/x86/kernel/umip.o
CC [M] drivers/gpu/drm/xe/xe_observation.o
CC net/ipv4/xfrm4_protocol.o
CC drivers/gpu/drm/drm_buddy.o
CC drivers/acpi/bgrt.o
CC drivers/gpu/drm/drm_gem_shmem_helper.o
CC drivers/hid/hid-pl.o
CC drivers/gpu/drm/i915/gt/intel_ring_submission.o
CC arch/x86/kernel/unwind_frame.o
CC fs/eventfd.o
CC drivers/acpi/spcr.o
CC [M] drivers/gpu/drm/xe/xe_pat.o
CC drivers/gpu/drm/drm_atomic_helper.o
CC fs/aio.o
CC kernel/taskstats.o
CC drivers/hid/hid-petalynx.o
CC drivers/gpu/drm/i915/gt/intel_rps.o
CC fs/locks.o
CC drivers/gpu/drm/drm_atomic_state_helper.o
CC [M] drivers/gpu/drm/xe/xe_pci.o
CC kernel/tsacct.o
CC drivers/gpu/drm/i915/gt/intel_sa_media.o
CC fs/binfmt_misc.o
CC drivers/gpu/drm/drm_crtc_helper.o
CC drivers/hid/hid-redragon.o
CC [M] drivers/gpu/drm/xe/xe_pcode.o
CC drivers/gpu/drm/i915/gt/intel_sseu.o
CC drivers/gpu/drm/drm_damage_helper.o
CC kernel/tracepoint.o
CC fs/binfmt_script.o
CC drivers/hid/hid-samsung.o
CC kernel/irq_work.o
CC [M] drivers/gpu/drm/xe/xe_pm.o
CC drivers/hid/hid-sony.o
CC drivers/gpu/drm/i915/gt/intel_sseu_debugfs.o
AR drivers/acpi/built-in.a
CC fs/binfmt_elf.o
CC kernel/static_call.o
CC drivers/gpu/drm/drm_flip_work.o
CC kernel/padata.o
CC [M] drivers/gpu/drm/xe/xe_preempt_fence.o
AR arch/x86/kernel/built-in.a
CC fs/mbcache.o
CC drivers/gpu/drm/i915/gt/intel_timeline.o
AR arch/x86/built-in.a
CC drivers/gpu/drm/drm_format_helper.o
CC kernel/jump_label.o
CC drivers/gpu/drm/i915/gt/intel_tlb.o
CC drivers/hid/hid-sunplus.o
CC fs/posix_acl.o
CC drivers/gpu/drm/drm_gem_atomic_helper.o
CC [M] drivers/gpu/drm/xe/xe_pt.o
CC drivers/hid/hid-topseed.o
CC [M] drivers/gpu/drm/xe/xe_pt_walk.o
CC kernel/context_tracking.o
CC fs/coredump.o
CC drivers/gpu/drm/i915/gt/intel_wopcm.o
CC fs/drop_caches.o
CC [M] drivers/gpu/drm/xe/xe_pxp.o
CC drivers/gpu/drm/i915/gt/intel_workarounds.o
CC [M] drivers/gpu/drm/xe/xe_pxp_debugfs.o
AR net/ipv4/built-in.a
CC drivers/gpu/drm/drm_gem_framebuffer_helper.o
CC fs/sysctls.o
CC kernel/iomem.o
CC drivers/gpu/drm/drm_kms_helper_common.o
CC drivers/gpu/drm/i915/gt/shmem_utils.o
CC [M] drivers/gpu/drm/xe/xe_pxp_submit.o
CC drivers/gpu/drm/i915/gt/sysfs_engines.o
CC [M] drivers/gpu/drm/xe/xe_query.o
CC kernel/rseq.o
CC drivers/gpu/drm/drm_modeset_helper.o
CC drivers/gpu/drm/i915/gt/intel_ggtt_gmch.o
CC [M] drivers/gpu/drm/xe/xe_range_fence.o
CC fs/fhandle.o
CC drivers/gpu/drm/i915/gt/gen6_renderstate.o
CC [M] drivers/gpu/drm/xe/xe_reg_sr.o
CC drivers/gpu/drm/drm_plane_helper.o
CC drivers/gpu/drm/i915/gt/gen7_renderstate.o
CC [M] drivers/gpu/drm/xe/xe_reg_whitelist.o
CC drivers/gpu/drm/drm_probe_helper.o
CC drivers/gpu/drm/i915/gt/gen8_renderstate.o
CC drivers/gpu/drm/i915/gt/gen9_renderstate.o
CC [M] drivers/gpu/drm/xe/xe_ring_ops.o
CC drivers/gpu/drm/drm_self_refresh_helper.o
CC drivers/gpu/drm/i915/gem/i915_gem_busy.o
CC [M] drivers/gpu/drm/xe/xe_rtp.o
CC drivers/gpu/drm/drm_simple_kms_helper.o
CC drivers/gpu/drm/i915/gem/i915_gem_clflush.o
CC drivers/gpu/drm/i915/gem/i915_gem_context.o
CC [M] drivers/gpu/drm/xe/xe_sa.o
CC [M] drivers/gpu/drm/xe/xe_sched_job.o
CC drivers/gpu/drm/bridge/panel.o
CC [M] drivers/gpu/drm/xe/xe_shrinker.o
CC drivers/gpu/drm/i915/gem/i915_gem_create.o
CC [M] drivers/gpu/drm/xe/xe_step.o
CC drivers/gpu/drm/i915/gem/i915_gem_dmabuf.o
CC [M] drivers/gpu/drm/xe/xe_survivability_mode.o
CC drivers/gpu/drm/drm_mipi_dsi.o
AR drivers/hid/built-in.a
CC [M] drivers/gpu/drm/drm_exec.o
CC drivers/gpu/drm/i915/gem/i915_gem_domain.o
CC [M] drivers/gpu/drm/drm_gpuvm.o
CC drivers/gpu/drm/i915/gem/i915_gem_execbuffer.o
CC [M] drivers/gpu/drm/xe/xe_sync.o
CC drivers/gpu/drm/i915/gem/i915_gem_internal.o
CC drivers/gpu/drm/i915/gem/i915_gem_lmem.o
CC [M] drivers/gpu/drm/xe/xe_tile.o
CC [M] drivers/gpu/drm/drm_suballoc.o
CC [M] drivers/gpu/drm/xe/xe_tile_sysfs.o
CC [M] drivers/gpu/drm/xe/xe_trace.o
CC [M] drivers/gpu/drm/drm_gem_ttm_helper.o
CC drivers/gpu/drm/i915/gem/i915_gem_mman.o
CC drivers/gpu/drm/i915/gem/i915_gem_object.o
CC [M] drivers/gpu/drm/xe/xe_trace_bo.o
AR kernel/built-in.a
CC drivers/gpu/drm/i915/gem/i915_gem_pages.o
CC drivers/gpu/drm/i915/gem/i915_gem_phys.o
CC [M] drivers/gpu/drm/xe/xe_trace_guc.o
CC [M] drivers/gpu/drm/xe/xe_trace_lrc.o
CC drivers/gpu/drm/i915/gem/i915_gem_pm.o
CC drivers/gpu/drm/i915/gem/i915_gem_region.o
CC [M] drivers/gpu/drm/xe/xe_ttm_stolen_mgr.o
AR net/mac80211/built-in.a
CC drivers/gpu/drm/i915/gem/i915_gem_shmem.o
AR net/built-in.a
CC [M] drivers/gpu/drm/xe/xe_ttm_sys_mgr.o
CC drivers/gpu/drm/i915/gem/i915_gem_shrinker.o
CC drivers/gpu/drm/i915/gem/i915_gem_stolen.o
CC [M] drivers/gpu/drm/xe/xe_ttm_vram_mgr.o
CC [M] drivers/gpu/drm/xe/xe_tuning.o
CC drivers/gpu/drm/i915/gem/i915_gem_throttle.o
AR fs/built-in.a
CC [M] drivers/gpu/drm/xe/xe_uc.o
CC drivers/gpu/drm/i915/gem/i915_gem_tiling.o
CC [M] drivers/gpu/drm/xe/xe_uc_fw.o
CC [M] drivers/gpu/drm/xe/xe_vm.o
CC drivers/gpu/drm/i915/gem/i915_gem_ttm.o
LD [M] drivers/gpu/drm/drm_suballoc_helper.o
CC drivers/gpu/drm/i915/gem/i915_gem_ttm_move.o
CC [M] drivers/gpu/drm/xe/xe_vram.o
CC [M] drivers/gpu/drm/xe/xe_vram_freq.o
CC drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.o
CC [M] drivers/gpu/drm/xe/xe_vsec.o
LD [M] drivers/gpu/drm/drm_ttm_helper.o
CC drivers/gpu/drm/i915/gem/i915_gem_userptr.o
CC [M] drivers/gpu/drm/xe/xe_wa.o
CC [M] drivers/gpu/drm/xe/xe_wait_user_fence.o
CC drivers/gpu/drm/i915/gem/i915_gem_wait.o
CC [M] drivers/gpu/drm/xe/xe_wopcm.o
CC drivers/gpu/drm/i915/gem/i915_gemfs.o
CC [M] drivers/gpu/drm/xe/xe_hmm.o
CC [M] drivers/gpu/drm/xe/xe_hwmon.o
CC drivers/gpu/drm/i915/i915_active.o
CC drivers/gpu/drm/i915/i915_cmd_parser.o
CC drivers/gpu/drm/i915/i915_deps.o
CC [M] drivers/gpu/drm/xe/xe_pmu.o
CC [M] drivers/gpu/drm/xe/xe_gt_sriov_vf.o
CC [M] drivers/gpu/drm/xe/xe_guc_relay.o
CC drivers/gpu/drm/i915/i915_gem.o
CC drivers/gpu/drm/i915/i915_gem_evict.o
CC [M] drivers/gpu/drm/xe/xe_memirq.o
CC drivers/gpu/drm/i915/i915_gem_gtt.o
CC [M] drivers/gpu/drm/xe/xe_sriov.o
CC drivers/gpu/drm/i915/i915_gem_ww.o
CC drivers/gpu/drm/i915/i915_query.o
CC [M] drivers/gpu/drm/xe/xe_sriov_vf.o
CC drivers/gpu/drm/i915/i915_request.o
CC [M] drivers/gpu/drm/xe/display/ext/i915_irq.o
CC [M] drivers/gpu/drm/xe/display/ext/i915_utils.o
CC [M] drivers/gpu/drm/xe/display/intel_bo.o
CC [M] drivers/gpu/drm/xe/display/intel_fb_bo.o
CC drivers/gpu/drm/i915/i915_scheduler.o
CC [M] drivers/gpu/drm/xe/display/intel_fbdev_fb.o
CC drivers/gpu/drm/i915/i915_trace_points.o
CC [M] drivers/gpu/drm/xe/display/xe_display.o
CC [M] drivers/gpu/drm/xe/display/xe_display_misc.o
CC drivers/gpu/drm/i915/i915_ttm_buddy_manager.o
CC [M] drivers/gpu/drm/xe/display/xe_display_rps.o
CC [M] drivers/gpu/drm/xe/display/xe_display_wa.o
CC [M] drivers/gpu/drm/xe/display/xe_dsb_buffer.o
CC [M] drivers/gpu/drm/xe/display/xe_fb_pin.o
CC [M] drivers/gpu/drm/xe/display/xe_hdcp_gsc.o
CC drivers/gpu/drm/i915/i915_vma.o
CC [M] drivers/gpu/drm/xe/display/xe_plane_initial.o
CC drivers/gpu/drm/i915/i915_vma_resource.o
CC [M] drivers/gpu/drm/xe/display/xe_tdf.o
CC drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.o
CC [M] drivers/gpu/drm/xe/i915-soc/intel_dram.o
CC [M] drivers/gpu/drm/xe/i915-soc/intel_pch.o
CC [M] drivers/gpu/drm/xe/i915-soc/intel_rom.o
CC drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.o
CC [M] drivers/gpu/drm/xe/i915-display/icl_dsi.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_alpm.o
CC drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_atomic.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_atomic_plane.o
CC drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_debugfs.o
CC drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_audio.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_backlight.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_bios.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_bw.o
CC drivers/gpu/drm/i915/gt/uc/intel_guc.o
CC drivers/gpu/drm/i915/gt/uc/intel_guc_ads.o
CC drivers/gpu/drm/i915/gt/uc/intel_guc_capture.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_cdclk.o
CC drivers/gpu/drm/i915/gt/uc/intel_guc_ct.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_cmtg.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_color.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_combo_phy.o
CC drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.o
CC drivers/gpu/drm/i915/gt/uc/intel_guc_fw.o
CC drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_connector.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_crtc.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_crtc_state_dump.o
CC drivers/gpu/drm/i915/gt/uc/intel_guc_log.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_cursor.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_cx0_phy.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_ddi.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_ddi_buf_trans.o
CC drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_display.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_display_conversion.o
CC drivers/gpu/drm/i915/gt/uc/intel_guc_rc.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_display_device.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_display_driver.o
CC drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_display_irq.o
CC drivers/gpu/drm/i915/gt/uc/intel_guc_submission.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_display_params.o
CC drivers/gpu/drm/i915/gt/uc/intel_huc.o
CC drivers/gpu/drm/i915/gt/uc/intel_huc_debugfs.o
CC drivers/gpu/drm/i915/gt/uc/intel_huc_fw.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_display_power.o
CC drivers/gpu/drm/i915/gt/uc/intel_uc.o
CC drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_display_power_map.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_display_power_well.o
CC drivers/gpu/drm/i915/gt/uc/intel_uc_fw.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_display_trace.o
CC drivers/gpu/drm/i915/gt/intel_gsc.o
CC drivers/gpu/drm/i915/i915_hwmon.o
CC drivers/gpu/drm/i915/display/hsw_ips.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_display_wa.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dkl_phy.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dmc.o
CC drivers/gpu/drm/i915/display/i9xx_plane.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dmc_wl.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dp.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dp_aux.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dp_aux_backlight.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dp_hdcp.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dp_link_training.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dp_mst.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dp_test.o
CC drivers/gpu/drm/i915/display/i9xx_display_sr.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dpll.o
CC drivers/gpu/drm/i915/display/i9xx_wm.o
CC drivers/gpu/drm/i915/display/intel_alpm.o
CC drivers/gpu/drm/i915/display/intel_atomic.o
CC drivers/gpu/drm/i915/display/intel_atomic_plane.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dpll_mgr.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dpt_common.o
CC drivers/gpu/drm/i915/display/intel_audio.o
CC drivers/gpu/drm/i915/display/intel_bios.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_drrs.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dsb.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dsi.o
CC drivers/gpu/drm/i915/display/intel_bo.o
CC drivers/gpu/drm/i915/display/intel_bw.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dsi_dcs_backlight.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_dsi_vbt.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_encoder.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_fb.o
CC drivers/gpu/drm/i915/display/intel_cdclk.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_fbc.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_fdi.o
CC drivers/gpu/drm/i915/display/intel_cmtg.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_fifo_underrun.o
CC drivers/gpu/drm/i915/display/intel_color.o
CC drivers/gpu/drm/i915/display/intel_combo_phy.o
CC drivers/gpu/drm/i915/display/intel_connector.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_frontbuffer.o
CC drivers/gpu/drm/i915/display/intel_crtc.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_global_state.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_gmbus.o
CC drivers/gpu/drm/i915/display/intel_crtc_state_dump.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_hdcp.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_hdcp_gsc_message.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_hdmi.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_hotplug.o
CC drivers/gpu/drm/i915/display/intel_cursor.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_hotplug_irq.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_hti.o
CC drivers/gpu/drm/i915/display/intel_display.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_link_bw.o
CC drivers/gpu/drm/i915/display/intel_display_conversion.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_lspcon.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_modeset_lock.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_modeset_setup.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_modeset_verify.o
CC drivers/gpu/drm/i915/display/intel_display_driver.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_panel.o
CC drivers/gpu/drm/i915/display/intel_display_irq.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_pfit.o
CC drivers/gpu/drm/i915/display/intel_display_params.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_pmdemand.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_pps.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_psr.o
CC drivers/gpu/drm/i915/display/intel_display_power.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_qp_tables.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_quirks.o
CC drivers/gpu/drm/i915/display/intel_display_power_map.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_snps_hdmi_pll.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_snps_phy.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_tc.o
CC drivers/gpu/drm/i915/display/intel_display_power_well.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_vblank.o
CC drivers/gpu/drm/i915/display/intel_display_reset.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_vdsc.o
CC drivers/gpu/drm/i915/display/intel_display_rps.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_vga.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_vrr.o
CC drivers/gpu/drm/i915/display/intel_display_snapshot.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_wm.o
CC drivers/gpu/drm/i915/display/intel_display_wa.o
CC [M] drivers/gpu/drm/xe/i915-display/skl_scaler.o
CC drivers/gpu/drm/i915/display/intel_dmc.o
CC [M] drivers/gpu/drm/xe/i915-display/skl_universal_plane.o
CC [M] drivers/gpu/drm/xe/i915-display/skl_watermark.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_acpi.o
CC drivers/gpu/drm/i915/display/intel_dmc_wl.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_opregion.o
CC [M] drivers/gpu/drm/xe/xe_debugfs.o
CC [M] drivers/gpu/drm/xe/xe_gt_debugfs.o
CC drivers/gpu/drm/i915/display/intel_dpio_phy.o
CC [M] drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.o
CC [M] drivers/gpu/drm/xe/xe_gt_stats.o
CC drivers/gpu/drm/i915/display/intel_dpll.o
CC [M] drivers/gpu/drm/xe/xe_guc_debugfs.o
CC [M] drivers/gpu/drm/xe/xe_huc_debugfs.o
CC [M] drivers/gpu/drm/xe/xe_uc_debugfs.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_display_debugfs.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_display_debugfs_params.o
CC drivers/gpu/drm/i915/display/intel_dpll_mgr.o
CC drivers/gpu/drm/i915/display/intel_dpt.o
CC [M] drivers/gpu/drm/xe/i915-display/intel_pipe_crc.o
CC drivers/gpu/drm/i915/display/intel_dpt_common.o
CC drivers/gpu/drm/i915/display/intel_drrs.o
CC drivers/gpu/drm/i915/display/intel_dsb.o
CC drivers/gpu/drm/i915/display/intel_dsb_buffer.o
CC drivers/gpu/drm/i915/display/intel_fb.o
CC drivers/gpu/drm/i915/display/intel_fb_bo.o
CC drivers/gpu/drm/i915/display/intel_fb_pin.o
CC drivers/gpu/drm/i915/display/intel_fbc.o
CC drivers/gpu/drm/i915/display/intel_fdi.o
CC drivers/gpu/drm/i915/display/intel_fifo_underrun.o
CC drivers/gpu/drm/i915/display/intel_frontbuffer.o
CC drivers/gpu/drm/i915/display/intel_global_state.o
CC drivers/gpu/drm/i915/display/intel_hdcp.o
CC drivers/gpu/drm/i915/display/intel_hdcp_gsc.o
CC drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.o
CC drivers/gpu/drm/i915/display/intel_hotplug.o
CC drivers/gpu/drm/i915/display/intel_hotplug_irq.o
CC drivers/gpu/drm/i915/display/intel_hti.o
CC drivers/gpu/drm/i915/display/intel_link_bw.o
CC drivers/gpu/drm/i915/display/intel_load_detect.o
CC drivers/gpu/drm/i915/display/intel_lpe_audio.o
CC drivers/gpu/drm/i915/display/intel_modeset_lock.o
CC drivers/gpu/drm/i915/display/intel_modeset_setup.o
CC drivers/gpu/drm/i915/display/intel_modeset_verify.o
CC drivers/gpu/drm/i915/display/intel_overlay.o
CC drivers/gpu/drm/i915/display/intel_pch_display.o
CC drivers/gpu/drm/i915/display/intel_pch_refclk.o
CC drivers/gpu/drm/i915/display/intel_plane_initial.o
CC drivers/gpu/drm/i915/display/intel_pmdemand.o
CC drivers/gpu/drm/i915/display/intel_psr.o
CC drivers/gpu/drm/i915/display/intel_quirks.o
CC drivers/gpu/drm/i915/display/intel_sprite.o
CC drivers/gpu/drm/i915/display/intel_sprite_uapi.o
CC drivers/gpu/drm/i915/display/intel_tc.o
CC drivers/gpu/drm/i915/display/intel_vblank.o
CC drivers/gpu/drm/i915/display/intel_vga.o
CC drivers/gpu/drm/i915/display/intel_wm.o
CC drivers/gpu/drm/i915/display/skl_scaler.o
CC drivers/gpu/drm/i915/display/skl_universal_plane.o
CC drivers/gpu/drm/i915/display/skl_watermark.o
CC drivers/gpu/drm/i915/display/intel_acpi.o
CC drivers/gpu/drm/i915/display/intel_opregion.o
CC drivers/gpu/drm/i915/display/intel_display_debugfs.o
CC drivers/gpu/drm/i915/display/intel_display_debugfs_params.o
CC drivers/gpu/drm/i915/display/intel_pipe_crc.o
CC drivers/gpu/drm/i915/display/dvo_ch7017.o
CC drivers/gpu/drm/i915/display/dvo_ch7xxx.o
CC drivers/gpu/drm/i915/display/dvo_ivch.o
CC drivers/gpu/drm/i915/display/dvo_ns2501.o
CC drivers/gpu/drm/i915/display/dvo_sil164.o
CC drivers/gpu/drm/i915/display/dvo_tfp410.o
CC drivers/gpu/drm/i915/display/g4x_dp.o
CC drivers/gpu/drm/i915/display/g4x_hdmi.o
CC drivers/gpu/drm/i915/display/icl_dsi.o
CC drivers/gpu/drm/i915/display/intel_backlight.o
CC drivers/gpu/drm/i915/display/intel_crt.o
CC drivers/gpu/drm/i915/display/intel_cx0_phy.o
CC drivers/gpu/drm/i915/display/intel_ddi.o
CC drivers/gpu/drm/i915/display/intel_ddi_buf_trans.o
CC drivers/gpu/drm/i915/display/intel_display_device.o
CC drivers/gpu/drm/i915/display/intel_display_trace.o
CC drivers/gpu/drm/i915/display/intel_dkl_phy.o
CC drivers/gpu/drm/i915/display/intel_dp.o
CC drivers/gpu/drm/i915/display/intel_dp_aux.o
CC drivers/gpu/drm/i915/display/intel_dp_aux_backlight.o
CC drivers/gpu/drm/i915/display/intel_dp_hdcp.o
CC drivers/gpu/drm/i915/display/intel_dp_link_training.o
CC drivers/gpu/drm/i915/display/intel_dp_mst.o
CC drivers/gpu/drm/i915/display/intel_dp_test.o
CC drivers/gpu/drm/i915/display/intel_dsi.o
CC drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.o
CC drivers/gpu/drm/i915/display/intel_dsi_vbt.o
CC drivers/gpu/drm/i915/display/intel_dvo.o
CC drivers/gpu/drm/i915/display/intel_encoder.o
CC drivers/gpu/drm/i915/display/intel_gmbus.o
CC drivers/gpu/drm/i915/display/intel_hdmi.o
CC drivers/gpu/drm/i915/display/intel_lspcon.o
CC drivers/gpu/drm/i915/display/intel_lvds.o
CC drivers/gpu/drm/i915/display/intel_panel.o
CC drivers/gpu/drm/i915/display/intel_pfit.o
CC drivers/gpu/drm/i915/display/intel_pps.o
CC drivers/gpu/drm/i915/display/intel_qp_tables.o
CC drivers/gpu/drm/i915/display/intel_sdvo.o
CC drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.o
CC drivers/gpu/drm/i915/display/intel_snps_phy.o
CC drivers/gpu/drm/i915/display/intel_tv.o
CC drivers/gpu/drm/i915/display/intel_vdsc.o
CC drivers/gpu/drm/i915/display/intel_vrr.o
LD [M] drivers/gpu/drm/xe/xe.o
CC drivers/gpu/drm/i915/display/vlv_dsi.o
CC drivers/gpu/drm/i915/display/vlv_dsi_pll.o
CC drivers/gpu/drm/i915/i915_perf.o
CC drivers/gpu/drm/i915/pxp/intel_pxp.o
CC drivers/gpu/drm/i915/pxp/intel_pxp_huc.o
CC drivers/gpu/drm/i915/pxp/intel_pxp_tee.o
CC drivers/gpu/drm/i915/i915_gpu_error.o
CC drivers/gpu/drm/i915/i915_vgpu.o
AR drivers/gpu/drm/i915/built-in.a
AR drivers/gpu/drm/built-in.a
AR drivers/gpu/built-in.a
AR drivers/built-in.a
AR built-in.a
AR vmlinux.a
LD vmlinux.o
OBJCOPY modules.builtin.modinfo
GEN modules.builtin
MODPOST Module.symvers
CC .vmlinux.export.o
CC [M] fs/efivarfs/efivarfs.mod.o
CC [M] .module-common.o
CC [M] drivers/gpu/drm/drm_exec.mod.o
CC [M] drivers/gpu/drm/drm_gpuvm.mod.o
CC [M] drivers/gpu/drm/drm_suballoc_helper.mod.o
CC [M] drivers/gpu/drm/drm_ttm_helper.mod.o
CC [M] drivers/gpu/drm/scheduler/gpu-sched.mod.o
CC [M] drivers/gpu/drm/xe/xe.mod.o
CC [M] drivers/thermal/intel/x86_pkg_temp_thermal.mod.o
CC [M] net/netfilter/nf_log_syslog.mod.o
CC [M] net/netfilter/xt_mark.mod.o
CC [M] net/netfilter/xt_nat.mod.o
CC [M] net/netfilter/xt_LOG.mod.o
CC [M] net/netfilter/xt_MASQUERADE.mod.o
CC [M] net/netfilter/xt_addrtype.mod.o
CC [M] net/ipv4/netfilter/iptable_nat.mod.o
LD [M] fs/efivarfs/efivarfs.ko
LD [M] drivers/gpu/drm/drm_exec.ko
LD [M] drivers/gpu/drm/drm_gpuvm.ko
LD [M] net/netfilter/xt_nat.ko
LD [M] net/netfilter/xt_addrtype.ko
LD [M] net/netfilter/nf_log_syslog.ko
LD [M] drivers/gpu/drm/drm_suballoc_helper.ko
LD [M] net/ipv4/netfilter/iptable_nat.ko
LD [M] drivers/gpu/drm/scheduler/gpu-sched.ko
LD [M] drivers/gpu/drm/drm_ttm_helper.ko
LD [M] drivers/gpu/drm/xe/xe.ko
LD [M] drivers/thermal/intel/x86_pkg_temp_thermal.ko
LD [M] net/netfilter/xt_LOG.ko
LD [M] net/netfilter/xt_MASQUERADE.ko
LD [M] net/netfilter/xt_mark.ko
UPD include/generated/utsversion.h
CC init/version-timestamp.o
KSYMS .tmp_vmlinux0.kallsyms.S
AS .tmp_vmlinux0.kallsyms.o
LD .tmp_vmlinux1
NM .tmp_vmlinux1.syms
KSYMS .tmp_vmlinux1.kallsyms.S
AS .tmp_vmlinux1.kallsyms.o
LD .tmp_vmlinux2
NM .tmp_vmlinux2.syms
KSYMS .tmp_vmlinux2.kallsyms.S
AS .tmp_vmlinux2.kallsyms.o
LD vmlinux
NM System.map
SORTTAB vmlinux
RELOCS arch/x86/boot/compressed/vmlinux.relocs
RSTRIP vmlinux
CC arch/x86/boot/a20.o
AS arch/x86/boot/bioscall.o
CC arch/x86/boot/cmdline.o
AS arch/x86/boot/copy.o
HOSTCC arch/x86/boot/mkcpustr
CC arch/x86/boot/cpuflags.o
CC arch/x86/boot/cpucheck.o
CC arch/x86/boot/early_serial_console.o
CC arch/x86/boot/edd.o
CC arch/x86/boot/main.o
CC arch/x86/boot/memory.o
CC arch/x86/boot/pm.o
AS arch/x86/boot/pmjump.o
CC arch/x86/boot/printf.o
CC arch/x86/boot/regs.o
CC arch/x86/boot/string.o
CC arch/x86/boot/tty.o
CC arch/x86/boot/video.o
CC arch/x86/boot/video-mode.o
CC arch/x86/boot/version.o
CC arch/x86/boot/video-vga.o
CC arch/x86/boot/video-vesa.o
CC arch/x86/boot/video-bios.o
HOSTCC arch/x86/boot/tools/build
CPUSTR arch/x86/boot/cpustr.h
LDS arch/x86/boot/compressed/vmlinux.lds
CC arch/x86/boot/cpu.o
AS arch/x86/boot/compressed/kernel_info.o
AS arch/x86/boot/compressed/head_32.o
VOFFSET arch/x86/boot/compressed/../voffset.h
CC arch/x86/boot/compressed/string.o
CC arch/x86/boot/compressed/cmdline.o
CC arch/x86/boot/compressed/error.o
OBJCOPY arch/x86/boot/compressed/vmlinux.bin
HOSTCC arch/x86/boot/compressed/mkpiggy
CC arch/x86/boot/compressed/cpuflags.o
CC arch/x86/boot/compressed/early_serial_console.o
CC arch/x86/boot/compressed/kaslr.o
CC arch/x86/boot/compressed/acpi.o
CC arch/x86/boot/compressed/efi.o
GZIP arch/x86/boot/compressed/vmlinux.bin.gz
CC arch/x86/boot/compressed/misc.o
MKPIGGY arch/x86/boot/compressed/piggy.S
AS arch/x86/boot/compressed/piggy.o
LD arch/x86/boot/compressed/vmlinux
ZOFFSET arch/x86/boot/zoffset.h
OBJCOPY arch/x86/boot/vmlinux.bin
AS arch/x86/boot/header.o
LD arch/x86/boot/setup.elf
OBJCOPY arch/x86/boot/setup.bin
BUILD arch/x86/boot/bzImage
Kernel: arch/x86/boot/bzImage is ready (#1)
run-parts: executing /workspace/ci/hooks/20-kernel-doc
+ SRC_DIR=/workspace/kernel
+ cd /workspace/kernel
+ xargs ./scripts/kernel-doc -Werror -none include/uapi/drm/xe_drm.h
+ find drivers/gpu/drm/xe/ -name '*.[ch]' -not -path 'drivers/gpu/drm/xe/display/*'
All hooks done
^ permalink raw reply [flat|nested] 31+ messages in thread* ✓ CI.checksparse: success for drm/i915/display: conversions to struct intel_display (rev2)
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (14 preceding siblings ...)
2025-03-11 20:40 ` ✓ CI.Hooks: " Patchwork
@ 2025-03-11 20:42 ` Patchwork
2025-03-11 21:06 ` ✓ Xe.CI.BAT: " Patchwork
2025-03-12 12:03 ` ✗ Xe.CI.Full: failure " Patchwork
17 siblings, 0 replies; 31+ messages in thread
From: Patchwork @ 2025-03-11 20:42 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-xe
== Series Details ==
Series: drm/i915/display: conversions to struct intel_display (rev2)
URL : https://patchwork.freedesktop.org/series/144749/
State : success
== Summary ==
+ trap cleanup EXIT
+ KERNEL=/kernel
+ MT=/root/linux/maintainer-tools
+ git clone https://gitlab.freedesktop.org/drm/maintainer-tools /root/linux/maintainer-tools
Cloning into '/root/linux/maintainer-tools'...
warning: redirecting to https://gitlab.freedesktop.org/drm/maintainer-tools.git/
+ make -C /root/linux/maintainer-tools
make: Entering directory '/root/linux/maintainer-tools'
cc -O2 -g -Wextra -o remap-log remap-log.c
make: Leaving directory '/root/linux/maintainer-tools'
+ cd /kernel
+ git config --global --add safe.directory /kernel
+ /root/linux/maintainer-tools/dim sparse --fast eb17816e52395a403aa0b447aa0befa9d2f86dd5
Sparse version: 0.6.4 (Ubuntu: 0.6.4-4ubuntu3)
Fast mode used, each commit won't be checked separately.
Okay!
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel
^ permalink raw reply [flat|nested] 31+ messages in thread* ✓ Xe.CI.BAT: success for drm/i915/display: conversions to struct intel_display (rev2)
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (15 preceding siblings ...)
2025-03-11 20:42 ` ✓ CI.checksparse: " Patchwork
@ 2025-03-11 21:06 ` Patchwork
2025-03-12 12:03 ` ✗ Xe.CI.Full: failure " Patchwork
17 siblings, 0 replies; 31+ messages in thread
From: Patchwork @ 2025-03-11 21:06 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-xe
[-- Attachment #1: Type: text/plain, Size: 1962 bytes --]
== Series Details ==
Series: drm/i915/display: conversions to struct intel_display (rev2)
URL : https://patchwork.freedesktop.org/series/144749/
State : success
== Summary ==
CI Bug Log - changes from xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373_BAT -> xe-pw-144749v2_BAT
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (10 -> 9)
------------------------------
Missing (1): bat-adlp-vm
Known issues
------------
Here are the changes found in xe-pw-144749v2_BAT that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@xe_live_ktest@xe_migrate:
- bat-adlp-vf: [PASS][1] -> [ABORT][2] ([Intel XE#4520]) +1 other test abort
[1]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/bat-adlp-vf/igt@xe_live_ktest@xe_migrate.html
[2]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/bat-adlp-vf/igt@xe_live_ktest@xe_migrate.html
* igt@xe_module_load@load:
- bat-dg2-oem2: [PASS][3] -> [ABORT][4] ([Intel XE#4507])
[3]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/bat-dg2-oem2/igt@xe_module_load@load.html
[4]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/bat-dg2-oem2/igt@xe_module_load@load.html
[Intel XE#4507]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4507
[Intel XE#4520]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4520
Build changes
-------------
* Linux: xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373 -> xe-pw-144749v2
IGT_8270: 49751c5c11723262ec66e564c76503f74a9fa831 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373: f8df428b3850ed87a1e2f3b12b6025328d8a6373
xe-pw-144749v2: 144749v2
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/index.html
[-- Attachment #2: Type: text/html, Size: 2561 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread* ✗ Xe.CI.Full: failure for drm/i915/display: conversions to struct intel_display (rev2)
2025-03-11 18:00 [PATCH 0/9] drm/i915/display: conversions to struct intel_display Jani Nikula
` (16 preceding siblings ...)
2025-03-11 21:06 ` ✓ Xe.CI.BAT: " Patchwork
@ 2025-03-12 12:03 ` Patchwork
17 siblings, 0 replies; 31+ messages in thread
From: Patchwork @ 2025-03-12 12:03 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-xe
[-- Attachment #1: Type: text/plain, Size: 48782 bytes --]
== Series Details ==
Series: drm/i915/display: conversions to struct intel_display (rev2)
URL : https://patchwork.freedesktop.org/series/144749/
State : failure
== Summary ==
CI Bug Log - changes from xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373_full -> xe-pw-144749v2_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with xe-pw-144749v2_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in xe-pw-144749v2_full, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them
to document this new failure mode, which will reduce false positives in CI.
Participating hosts (4 -> 4)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in xe-pw-144749v2_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_color@ctm-red-to-blue@pipe-a-hdmi-a-6:
- shard-dg2-set2: [PASS][1] -> [INCOMPLETE][2] +2 other tests incomplete
[1]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-433/igt@kms_color@ctm-red-to-blue@pipe-a-hdmi-a-6.html
[2]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-434/igt@kms_color@ctm-red-to-blue@pipe-a-hdmi-a-6.html
* igt@kms_hdr@static-toggle-suspend@pipe-a-dp-4:
- shard-dg2-set2: NOTRUN -> [INCOMPLETE][3]
[3]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-435/igt@kms_hdr@static-toggle-suspend@pipe-a-dp-4.html
New tests
---------
New tests have been introduced between xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373_full and xe-pw-144749v2_full:
### New IGT tests (5) ###
* igt@kms_cursor_edge_walk@128x128-right-edge@pipe-c-edp-1:
- Statuses : 1 pass(s)
- Exec time: [4.36] s
* igt@kms_cursor_edge_walk@256x256-right-edge@pipe-c-edp-1:
- Statuses : 1 pass(s)
- Exec time: [4.34] s
* igt@kms_cursor_edge_walk@256x256-top-bottom@pipe-c-edp-1:
- Statuses : 1 pass(s)
- Exec time: [4.29] s
* igt@kms_cursor_edge_walk@256x256-top-edge@pipe-c-edp-1:
- Statuses : 1 pass(s)
- Exec time: [4.36] s
* igt@kms_cursor_edge_walk@64x64-top-bottom@pipe-c-edp-1:
- Statuses : 1 pass(s)
- Exec time: [4.30] s
Known issues
------------
Here are the changes found in xe-pw-144749v2_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_big_fb@4-tiled-16bpp-rotate-90:
- shard-dg2-set2: NOTRUN -> [SKIP][4] ([Intel XE#316])
[4]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@kms_big_fb@4-tiled-16bpp-rotate-90.html
* igt@kms_big_fb@4-tiled-64bpp-rotate-90:
- shard-bmg: NOTRUN -> [SKIP][5] ([Intel XE#2327]) +4 other tests skip
[5]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-8/igt@kms_big_fb@4-tiled-64bpp-rotate-90.html
* igt@kms_big_fb@y-tiled-addfb-size-overflow:
- shard-bmg: NOTRUN -> [SKIP][6] ([Intel XE#610])
[6]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_big_fb@y-tiled-addfb-size-overflow.html
* igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0-hflip:
- shard-bmg: NOTRUN -> [SKIP][7] ([Intel XE#1124]) +13 other tests skip
[7]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0-hflip.html
* igt@kms_bw@linear-tiling-3-displays-3840x2160p:
- shard-bmg: NOTRUN -> [SKIP][8] ([Intel XE#367]) +1 other test skip
[8]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_bw@linear-tiling-3-displays-3840x2160p.html
* igt@kms_ccs@crc-primary-basic-4-tiled-bmg-ccs:
- shard-dg2-set2: NOTRUN -> [SKIP][9] ([Intel XE#2907])
[9]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@kms_ccs@crc-primary-basic-4-tiled-bmg-ccs.html
* igt@kms_ccs@crc-primary-basic-y-tiled-gen12-rc-ccs-cc@pipe-a-dp-4:
- shard-dg2-set2: NOTRUN -> [SKIP][10] ([Intel XE#787]) +77 other tests skip
[10]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-466/igt@kms_ccs@crc-primary-basic-y-tiled-gen12-rc-ccs-cc@pipe-a-dp-4.html
* igt@kms_ccs@crc-primary-suspend-4-tiled-dg2-mc-ccs:
- shard-dg2-set2: [PASS][11] -> [INCOMPLETE][12] ([Intel XE#3862])
[11]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-432/igt@kms_ccs@crc-primary-suspend-4-tiled-dg2-mc-ccs.html
[12]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-435/igt@kms_ccs@crc-primary-suspend-4-tiled-dg2-mc-ccs.html
* igt@kms_ccs@crc-primary-suspend-4-tiled-dg2-mc-ccs@pipe-d-hdmi-a-6:
- shard-dg2-set2: NOTRUN -> [INCOMPLETE][13] ([Intel XE#3862])
[13]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-435/igt@kms_ccs@crc-primary-suspend-4-tiled-dg2-mc-ccs@pipe-d-hdmi-a-6.html
* igt@kms_ccs@crc-primary-suspend-4-tiled-mtl-rc-ccs-cc:
- shard-bmg: NOTRUN -> [SKIP][14] ([Intel XE#3432]) +2 other tests skip
[14]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-2/igt@kms_ccs@crc-primary-suspend-4-tiled-mtl-rc-ccs-cc.html
* igt@kms_ccs@crc-sprite-planes-basic-y-tiled-gen12-rc-ccs@pipe-d-dp-4:
- shard-dg2-set2: NOTRUN -> [SKIP][15] ([Intel XE#455] / [Intel XE#787]) +14 other tests skip
[15]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-435/igt@kms_ccs@crc-sprite-planes-basic-y-tiled-gen12-rc-ccs@pipe-d-dp-4.html
* igt@kms_ccs@random-ccs-data-4-tiled-dg2-rc-ccs-cc:
- shard-bmg: NOTRUN -> [SKIP][16] ([Intel XE#2887]) +16 other tests skip
[16]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-2/igt@kms_ccs@random-ccs-data-4-tiled-dg2-rc-ccs-cc.html
* igt@kms_ccs@random-ccs-data-4-tiled-lnl-ccs@pipe-c-dp-2:
- shard-bmg: NOTRUN -> [SKIP][17] ([Intel XE#2652] / [Intel XE#787]) +17 other tests skip
[17]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@kms_ccs@random-ccs-data-4-tiled-lnl-ccs@pipe-c-dp-2.html
* igt@kms_chamelium_color@ctm-0-50:
- shard-bmg: NOTRUN -> [SKIP][18] ([Intel XE#2325]) +1 other test skip
[18]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-2/igt@kms_chamelium_color@ctm-0-50.html
* igt@kms_chamelium_edid@dp-edid-change-during-hibernate:
- shard-bmg: NOTRUN -> [SKIP][19] ([Intel XE#2252]) +12 other tests skip
[19]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_chamelium_edid@dp-edid-change-during-hibernate.html
* igt@kms_chamelium_hpd@hdmi-hpd-for-each-pipe:
- shard-dg2-set2: NOTRUN -> [SKIP][20] ([Intel XE#373])
[20]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@kms_chamelium_hpd@hdmi-hpd-for-each-pipe.html
* igt@kms_content_protection@atomic:
- shard-bmg: NOTRUN -> [FAIL][21] ([Intel XE#1178]) +1 other test fail
[21]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_content_protection@atomic.html
* igt@kms_content_protection@atomic@pipe-a-dp-2:
- shard-dg2-set2: NOTRUN -> [FAIL][22] ([Intel XE#1178]) +1 other test fail
[22]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@kms_content_protection@atomic@pipe-a-dp-2.html
* igt@kms_content_protection@dp-mst-lic-type-1:
- shard-bmg: NOTRUN -> [SKIP][23] ([Intel XE#2390])
[23]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-2/igt@kms_content_protection@dp-mst-lic-type-1.html
* igt@kms_content_protection@mei-interface:
- shard-bmg: NOTRUN -> [SKIP][24] ([Intel XE#2341])
[24]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@kms_content_protection@mei-interface.html
* igt@kms_cursor_crc@cursor-random-512x170:
- shard-bmg: NOTRUN -> [SKIP][25] ([Intel XE#2321]) +2 other tests skip
[25]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_cursor_crc@cursor-random-512x170.html
* igt@kms_cursor_crc@cursor-sliding-256x85:
- shard-bmg: NOTRUN -> [SKIP][26] ([Intel XE#2320]) +7 other tests skip
[26]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_cursor_crc@cursor-sliding-256x85.html
* igt@kms_cursor_legacy@2x-flip-vs-cursor-legacy:
- shard-dg2-set2: [PASS][27] -> [SKIP][28] ([Intel XE#309]) +1 other test skip
[27]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-433/igt@kms_cursor_legacy@2x-flip-vs-cursor-legacy.html
[28]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-464/igt@kms_cursor_legacy@2x-flip-vs-cursor-legacy.html
* igt@kms_cursor_legacy@cursorb-vs-flipb-atomic-transitions:
- shard-bmg: [PASS][29] -> [SKIP][30] ([Intel XE#2291])
[29]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-2/igt@kms_cursor_legacy@cursorb-vs-flipb-atomic-transitions.html
[30]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-6/igt@kms_cursor_legacy@cursorb-vs-flipb-atomic-transitions.html
* igt@kms_cursor_legacy@short-busy-flip-before-cursor-toggle:
- shard-bmg: NOTRUN -> [SKIP][31] ([Intel XE#2286])
[31]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_cursor_legacy@short-busy-flip-before-cursor-toggle.html
* igt@kms_dp_link_training@non-uhbr-sst:
- shard-bmg: [PASS][32] -> [SKIP][33] ([Intel XE#4354])
[32]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-4/igt@kms_dp_link_training@non-uhbr-sst.html
[33]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-6/igt@kms_dp_link_training@non-uhbr-sst.html
* igt@kms_dp_link_training@uhbr-mst:
- shard-bmg: NOTRUN -> [SKIP][34] ([Intel XE#4354])
[34]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@kms_dp_link_training@uhbr-mst.html
* igt@kms_dsc@dsc-basic:
- shard-bmg: NOTRUN -> [SKIP][35] ([Intel XE#2244])
[35]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_dsc@dsc-basic.html
* igt@kms_fbc_dirty_rect@fbc-dirty-rectangle-dirtyfb-tests:
- shard-bmg: NOTRUN -> [SKIP][36] ([Intel XE#4422]) +2 other tests skip
[36]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_fbc_dirty_rect@fbc-dirty-rectangle-dirtyfb-tests.html
* igt@kms_fbcon_fbt@fbc:
- shard-bmg: NOTRUN -> [SKIP][37] ([Intel XE#4156])
[37]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_fbcon_fbt@fbc.html
* igt@kms_feature_discovery@psr1:
- shard-bmg: NOTRUN -> [SKIP][38] ([Intel XE#2374])
[38]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_feature_discovery@psr1.html
* igt@kms_flip@2x-flip-vs-absolute-wf_vblank:
- shard-dg2-set2: [PASS][39] -> [SKIP][40] ([Intel XE#310]) +1 other test skip
[39]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-436/igt@kms_flip@2x-flip-vs-absolute-wf_vblank.html
[40]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-464/igt@kms_flip@2x-flip-vs-absolute-wf_vblank.html
* igt@kms_flip@2x-flip-vs-absolute-wf_vblank-interruptible:
- shard-bmg: NOTRUN -> [SKIP][41] ([Intel XE#2316]) +1 other test skip
[41]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@kms_flip@2x-flip-vs-absolute-wf_vblank-interruptible.html
* igt@kms_flip@2x-flip-vs-expired-vblank@ad-dp2-hdmi-a3:
- shard-bmg: [PASS][42] -> [FAIL][43] ([Intel XE#3321]) +2 other tests fail
[42]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-7/igt@kms_flip@2x-flip-vs-expired-vblank@ad-dp2-hdmi-a3.html
[43]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-8/igt@kms_flip@2x-flip-vs-expired-vblank@ad-dp2-hdmi-a3.html
* igt@kms_flip@2x-flip-vs-expired-vblank@bc-hdmi-a6-dp4:
- shard-dg2-set2: [PASS][44] -> [FAIL][45] ([Intel XE#301]) +3 other tests fail
[44]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-466/igt@kms_flip@2x-flip-vs-expired-vblank@bc-hdmi-a6-dp4.html
[45]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-433/igt@kms_flip@2x-flip-vs-expired-vblank@bc-hdmi-a6-dp4.html
* igt@kms_flip@2x-flip-vs-panning:
- shard-bmg: [PASS][46] -> [SKIP][47] ([Intel XE#2316]) +3 other tests skip
[46]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-7/igt@kms_flip@2x-flip-vs-panning.html
[47]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@kms_flip@2x-flip-vs-panning.html
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-dg2-set2: [PASS][48] -> [INCOMPLETE][49] ([Intel XE#2049] / [Intel XE#2597]) +1 other test incomplete
[48]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-434/igt@kms_flip@flip-vs-suspend-interruptible.html
[49]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-433/igt@kms_flip@flip-vs-suspend-interruptible.html
* igt@kms_flip_scaled_crc@flip-32bpp-yftile-to-32bpp-yftileccs-upscaling:
- shard-bmg: NOTRUN -> [SKIP][50] ([Intel XE#2293] / [Intel XE#2380]) +4 other tests skip
[50]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@kms_flip_scaled_crc@flip-32bpp-yftile-to-32bpp-yftileccs-upscaling.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-valid-mode:
- shard-bmg: NOTRUN -> [SKIP][51] ([Intel XE#2293]) +4 other tests skip
[51]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-valid-mode.html
* igt@kms_frontbuffer_tracking@drrs-2p-primscrn-cur-indfb-draw-render:
- shard-bmg: NOTRUN -> [SKIP][52] ([Intel XE#2312]) +6 other tests skip
[52]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@kms_frontbuffer_tracking@drrs-2p-primscrn-cur-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@drrs-2p-scndscrn-indfb-pgflip-blt:
- shard-bmg: NOTRUN -> [SKIP][53] ([Intel XE#2311]) +34 other tests skip
[53]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_frontbuffer_tracking@drrs-2p-scndscrn-indfb-pgflip-blt.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
- shard-bmg: NOTRUN -> [SKIP][54] ([Intel XE#4141]) +18 other tests skip
[54]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-render:
- shard-dg2-set2: [PASS][55] -> [SKIP][56] ([Intel XE#656]) +6 other tests skip
[55]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-433/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-render.html
[56]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-464/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@fbcdrrs-tiling-y:
- shard-bmg: NOTRUN -> [SKIP][57] ([Intel XE#2352])
[57]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_frontbuffer_tracking@fbcdrrs-tiling-y.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-blt:
- shard-bmg: NOTRUN -> [SKIP][58] ([Intel XE#2313]) +33 other tests skip
[58]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-blt.html
* igt@kms_frontbuffer_tracking@psr-2p-scndscrn-spr-indfb-move:
- shard-dg2-set2: NOTRUN -> [SKIP][59] ([Intel XE#653]) +2 other tests skip
[59]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-spr-indfb-move.html
* igt@kms_joiner@basic-ultra-joiner:
- shard-bmg: NOTRUN -> [SKIP][60] ([Intel XE#2927]) +1 other test skip
[60]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_joiner@basic-ultra-joiner.html
* igt@kms_joiner@invalid-modeset-force-ultra-joiner:
- shard-bmg: NOTRUN -> [SKIP][61] ([Intel XE#2934])
[61]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-2/igt@kms_joiner@invalid-modeset-force-ultra-joiner.html
* igt@kms_plane_lowres@tiling-y:
- shard-bmg: NOTRUN -> [SKIP][62] ([Intel XE#2393])
[62]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_plane_lowres@tiling-y.html
* igt@kms_plane_scaling@plane-downscale-factor-0-25-with-pixel-format:
- shard-dg2-set2: NOTRUN -> [SKIP][63] ([Intel XE#2763] / [Intel XE#455]) +1 other test skip
[63]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@kms_plane_scaling@plane-downscale-factor-0-25-with-pixel-format.html
* igt@kms_plane_scaling@plane-downscale-factor-0-25-with-pixel-format@pipe-b:
- shard-dg2-set2: NOTRUN -> [SKIP][64] ([Intel XE#2763]) +2 other tests skip
[64]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@kms_plane_scaling@plane-downscale-factor-0-25-with-pixel-format@pipe-b.html
* igt@kms_plane_scaling@plane-upscale-factor-0-25-with-pixel-format:
- shard-adlp: [PASS][65] -> [DMESG-WARN][66] ([Intel XE#4173]) +2 other tests dmesg-warn
[65]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-adlp-2/igt@kms_plane_scaling@plane-upscale-factor-0-25-with-pixel-format.html
[66]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-adlp-8/igt@kms_plane_scaling@plane-upscale-factor-0-25-with-pixel-format.html
* igt@kms_plane_scaling@planes-unity-scaling-downscale-factor-0-25@pipe-b:
- shard-bmg: NOTRUN -> [SKIP][67] ([Intel XE#2763]) +29 other tests skip
[67]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_plane_scaling@planes-unity-scaling-downscale-factor-0-25@pipe-b.html
* igt@kms_pm_backlight@fade-with-dpms:
- shard-bmg: NOTRUN -> [SKIP][68] ([Intel XE#870])
[68]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_pm_backlight@fade-with-dpms.html
- shard-dg2-set2: NOTRUN -> [SKIP][69] ([Intel XE#870])
[69]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@kms_pm_backlight@fade-with-dpms.html
* igt@kms_pm_dc@dc5-retention-flops:
- shard-bmg: NOTRUN -> [SKIP][70] ([Intel XE#3309])
[70]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_pm_dc@dc5-retention-flops.html
* igt@kms_pm_rpm@modeset-lpsp-stress-no-wait:
- shard-bmg: NOTRUN -> [SKIP][71] ([Intel XE#1439] / [Intel XE#3141] / [Intel XE#836])
[71]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_pm_rpm@modeset-lpsp-stress-no-wait.html
* igt@kms_psr2_sf@fbc-psr2-cursor-plane-update-sf:
- shard-dg2-set2: NOTRUN -> [SKIP][72] ([Intel XE#1489])
[72]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@kms_psr2_sf@fbc-psr2-cursor-plane-update-sf.html
* igt@kms_psr2_sf@fbc-psr2-overlay-primary-update-sf-dmg-area:
- shard-bmg: NOTRUN -> [SKIP][73] ([Intel XE#1489]) +10 other tests skip
[73]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@kms_psr2_sf@fbc-psr2-overlay-primary-update-sf-dmg-area.html
* igt@kms_psr2_su@page_flip-nv12:
- shard-bmg: NOTRUN -> [SKIP][74] ([Intel XE#2387])
[74]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-8/igt@kms_psr2_su@page_flip-nv12.html
* igt@kms_psr@fbc-pr-cursor-blt:
- shard-bmg: NOTRUN -> [SKIP][75] ([Intel XE#2234] / [Intel XE#2850]) +20 other tests skip
[75]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@kms_psr@fbc-pr-cursor-blt.html
* igt@kms_psr@psr-no-drrs:
- shard-dg2-set2: NOTRUN -> [SKIP][76] ([Intel XE#2850] / [Intel XE#929])
[76]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@kms_psr@psr-no-drrs.html
* igt@kms_rotation_crc@sprite-rotation-90-pos-100-0:
- shard-bmg: NOTRUN -> [SKIP][77] ([Intel XE#3414] / [Intel XE#3904])
[77]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_rotation_crc@sprite-rotation-90-pos-100-0.html
* igt@kms_tiled_display@basic-test-pattern-with-chamelium:
- shard-bmg: NOTRUN -> [SKIP][78] ([Intel XE#2426])
[78]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@kms_tiled_display@basic-test-pattern-with-chamelium.html
* igt@kms_vrr@seamless-rr-switch-vrr:
- shard-bmg: NOTRUN -> [SKIP][79] ([Intel XE#1499]) +1 other test skip
[79]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_vrr@seamless-rr-switch-vrr.html
* igt@kms_writeback@writeback-invalid-parameters:
- shard-bmg: NOTRUN -> [SKIP][80] ([Intel XE#756]) +1 other test skip
[80]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@kms_writeback@writeback-invalid-parameters.html
- shard-dg2-set2: NOTRUN -> [SKIP][81] ([Intel XE#756])
[81]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@kms_writeback@writeback-invalid-parameters.html
* igt@xe_create@multigpu-create-massive-size:
- shard-bmg: NOTRUN -> [SKIP][82] ([Intel XE#2504])
[82]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@xe_create@multigpu-create-massive-size.html
* igt@xe_eu_stall@unprivileged-access:
- shard-dg2-set2: NOTRUN -> [SKIP][83] ([Intel XE#4497])
[83]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@xe_eu_stall@unprivileged-access.html
* igt@xe_eudebug@basic-vm-bind-ufence-reconnect:
- shard-bmg: NOTRUN -> [SKIP][84] ([Intel XE#2905] / [Intel XE#3889])
[84]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-2/igt@xe_eudebug@basic-vm-bind-ufence-reconnect.html
* igt@xe_eudebug@discovery-empty:
- shard-bmg: NOTRUN -> [SKIP][85] ([Intel XE#2905]) +10 other tests skip
[85]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-8/igt@xe_eudebug@discovery-empty.html
* igt@xe_eudebug@discovery-empty-clients:
- shard-dg2-set2: NOTRUN -> [SKIP][86] ([Intel XE#2905])
[86]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@xe_eudebug@discovery-empty-clients.html
* igt@xe_exec_basic@multigpu-no-exec-null-defer-mmap:
- shard-dg2-set2: [PASS][87] -> [SKIP][88] ([Intel XE#1392]) +4 other tests skip
[87]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-463/igt@xe_exec_basic@multigpu-no-exec-null-defer-mmap.html
[88]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@xe_exec_basic@multigpu-no-exec-null-defer-mmap.html
* igt@xe_exec_basic@multigpu-once-bindexecqueue-userptr-invalidate:
- shard-bmg: NOTRUN -> [SKIP][89] ([Intel XE#2322]) +12 other tests skip
[89]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-2/igt@xe_exec_basic@multigpu-once-bindexecqueue-userptr-invalidate.html
* igt@xe_exec_basic@multigpu-once-bindexecqueue-userptr-invalidate-race:
- shard-dg2-set2: NOTRUN -> [SKIP][90] ([Intel XE#1392]) +1 other test skip
[90]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@xe_exec_basic@multigpu-once-bindexecqueue-userptr-invalidate-race.html
* igt@xe_exec_fault_mode@once-userptr:
- shard-dg2-set2: NOTRUN -> [SKIP][91] ([Intel XE#288]) +2 other tests skip
[91]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@xe_exec_fault_mode@once-userptr.html
* igt@xe_exec_threads@threads-bal-rebind:
- shard-dg2-set2: [PASS][92] -> [INCOMPLETE][93] ([Intel XE#1169])
[92]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-432/igt@xe_exec_threads@threads-bal-rebind.html
[93]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-466/igt@xe_exec_threads@threads-bal-rebind.html
* igt@xe_live_ktest@xe_eudebug:
- shard-bmg: NOTRUN -> [SKIP][94] ([Intel XE#2833])
[94]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@xe_live_ktest@xe_eudebug.html
- shard-dg2-set2: NOTRUN -> [SKIP][95] ([Intel XE#455])
[95]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@xe_live_ktest@xe_eudebug.html
* igt@xe_media_fill@media-fill:
- shard-bmg: NOTRUN -> [SKIP][96] ([Intel XE#2459] / [Intel XE#2596])
[96]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@xe_media_fill@media-fill.html
* igt@xe_pat@pat-index-xelp:
- shard-bmg: NOTRUN -> [SKIP][97] ([Intel XE#2245])
[97]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@xe_pat@pat-index-xelp.html
* igt@xe_pm@s3-d3cold-basic-exec:
- shard-bmg: NOTRUN -> [SKIP][98] ([Intel XE#2284]) +2 other tests skip
[98]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@xe_pm@s3-d3cold-basic-exec.html
* igt@xe_pm@s4-mocs:
- shard-bmg: NOTRUN -> [ABORT][99] ([Intel XE#4268]) +2 other tests abort
[99]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@xe_pm@s4-mocs.html
* igt@xe_query@multigpu-query-invalid-extension:
- shard-bmg: NOTRUN -> [SKIP][100] ([Intel XE#944]) +3 other tests skip
[100]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@xe_query@multigpu-query-invalid-extension.html
- shard-dg2-set2: NOTRUN -> [SKIP][101] ([Intel XE#944])
[101]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@xe_query@multigpu-query-invalid-extension.html
* igt@xe_sriov_auto_provisioning@selfconfig-reprovision-reduce-numvfs:
- shard-bmg: NOTRUN -> [SKIP][102] ([Intel XE#4130])
[102]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@xe_sriov_auto_provisioning@selfconfig-reprovision-reduce-numvfs.html
* igt@xe_sriov_flr@flr-twice:
- shard-bmg: NOTRUN -> [SKIP][103] ([Intel XE#4273])
[103]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-7/igt@xe_sriov_flr@flr-twice.html
#### Possible fixes ####
* igt@kms_async_flips@alternate-sync-async-flip-atomic:
- shard-bmg: [FAIL][104] ([Intel XE#3701] / [Intel XE#3718] / [Intel XE#827]) -> [PASS][105]
[104]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-7/igt@kms_async_flips@alternate-sync-async-flip-atomic.html
[105]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-8/igt@kms_async_flips@alternate-sync-async-flip-atomic.html
* igt@kms_async_flips@alternate-sync-async-flip-atomic@pipe-c-dp-2:
- shard-bmg: [FAIL][106] ([Intel XE#3701] / [Intel XE#827]) -> [PASS][107]
[106]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-7/igt@kms_async_flips@alternate-sync-async-flip-atomic@pipe-c-dp-2.html
[107]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-8/igt@kms_async_flips@alternate-sync-async-flip-atomic@pipe-c-dp-2.html
* igt@kms_async_flips@invalid-async-flip@pipe-b-hdmi-a-1:
- shard-adlp: [DMESG-WARN][108] ([Intel XE#4330]) -> [PASS][109] +1 other test pass
[108]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-adlp-9/igt@kms_async_flips@invalid-async-flip@pipe-b-hdmi-a-1.html
[109]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-adlp-3/igt@kms_async_flips@invalid-async-flip@pipe-b-hdmi-a-1.html
* igt@kms_ccs@random-ccs-data-4-tiled-dg2-rc-ccs:
- shard-dg2-set2: [INCOMPLETE][110] ([Intel XE#1727] / [Intel XE#3113] / [Intel XE#3124]) -> [PASS][111]
[110]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-463/igt@kms_ccs@random-ccs-data-4-tiled-dg2-rc-ccs.html
[111]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@kms_ccs@random-ccs-data-4-tiled-dg2-rc-ccs.html
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-bmg: [SKIP][112] ([Intel XE#2291]) -> [PASS][113]
[112]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-4/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
[113]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-2/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
* igt@kms_feature_discovery@display-2x:
- shard-bmg: [SKIP][114] ([Intel XE#2373]) -> [PASS][115]
[114]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-4/igt@kms_feature_discovery@display-2x.html
[115]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-2/igt@kms_feature_discovery@display-2x.html
* igt@kms_flip@2x-flip-vs-dpms:
- shard-bmg: [SKIP][116] ([Intel XE#2316]) -> [PASS][117] +6 other tests pass
[116]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-4/igt@kms_flip@2x-flip-vs-dpms.html
[117]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-2/igt@kms_flip@2x-flip-vs-dpms.html
* igt@kms_flip@2x-flip-vs-expired-vblank@ad-hdmi-a6-dp4:
- shard-dg2-set2: [FAIL][118] ([Intel XE#301]) -> [PASS][119]
[118]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-466/igt@kms_flip@2x-flip-vs-expired-vblank@ad-hdmi-a6-dp4.html
[119]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-433/igt@kms_flip@2x-flip-vs-expired-vblank@ad-hdmi-a6-dp4.html
* igt@kms_flip@2x-flip-vs-wf_vblank-interruptible:
- shard-dg2-set2: [SKIP][120] ([Intel XE#310]) -> [PASS][121] +4 other tests pass
[120]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-464/igt@kms_flip@2x-flip-vs-wf_vblank-interruptible.html
[121]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@kms_flip@2x-flip-vs-wf_vblank-interruptible.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1:
- shard-lnl: [FAIL][122] ([Intel XE#301]) -> [PASS][123] +1 other test pass
[122]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-lnl-5/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html
[123]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-lnl-2/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-move:
- shard-dg2-set2: [SKIP][124] ([Intel XE#656]) -> [PASS][125] +5 other tests pass
[124]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-464/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-move.html
[125]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-435/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-move.html
* igt@xe_exec_basic@multigpu-once-bindexecqueue-userptr-invalidate:
- shard-dg2-set2: [SKIP][126] ([Intel XE#1392]) -> [PASS][127] +1 other test pass
[126]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-432/igt@xe_exec_basic@multigpu-once-bindexecqueue-userptr-invalidate.html
[127]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-466/igt@xe_exec_basic@multigpu-once-bindexecqueue-userptr-invalidate.html
#### Warnings ####
* igt@kms_ccs@crc-primary-rotation-180-y-tiled-gen12-rc-ccs@pipe-d-hdmi-a-6:
- shard-dg2-set2: [SKIP][128] ([Intel XE#455] / [Intel XE#787]) -> [SKIP][129] ([Intel XE#787]) +4 other tests skip
[128]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-464/igt@kms_ccs@crc-primary-rotation-180-y-tiled-gen12-rc-ccs@pipe-d-hdmi-a-6.html
[129]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-435/igt@kms_ccs@crc-primary-rotation-180-y-tiled-gen12-rc-ccs@pipe-d-hdmi-a-6.html
* igt@kms_ccs@random-ccs-data-y-tiled-ccs@pipe-d-hdmi-a-6:
- shard-dg2-set2: [SKIP][130] ([Intel XE#787]) -> [SKIP][131] ([Intel XE#455] / [Intel XE#787]) +4 other tests skip
[130]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-436/igt@kms_ccs@random-ccs-data-y-tiled-ccs@pipe-d-hdmi-a-6.html
[131]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-464/igt@kms_ccs@random-ccs-data-y-tiled-ccs@pipe-d-hdmi-a-6.html
* igt@kms_content_protection@legacy:
- shard-bmg: [FAIL][132] ([Intel XE#1178]) -> [SKIP][133] ([Intel XE#2341])
[132]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-4/igt@kms_content_protection@legacy.html
[133]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-6/igt@kms_content_protection@legacy.html
* igt@kms_cursor_legacy@cursorb-vs-flipa-toggle:
- shard-bmg: [SKIP][134] ([Intel XE#2291]) -> [DMESG-WARN][135] ([Intel XE#877])
[134]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-4/igt@kms_cursor_legacy@cursorb-vs-flipa-toggle.html
[135]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-2/igt@kms_cursor_legacy@cursorb-vs-flipa-toggle.html
* igt@kms_frontbuffer_tracking@drrs-2p-pri-indfb-multidraw:
- shard-bmg: [SKIP][136] ([Intel XE#2311]) -> [SKIP][137] ([Intel XE#2312]) +7 other tests skip
[136]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-7/igt@kms_frontbuffer_tracking@drrs-2p-pri-indfb-multidraw.html
[137]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@kms_frontbuffer_tracking@drrs-2p-pri-indfb-multidraw.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-indfb-plflip-blt:
- shard-bmg: [SKIP][138] ([Intel XE#2312]) -> [SKIP][139] ([Intel XE#4141]) +4 other tests skip
[138]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-4/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-indfb-plflip-blt.html
[139]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-2/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-indfb-plflip-blt.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-mmap-wc:
- shard-bmg: [SKIP][140] ([Intel XE#4141]) -> [SKIP][141] ([Intel XE#2312]) +3 other tests skip
[140]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-7/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-mmap-wc.html
[141]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-mmap-wc.html
* igt@kms_frontbuffer_tracking@fbcdrrs-2p-scndscrn-cur-indfb-draw-mmap-wc:
- shard-bmg: [SKIP][142] ([Intel XE#2312]) -> [SKIP][143] ([Intel XE#2311]) +8 other tests skip
[142]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-4/igt@kms_frontbuffer_tracking@fbcdrrs-2p-scndscrn-cur-indfb-draw-mmap-wc.html
[143]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-2/igt@kms_frontbuffer_tracking@fbcdrrs-2p-scndscrn-cur-indfb-draw-mmap-wc.html
* igt@kms_frontbuffer_tracking@fbcdrrs-2p-scndscrn-indfb-plflip-blt:
- shard-dg2-set2: [SKIP][144] ([Intel XE#656]) -> [SKIP][145] ([Intel XE#651]) +5 other tests skip
[144]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-464/igt@kms_frontbuffer_tracking@fbcdrrs-2p-scndscrn-indfb-plflip-blt.html
[145]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-432/igt@kms_frontbuffer_tracking@fbcdrrs-2p-scndscrn-indfb-plflip-blt.html
* igt@kms_frontbuffer_tracking@fbcdrrs-2p-scndscrn-shrfb-plflip-blt:
- shard-dg2-set2: [SKIP][146] ([Intel XE#651]) -> [SKIP][147] ([Intel XE#656]) +7 other tests skip
[146]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-433/igt@kms_frontbuffer_tracking@fbcdrrs-2p-scndscrn-shrfb-plflip-blt.html
[147]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-464/igt@kms_frontbuffer_tracking@fbcdrrs-2p-scndscrn-shrfb-plflip-blt.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-pri-indfb-draw-render:
- shard-bmg: [SKIP][148] ([Intel XE#2313]) -> [SKIP][149] ([Intel XE#2312]) +9 other tests skip
[148]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-7/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-pri-indfb-draw-render.html
[149]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-4/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-pri-indfb-draw-render.html
- shard-dg2-set2: [SKIP][150] ([Intel XE#656]) -> [SKIP][151] ([Intel XE#653]) +4 other tests skip
[150]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-464/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-pri-indfb-draw-render.html
[151]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-435/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-pri-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-cur-indfb-draw-blt:
- shard-bmg: [SKIP][152] ([Intel XE#2312]) -> [SKIP][153] ([Intel XE#2313]) +9 other tests skip
[152]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-bmg-4/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-cur-indfb-draw-blt.html
[153]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-bmg-2/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-cur-indfb-draw-blt.html
* igt@kms_frontbuffer_tracking@psr-2p-primscrn-pri-shrfb-draw-mmap-wc:
- shard-dg2-set2: [SKIP][154] ([Intel XE#653]) -> [SKIP][155] ([Intel XE#656]) +6 other tests skip
[154]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-433/igt@kms_frontbuffer_tracking@psr-2p-primscrn-pri-shrfb-draw-mmap-wc.html
[155]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-464/igt@kms_frontbuffer_tracking@psr-2p-primscrn-pri-shrfb-draw-mmap-wc.html
* igt@kms_tiled_display@basic-test-pattern:
- shard-dg2-set2: [FAIL][156] ([Intel XE#1729]) -> [SKIP][157] ([Intel XE#362])
[156]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-436/igt@kms_tiled_display@basic-test-pattern.html
[157]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-464/igt@kms_tiled_display@basic-test-pattern.html
* igt@testdisplay:
- shard-dg2-set2: [ABORT][158] ([Intel XE#2705]) -> [ABORT][159] ([Intel XE#2705] / [Intel XE#4540])
[158]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-dg2-466/igt@testdisplay.html
[159]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-dg2-433/igt@testdisplay.html
* igt@xe_pm@s4-vm-bind-unbind-all:
- shard-adlp: [ABORT][160] ([Intel XE#4268]) -> [ABORT][161] ([Intel XE#2953] / [Intel XE#4268])
[160]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373/shard-adlp-2/igt@xe_pm@s4-vm-bind-unbind-all.html
[161]: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/shard-adlp-8/igt@xe_pm@s4-vm-bind-unbind-all.html
[Intel XE#1124]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1124
[Intel XE#1169]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1169
[Intel XE#1178]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1178
[Intel XE#1392]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1392
[Intel XE#1439]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1439
[Intel XE#1489]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1489
[Intel XE#1499]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1499
[Intel XE#1727]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1727
[Intel XE#1729]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1729
[Intel XE#2049]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2049
[Intel XE#2234]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2234
[Intel XE#2244]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2244
[Intel XE#2245]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2245
[Intel XE#2252]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2252
[Intel XE#2284]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2284
[Intel XE#2286]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2286
[Intel XE#2291]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2291
[Intel XE#2293]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2293
[Intel XE#2311]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2311
[Intel XE#2312]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2312
[Intel XE#2313]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2313
[Intel XE#2316]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2316
[Intel XE#2320]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2320
[Intel XE#2321]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2321
[Intel XE#2322]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2322
[Intel XE#2325]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2325
[Intel XE#2327]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2327
[Intel XE#2341]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2341
[Intel XE#2352]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2352
[Intel XE#2373]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2373
[Intel XE#2374]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2374
[Intel XE#2380]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2380
[Intel XE#2387]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2387
[Intel XE#2390]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2390
[Intel XE#2393]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2393
[Intel XE#2426]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2426
[Intel XE#2459]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2459
[Intel XE#2504]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2504
[Intel XE#2596]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2596
[Intel XE#2597]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2597
[Intel XE#2652]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2652
[Intel XE#2705]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2705
[Intel XE#2763]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2763
[Intel XE#2833]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2833
[Intel XE#2850]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2850
[Intel XE#288]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/288
[Intel XE#2887]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2887
[Intel XE#2905]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2905
[Intel XE#2907]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2907
[Intel XE#2927]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2927
[Intel XE#2934]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2934
[Intel XE#2953]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2953
[Intel XE#301]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/301
[Intel XE#309]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/309
[Intel XE#310]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/310
[Intel XE#3113]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3113
[Intel XE#3124]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3124
[Intel XE#3141]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3141
[Intel XE#316]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/316
[Intel XE#3309]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3309
[Intel XE#3321]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3321
[Intel XE#3414]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3414
[Intel XE#3432]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3432
[Intel XE#362]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/362
[Intel XE#367]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/367
[Intel XE#3701]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3701
[Intel XE#3718]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3718
[Intel XE#373]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/373
[Intel XE#3862]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3862
[Intel XE#3889]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3889
[Intel XE#3904]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/3904
[Intel XE#4130]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4130
[Intel XE#4141]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4141
[Intel XE#4156]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4156
[Intel XE#4173]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4173
[Intel XE#4268]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4268
[Intel XE#4273]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4273
[Intel XE#4330]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4330
[Intel XE#4354]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4354
[Intel XE#4422]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4422
[Intel XE#4497]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4497
[Intel XE#4540]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4540
[Intel XE#455]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/455
[Intel XE#610]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/610
[Intel XE#651]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/651
[Intel XE#653]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/653
[Intel XE#656]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/656
[Intel XE#756]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/756
[Intel XE#787]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/787
[Intel XE#827]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/827
[Intel XE#836]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/836
[Intel XE#870]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/870
[Intel XE#877]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/877
[Intel XE#929]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/929
[Intel XE#944]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/944
Build changes
-------------
* Linux: xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373 -> xe-pw-144749v2
IGT_8270: 49751c5c11723262ec66e564c76503f74a9fa831 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
xe-2795-f8df428b3850ed87a1e2f3b12b6025328d8a6373: f8df428b3850ed87a1e2f3b12b6025328d8a6373
xe-pw-144749v2: 144749v2
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/intel-xe/xe-pw-144749v2/index.html
[-- Attachment #2: Type: text/html, Size: 56075 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread