Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-xe] [PATCH 1/9] drm/i915/display: add I915 conditional build to g4x_hdmi.h
@ 2023-08-08 11:45 Jani Nikula
  2023-08-08 11:45 ` [Intel-xe] [PATCH 2/9] drm/i915/display: add I915 conditional build to intel_dvo.h Jani Nikula
                   ` (15 more replies)
  0 siblings, 16 replies; 19+ messages in thread
From: Jani Nikula @ 2023-08-08 11:45 UTC (permalink / raw)
  To: intel-xe; +Cc: jani.nikula, rodrigo.vivi

Add stubs for !I915.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/g4x_hdmi.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/g4x_hdmi.h b/drivers/gpu/drm/i915/display/g4x_hdmi.h
index 1e3ea7f3c846..817f55c7a3a1 100644
--- a/drivers/gpu/drm/i915/display/g4x_hdmi.h
+++ b/drivers/gpu/drm/i915/display/g4x_hdmi.h
@@ -15,9 +15,21 @@ struct drm_atomic_state;
 struct drm_connector;
 struct drm_i915_private;
 
+#ifdef I915
 void g4x_hdmi_init(struct drm_i915_private *dev_priv,
 		   i915_reg_t hdmi_reg, enum port port);
 int g4x_hdmi_connector_atomic_check(struct drm_connector *connector,
 				    struct drm_atomic_state *state);
+#else
+static inline void g4x_hdmi_init(struct drm_i915_private *dev_priv,
+				 i915_reg_t hdmi_reg, int port)
+{
+}
+static inline int g4x_hdmi_connector_atomic_check(struct drm_connector *connector,
+						  struct drm_atomic_state *state)
+{
+	return 0;
+}
+#endif
 
 #endif
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [Intel-xe] [PATCH 0/9] xe & i915 display integration cleanups
@ 2023-04-19 12:39 Jani Nikula
  2023-04-19 12:39 ` [Intel-xe] [PATCH 9/9] fixup! drm/i915/display: Remaining changes to make xe compile Jani Nikula
  0 siblings, 1 reply; 19+ messages in thread
From: Jani Nikula @ 2023-04-19 12:39 UTC (permalink / raw)
  To: intel-xe; +Cc: jani.nikula, lucas.demarchi, rodrigo.vivi

Change the way i915 display gets built for xe. Additional cleanups and
backports on top to make future changes simpler.

Jani Nikula (9):
  fixup! drm/xe/display: Implement display support
  drm/i915/wm: remove stale and unused ilk_wm_max_level() declaration
  drm/i915/display: add I915 conditional build to i9xx_wm.h
  fixup! drm/xe/display: Implement display support
  drm/i915: rename intel_pm.[ch] to intel_clock_gating.[ch]
  fixup! drm/xe/display: Implement display support
  drm/i915: use explicit includes for i915_reg.h and i915_irq.h
  fixup! drm/xe/display: Implement display support
  fixup! drm/i915/display: Remaining changes to make xe compile

 drivers/gpu/drm/i915/Makefile                 |   2 +-
 drivers/gpu/drm/i915/display/i9xx_wm.c        |   1 +
 drivers/gpu/drm/i915/display/i9xx_wm.h        |  18 +-
 drivers/gpu/drm/i915/display/intel_display.c  |   4 +-
 .../drm/i915/display/intel_display_power.c    |   1 +
 .../i915/display/intel_display_power_well.c   |   1 +
 .../drm/i915/display/intel_display_reg_defs.h |   4 -
 .../drm/i915/display/intel_display_trace.h    |   1 -
 drivers/gpu/drm/i915/display/intel_fbc.c      |   1 +
 .../drm/i915/display/intel_fifo_underrun.c    |   2 +
 drivers/gpu/drm/i915/gt/intel_gt_irq.c        |   1 +
 drivers/gpu/drm/i915/gt/intel_reset.c         |   1 +
 drivers/gpu/drm/i915/gt/intel_rps.c           |   1 +
 drivers/gpu/drm/i915/gt/selftest_rps.c        |   1 +
 drivers/gpu/drm/i915/gt/uc/intel_guc.c        |   1 +
 drivers/gpu/drm/i915/i915_debugfs.c           |   1 +
 drivers/gpu/drm/i915/i915_driver.c            |   8 +-
 drivers/gpu/drm/i915/i915_gem.c               |   8 +-
 drivers/gpu/drm/i915/i915_irq.c               |   1 +
 drivers/gpu/drm/i915/i915_irq.h               |   2 +-
 .../i915/{intel_pm.c => intel_clock_gating.c} |   9 +-
 drivers/gpu/drm/i915/intel_clock_gating.h     |  14 ++
 drivers/gpu/drm/i915/intel_pm.h               |  18 --
 drivers/gpu/drm/i915/vlv_suspend.c            |   4 +-
 drivers/gpu/drm/xe/Makefile                   | 170 +++++++++---------
 .../compat-i915-headers/intel_clock_gating.h  |   1 +
 drivers/gpu/drm/xe/display/ext/i915_irq.c     |   2 +-
 drivers/gpu/drm/xe/display/ext/i9xx_wm.c      |  24 ---
 drivers/gpu/drm/xe/display/ext/i9xx_wm.h      |  20 ---
 .../ext/{intel_pm.c => intel_clock_gating.c}  |   4 +-
 drivers/gpu/drm/xe/display/ext/intel_pm.h     |  29 ---
 drivers/gpu/drm/xe/xe_device_types.h          |   3 +
 drivers/gpu/drm/xe/xe_display.c               |   4 +-
 33 files changed, 152 insertions(+), 210 deletions(-)
 rename drivers/gpu/drm/i915/{intel_pm.c => intel_clock_gating.c} (99%)
 create mode 100644 drivers/gpu/drm/i915/intel_clock_gating.h
 delete mode 100644 drivers/gpu/drm/i915/intel_pm.h
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_clock_gating.h
 delete mode 100644 drivers/gpu/drm/xe/display/ext/i9xx_wm.c
 delete mode 100644 drivers/gpu/drm/xe/display/ext/i9xx_wm.h
 rename drivers/gpu/drm/xe/display/ext/{intel_pm.c => intel_clock_gating.c} (97%)
 delete mode 100644 drivers/gpu/drm/xe/display/ext/intel_pm.h

-- 
2.39.2


^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2023-08-09 12:33 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-08 11:45 [Intel-xe] [PATCH 1/9] drm/i915/display: add I915 conditional build to g4x_hdmi.h Jani Nikula
2023-08-08 11:45 ` [Intel-xe] [PATCH 2/9] drm/i915/display: add I915 conditional build to intel_dvo.h Jani Nikula
2023-08-08 11:45 ` [Intel-xe] [PATCH 3/9] drm/i915/display: add I915 conditional build to intel_sdvo.h Jani Nikula
2023-08-08 11:45 ` [Intel-xe] [PATCH 4/9] drm/i915/display: add I915 conditional build to intel_tv.h Jani Nikula
2023-08-08 11:45 ` [Intel-xe] [PATCH 5/9] drm/i915/display: add I915 conditional build to vlv_dsi_pll.h Jani Nikula
2023-08-08 11:45 ` [Intel-xe] [PATCH 6/9] fixup! drm/xe/display: Implement display support Jani Nikula
2023-08-08 11:45 ` [Intel-xe] [PATCH 7/9] " Jani Nikula
2023-08-08 11:45 ` [Intel-xe] [PATCH 8/9] " Jani Nikula
2023-08-08 11:45 ` [Intel-xe] [PATCH 9/9] fixup! drm/i915/display: Remaining changes to make xe compile Jani Nikula
2023-08-08 20:50   ` Rodrigo Vivi
2023-08-08 12:02 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [1/9] drm/i915/display: add I915 conditional build to g4x_hdmi.h Patchwork
2023-08-08 12:02 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-08-08 12:04 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-08-08 12:07 ` [Intel-xe] ✗ CI.Build: failure " Patchwork
2023-08-09 12:28 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [1/9] drm/i915/display: add I915 conditional build to g4x_hdmi.h (rev2) Patchwork
2023-08-09 12:29 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-08-09 12:30 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-08-09 12:33 ` [Intel-xe] ✗ CI.Build: failure " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2023-04-19 12:39 [Intel-xe] [PATCH 0/9] xe & i915 display integration cleanups Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 9/9] fixup! drm/i915/display: Remaining changes to make xe compile Jani Nikula

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox