From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org,
"Jouni Högander" <jouni.hogander@intel.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Jani Nikula" <jani.nikula@intel.com>
Subject: [PATCH 3/4] drm/xe/display: Add init_clock_gating.h stubs
Date: Fri, 10 Apr 2026 10:34:59 +0300 [thread overview]
Message-ID: <20260410073500.32308-4-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20260410073500.32308-1-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Add static inline stubs for init_clock_gating.h functions
so that we don't need ifdefs in the actual code. We already
have one in intel_display_power.c, and now I need to bring
over intel_display_reset.c.
Cc: Jouni Högander <jouni.hogander@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_display_power.c | 2 --
| 10 +++++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index 8a7afe2a94bc..80ecf373fb19 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -1420,9 +1420,7 @@ static void hsw_disable_pc8(struct intel_display *display)
intel_init_pch_refclk(display);
/* Many display registers don't survive PC8+ */
-#ifdef I915 /* FIXME */
intel_clock_gating_init(display->drm);
-#endif
}
static void intel_pch_reset_handshake(struct intel_display *display,
--git a/drivers/gpu/drm/xe/compat-i915-headers/intel_clock_gating.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_clock_gating.h
index ce986f0e8f38..552975a30ba2 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/intel_clock_gating.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_clock_gating.h
@@ -3,4 +3,12 @@
* Copyright © 2023 Intel Corporation
*/
-#include "../../i915/intel_clock_gating.h"
+#ifndef __INTEL_CLOCK_GATING_H__
+#define __INTEL_CLOCK_GATING_H__
+
+struct drm_device;
+
+static inline void intel_clock_gating_init(struct drm_device *drm) {}
+static inline void intel_clock_gating_hooks_init(struct drm_device *drm) {}
+
+#endif /* __INTEL_CLOCK_GATING_H__ */
--
2.52.0
next prev parent reply other threads:[~2026-04-10 7:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-10 7:34 [PATCH 0/4] drm/i915/reset: Expose "display_reset_count" in debugfs Ville Syrjala
2026-04-10 7:34 ` [PATCH 1/4] drm/i915/reset: Reorganize display reset code Ville Syrjala
2026-04-10 7:34 ` [PATCH 2/4] drm/i915/reset: Move pending_fb_pin handling to i915 Ville Syrjala
2026-04-10 7:34 ` Ville Syrjala [this message]
2026-04-10 7:35 ` [PATCH 4/4] drm/i915/reset: Add "display_reset_count" debugfs file Ville Syrjala
2026-04-10 7:42 ` Jani Nikula
2026-04-10 7:56 ` Ville Syrjälä
2026-04-10 8:46 ` Jani Nikula
2026-04-10 7:42 ` ✓ CI.KUnit: success for drm/i915/reset: Expose "display_reset_count" in debugfs Patchwork
2026-04-10 8:20 ` ✓ Xe.CI.BAT: " Patchwork
2026-04-10 14:41 ` ✗ Xe.CI.FULL: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260410073500.32308-4-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=jouni.hogander@intel.com \
--cc=maarten.lankhorst@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox