Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-xe] [PATCH v2 00/15] Display fixes
@ 2023-04-25 19:26 José Roberto de Souza
  2023-04-25 19:26 ` [Intel-xe] [PATCH v2 01/15] drm/i915/display: remove intel_display_commit_duplicated_state() José Roberto de Souza
                   ` (19 more replies)
  0 siblings, 20 replies; 26+ messages in thread
From: José Roberto de Souza @ 2023-04-25 19:26 UTC (permalink / raw)
  To: intel-xe; +Cc: rodrigo.vivi

This patch series does 4 main things:
- fix the dkl phy mutex initialization by:
	- backporting: https://patchwork.freedesktop.org/series/116431/
	- backporting: https://patchwork.freedesktop.org/patch/msgid/20230420170558.35398-1-jose.souza@intel.com
	- fixing display function calls

- enable modular fia in TGL
	- this patch will be gone in next Xe rebase as has_modular_fia
	was removed in drm-tip. Not backporting patches removing it
	because it is a huge series.

- Makes has_psr_hw_tracking default as 0, as only TGL and DG1 supports
PSR HW tracking in Xe kmd

- Enable Raptorlake-P

v2:
- function call fixes in 'squash! drm/xe/display: Implement display support'

Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/249

Jani Nikula (10):
  drm/i915/display: remove intel_display_commit_duplicated_state()
  drm/i915/display: start high level display driver file
  drm/i915/display: move intel_modeset_probe_defer() to
    intel_display_driver.[ch]
  drm/i915/display: rename intel_modeset_probe_defer() ->
    intel_display_driver_probe_defer()
  drm/i915/display: move modeset probe/remove functions to
    intel_display_driver.c
  drm/i915/display: rename intel_display_driver_* functions
  drm/i915/display: add intel_display_reset.[ch]
  drm/i915/display: move display suspend/resume to
    intel_display_driver.[ch]
  drm/i915/display: rename intel_display_driver_suspend/resume functions
  drm/i915/display: add intel_display_driver_early_probe()

José Roberto de Souza (5):
  drm/i915: Initialize dkl_phy spin lock from display code path
  squash! drm/xe/display: Implement display support
  TEMPORARY: drm/xe/display: Enable modular fia in TGL
  drm/xe/display: Disable PSR HW tracking by default in all display
    versions
  drm/xe: Enable Raptorlake-P

 drivers/gpu/drm/i915/Makefile                 |   2 +
 drivers/gpu/drm/i915/display/intel_display.c  | 693 +-----------------
 drivers/gpu/drm/i915/display/intel_display.h  |  29 +-
 .../drm/i915/display/intel_display_driver.c   | 585 +++++++++++++++
 .../drm/i915/display/intel_display_driver.h   |  36 +
 .../drm/i915/display/intel_display_reset.c    | 135 ++++
 .../drm/i915/display/intel_display_reset.h    |  14 +
 drivers/gpu/drm/i915/display/intel_dkl_phy.c  |   9 +
 drivers/gpu/drm/i915/display/intel_dkl_phy.h  |   1 +
 drivers/gpu/drm/i915/gt/intel_reset.c         |   6 +-
 drivers/gpu/drm/i915/i915_driver.c            |  35 +-
 drivers/gpu/drm/i915/i915_irq.c               |   2 +-
 drivers/gpu/drm/i915/i915_pci.c               |   3 +-
 drivers/gpu/drm/xe/Makefile                   |   1 +
 drivers/gpu/drm/xe/xe_display.c               |  38 +-
 drivers/gpu/drm/xe/xe_pci.c                   |   1 +
 16 files changed, 854 insertions(+), 736 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/display/intel_display_driver.c
 create mode 100644 drivers/gpu/drm/i915/display/intel_display_driver.h
 create mode 100644 drivers/gpu/drm/i915/display/intel_display_reset.c
 create mode 100644 drivers/gpu/drm/i915/display/intel_display_reset.h

-- 
2.40.0


^ permalink raw reply	[flat|nested] 26+ messages in thread
* [Intel-xe] [PATCH 12/15] squash! drm/xe/display: Implement display support
@ 2023-04-24 16:51 José Roberto de Souza
  2023-04-24 18:30 ` [Intel-xe] [PATCH v2 " José Roberto de Souza
  0 siblings, 1 reply; 26+ messages in thread
From: José Roberto de Souza @ 2023-04-24 16:51 UTC (permalink / raw)
  To: intel-xe; +Cc: rodrigo.vivi

Rename functions after backport https://patchwork.freedesktop.org/series/116431/
and add intel_display_driver_early_probe() call.

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/xe/Makefile     |  1 +
 drivers/gpu/drm/xe/xe_display.c | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index ee4a95beec206..9dc6cf218fb01 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -144,6 +144,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
 	i915-display/intel_ddi.o \
 	i915-display/intel_ddi_buf_trans.o \
 	i915-display/intel_display.o \
+	i915-display/intel_display_driver.o \
 	i915-display/intel_display_debugfs.o \
 	i915-display/intel_display_power.o \
 	i915-display/intel_display_power_map.o \
diff --git a/drivers/gpu/drm/xe/xe_display.c b/drivers/gpu/drm/xe/xe_display.c
index a8af9eddb496a..af18e554f57ed 100644
--- a/drivers/gpu/drm/xe/xe_display.c
+++ b/drivers/gpu/drm/xe/xe_display.c
@@ -22,6 +22,7 @@
 #include "intel_bw.h"
 #include "intel_clock_gating.h"
 #include "intel_display.h"
+#include "intel_display_driver.h"
 #include "intel_display_types.h"
 #include "intel_dmc.h"
 #include "intel_dp.h"
@@ -54,7 +55,7 @@ int xe_display_set_driver_hooks(struct pci_dev *pdev, struct drm_driver *driver)
 		return 0;
 
 	/* Detect if we need to wait for other drivers early on */
-	if (intel_modeset_probe_defer(pdev))
+	if (intel_display_driver_probe_defer(pdev))
 		return -EPROBE_DEFER;
 
 	driver->driver_features |= DRIVER_MODESET | DRIVER_ATOMIC;
@@ -159,7 +160,7 @@ void xe_display_fini_noirq(struct drm_device *dev, void *dummy)
 	if (!xe->info.enable_display)
 		return;
 
-	intel_modeset_driver_remove_noirq(xe);
+	intel_display_driver_probe_noirq(xe);
 	intel_power_domains_driver_remove(xe);
 }
 
@@ -170,6 +171,8 @@ int xe_display_init_noirq(struct xe_device *xe)
 	if (!xe->info.enable_display)
 		return 0;
 
+	intel_display_driver_early_probe(xe);
+
 	/* Early display init.. */
 	intel_opregion_setup(xe);
 
@@ -188,7 +191,7 @@ int xe_display_init_noirq(struct xe_device *xe)
 	if (err)
 		return err;
 
-	err = intel_modeset_init_noirq(xe);
+	err = intel_display_driver_probe_noirq(xe);
 	if (err)
 		return err;
 
@@ -202,7 +205,7 @@ void xe_display_fini_noaccel(struct drm_device *dev, void *dummy)
 	if (!xe->info.enable_display)
 		return;
 
-	intel_modeset_driver_remove_nogem(xe);
+	intel_display_driver_remove_noirq(xe);
 }
 
 int xe_display_init_noaccel(struct xe_device *xe)
@@ -212,7 +215,7 @@ int xe_display_init_noaccel(struct xe_device *xe)
 	if (!xe->info.enable_display)
 		return 0;
 
-	err = intel_modeset_init_nogem(xe);
+	err = intel_display_driver_probe_nogem(xe);
 	if (err)
 		return err;
 
@@ -224,7 +227,7 @@ int xe_display_init(struct xe_device *xe)
 	if (!xe->info.enable_display)
 		return 0;
 
-	return intel_modeset_init(xe);
+	return intel_display_driver_probe(xe);
 }
 
 void xe_display_unlink(struct xe_device *xe)
@@ -265,7 +268,7 @@ void xe_display_modset_driver_remove(struct xe_device *xe)
 	if (!xe->info.enable_display)
 		return;
 
-	intel_modeset_driver_remove(xe);
+	intel_display_driver_remove(xe);
 }
 
 /* IRQ-related functions */
@@ -333,7 +336,7 @@ void xe_display_pm_suspend(struct xe_device *xe)
 	if (xe->info.display.pipe_mask)
 		drm_kms_helper_poll_disable(&xe->drm);
 
-	intel_display_suspend(&xe->drm);
+	intel_display_driver_suspend(xe);
 
 	intel_dp_mst_suspend(xe);
 
@@ -378,13 +381,13 @@ void xe_display_pm_resume(struct xe_device *xe)
 	if (xe->info.display.pipe_mask)
 		drm_mode_config_reset(&xe->drm);
 
-	intel_modeset_init_hw(xe);
+	intel_display_driver_init_hw(xe);
 	intel_clock_gating_init(xe);
 	intel_hpd_init(xe);
 
 	/* MST sideband requires HPD interrupts enabled */
 	intel_dp_mst_resume(xe);
-	intel_display_resume(&xe->drm);
+	intel_display_driver_resume(xe);
 
 	intel_hpd_poll_disable(xe);
 	if (xe->info.display.pipe_mask)
-- 
2.40.0


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

end of thread, other threads:[~2023-05-03 19:43 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-25 19:26 [Intel-xe] [PATCH v2 00/15] Display fixes José Roberto de Souza
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 01/15] drm/i915/display: remove intel_display_commit_duplicated_state() José Roberto de Souza
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 02/15] drm/i915/display: start high level display driver file José Roberto de Souza
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 03/15] drm/i915/display: move intel_modeset_probe_defer() to intel_display_driver.[ch] José Roberto de Souza
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 04/15] drm/i915/display: rename intel_modeset_probe_defer() -> intel_display_driver_probe_defer() José Roberto de Souza
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 05/15] drm/i915/display: move modeset probe/remove functions to intel_display_driver.c José Roberto de Souza
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 06/15] drm/i915/display: rename intel_display_driver_* functions José Roberto de Souza
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 07/15] drm/i915/display: add intel_display_reset.[ch] José Roberto de Souza
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 08/15] drm/i915/display: move display suspend/resume to intel_display_driver.[ch] José Roberto de Souza
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 09/15] drm/i915/display: rename intel_display_driver_suspend/resume functions José Roberto de Souza
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 10/15] drm/i915/display: add intel_display_driver_early_probe() José Roberto de Souza
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 11/15] drm/i915: Initialize dkl_phy spin lock from display code path José Roberto de Souza
2023-05-02 19:16   ` [Intel-xe] [Intel-gfx] " Rodrigo Vivi
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 12/15] squash! drm/xe/display: Implement display support José Roberto de Souza
2023-05-03 19:43   ` Rodrigo Vivi
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 13/15] TEMPORARY: drm/xe/display: Enable modular fia in TGL José Roberto de Souza
2023-05-02 19:15   ` Rodrigo Vivi
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 14/15] drm/xe/display: Disable PSR HW tracking by default in all display versions José Roberto de Souza
2023-05-02 19:13   ` Rodrigo Vivi
2023-04-25 19:26 ` [Intel-xe] [PATCH v2 15/15] drm/xe: Enable Raptorlake-P José Roberto de Souza
2023-04-25 19:29 ` [Intel-xe] ✓ CI.Patch_applied: success for Display fixes (rev3) Patchwork
2023-04-25 19:30 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-04-25 19:34 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-04-25 19:57 ` [Intel-xe] ○ CI.BAT: info " Patchwork
2023-05-02 19:18 ` [Intel-xe] [PATCH v2 00/15] Display fixes Rodrigo Vivi
  -- strict thread matches above, loose matches on Subject: below --
2023-04-24 16:51 [Intel-xe] [PATCH 12/15] squash! drm/xe/display: Implement display support José Roberto de Souza
2023-04-24 18:30 ` [Intel-xe] [PATCH v2 " José Roberto de Souza

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