* [PATCH 2/9] drm/xe/display: Add intel_plane_initial_vblank_wait
2024-11-05 12:18 [PATCH 1/9] drm/xe: Remove double pageflip Maarten Lankhorst
@ 2024-11-05 12:18 ` Maarten Lankhorst
2024-11-05 15:47 ` kernel test robot
2024-11-05 20:48 ` kernel test robot
2024-11-05 12:18 ` [PATCH 3/9] drm/xe: Move suballocator init to after display init Maarten Lankhorst
` (7 subsequent siblings)
8 siblings, 2 replies; 13+ messages in thread
From: Maarten Lankhorst @ 2024-11-05 12:18 UTC (permalink / raw)
To: intel-xe; +Cc: intel-gfx, Maarten Lankhorst
We're changing the driver to have no interrupts during early init for
Xe, so we poll the PIPE_FRMSTMSMP counter instead.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 6 +++---
.../drm/i915/display/intel_plane_initial.c | 9 ++++++++-
.../drm/i915/display/intel_plane_initial.h | 1 +
drivers/gpu/drm/xe/display/xe_plane_initial.c | 19 ++++++++++++++++++-
4 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 863927f429aa7..029a8583b0548 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -795,7 +795,7 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc,
if ((crtc_state->active_planes & ~BIT(PLANE_CURSOR)) == 0 &&
hsw_ips_disable(crtc_state)) {
crtc_state->ips_enabled = false;
- intel_crtc_wait_for_next_vblank(crtc);
+ intel_plane_initial_vblank_wait(plane);
}
/*
@@ -809,7 +809,7 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc,
*/
if (HAS_GMCH(dev_priv) &&
intel_set_memory_cxsr(dev_priv, false))
- intel_crtc_wait_for_next_vblank(crtc);
+ intel_plane_initial_vblank_wait(plane);
/*
* Gen2 reports pipe underruns whenever all planes are disabled.
@@ -819,7 +819,7 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc,
intel_set_cpu_fifo_underrun_reporting(dev_priv, crtc->pipe, false);
intel_plane_disable_arm(NULL, plane, crtc_state);
- intel_crtc_wait_for_next_vblank(crtc);
+ intel_plane_initial_vblank_wait(plane);
}
unsigned int
diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index 62401f6a04e4f..f0f4ec2b6cc98 100644
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -14,6 +14,13 @@
#include "intel_frontbuffer.h"
#include "intel_plane_initial.h"
+void intel_plane_initial_vblank_wait(plane);(struct intel_plane *plane)
+{
+ struct intel_crtc *crtc = intel_crtc_for_pipe(to_intel_display(plane), plane->pipe);
+
+ intel_crtc_wait_for_next_vblank(crtc);
+}
+
static bool
intel_reuse_initial_plane_obj(struct intel_crtc *this,
const struct intel_initial_plane_config plane_configs[],
@@ -438,7 +445,7 @@ void intel_initial_plane_config(struct drm_i915_private *i915)
intel_find_initial_plane_obj(crtc, plane_configs);
if (i915->display.funcs.display->fixup_initial_plane_config(crtc, plane_config))
- intel_crtc_wait_for_next_vblank(crtc);
+ intel_initial_vblank_wait(crtc);
plane_config_fini(plane_config);
}
diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.h b/drivers/gpu/drm/i915/display/intel_plane_initial.h
index 64ab95239cd45..3ba20b9e2355f 100644
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.h
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.h
@@ -8,6 +8,7 @@
struct drm_i915_private;
+void intel_plane_initial_vblank_wait(struct intel_plane *plane);
void intel_initial_plane_config(struct drm_i915_private *i915);
#endif
diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c b/drivers/gpu/drm/xe/display/xe_plane_initial.c
index 668f544a7ac80..9252cfeef0a1f 100644
--- a/drivers/gpu/drm/xe/display/xe_plane_initial.c
+++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c
@@ -8,7 +8,9 @@
#include "regs/xe_gtt_defs.h"
#include "xe_ggtt.h"
+#include "xe_mmio.h"
+#include "i915_reg.h"
#include "intel_atomic_plane.h"
#include "intel_crtc.h"
#include "intel_display.h"
@@ -22,6 +24,21 @@
#include <generated/xe_wa_oob.h>
+void intel_plane_initial_vblank_wait(struct intel_plane *plane)
+{
+ /* Early xe has no irq */
+ struct xe_device *xe = to_xe_device(plane->base.dev);
+ struct xe_reg pipe_frmtmstmp = XE_REG(i915_mmio_reg_offset(PIPE_FRMTMSTMP(plane->pipe)));
+ u32 timestamp;
+ int ret;
+
+ timestamp = xe_mmio_read32(xe_root_tile_mmio(xe), pipe_frmtmstmp);
+
+ ret = xe_mmio_wait32_not(xe_root_tile_mmio(xe), pipe_frmtmstmp, ~0U, timestamp, 40000U, ×tamp, false);
+ if (ret < 0)
+ drm_warn(&xe->drm, "waiting for early vblank failed with %i\n", ret);
+}
+
static bool
intel_reuse_initial_plane_obj(struct intel_crtc *this,
const struct intel_initial_plane_config plane_configs[],
@@ -293,7 +310,7 @@ void intel_initial_plane_config(struct drm_i915_private *i915)
intel_find_initial_plane_obj(crtc, plane_configs);
if (i915->display.funcs.display->fixup_initial_plane_config(crtc, plane_config))
- intel_crtc_wait_for_next_vblank(crtc);
+ intel_plane_initial_vblank_wait(to_intel_plane(crtc->base.primary));
plane_config_fini(plane_config);
}
--
2.45.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 2/9] drm/xe/display: Add intel_plane_initial_vblank_wait
2024-11-05 12:18 ` [PATCH 2/9] drm/xe/display: Add intel_plane_initial_vblank_wait Maarten Lankhorst
@ 2024-11-05 15:47 ` kernel test robot
2024-11-05 20:48 ` kernel test robot
1 sibling, 0 replies; 13+ messages in thread
From: kernel test robot @ 2024-11-05 15:47 UTC (permalink / raw)
To: Maarten Lankhorst, intel-xe; +Cc: oe-kbuild-all, intel-gfx, Maarten Lankhorst
Hi Maarten,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm-xe/drm-xe-next]
[also build test ERROR on next-20241105]
[cannot apply to linus/master drm-intel/for-linux-next drm-intel/for-linux-next-fixes drm-tip/drm-tip v6.12-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Maarten-Lankhorst/drm-xe-display-Add-intel_plane_initial_vblank_wait/20241105-202047
base: https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe-next
patch link: https://lore.kernel.org/r/20241105121857.17389-2-maarten.lankhorst%40linux.intel.com
patch subject: [PATCH 2/9] drm/xe/display: Add intel_plane_initial_vblank_wait
config: x86_64-rhel-8.3 (https://download.01.org/0day-ci/archive/20241105/202411052327.1vYXqtrV-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241105/202411052327.1vYXqtrV-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202411052327.1vYXqtrV-lkp@intel.com/
All error/warnings (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/intel_plane_initial.c:17:1: warning: parameter names (without types) in function declaration
17 | void intel_plane_initial_vblank_wait(plane);(struct intel_plane *plane)
| ^~~~
>> drivers/gpu/drm/i915/display/intel_plane_initial.c:17:46: error: expected identifier or '(' before 'struct'
17 | void intel_plane_initial_vblank_wait(plane);(struct intel_plane *plane)
| ^~~~~~
drivers/gpu/drm/i915/display/intel_plane_initial.c: In function 'intel_initial_plane_config':
>> drivers/gpu/drm/i915/display/intel_plane_initial.c:448:25: error: implicit declaration of function 'intel_initial_vblank_wait'; did you mean 'intel_plane_initial_vblank_wait'? [-Werror=implicit-function-declaration]
448 | intel_initial_vblank_wait(crtc);
| ^~~~~~~~~~~~~~~~~~~~~~~~~
| intel_plane_initial_vblank_wait
cc1: some warnings being treated as errors
vim +17 drivers/gpu/drm/i915/display/intel_plane_initial.c
16
> 17 void intel_plane_initial_vblank_wait(plane);(struct intel_plane *plane)
18 {
19 struct intel_crtc *crtc = intel_crtc_for_pipe(to_intel_display(plane), plane->pipe);
20
21 intel_crtc_wait_for_next_vblank(crtc);
22 }
23
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 2/9] drm/xe/display: Add intel_plane_initial_vblank_wait
2024-11-05 12:18 ` [PATCH 2/9] drm/xe/display: Add intel_plane_initial_vblank_wait Maarten Lankhorst
2024-11-05 15:47 ` kernel test robot
@ 2024-11-05 20:48 ` kernel test robot
1 sibling, 0 replies; 13+ messages in thread
From: kernel test robot @ 2024-11-05 20:48 UTC (permalink / raw)
To: Maarten Lankhorst, intel-xe
Cc: llvm, oe-kbuild-all, intel-gfx, Maarten Lankhorst
Hi Maarten,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm-xe/drm-xe-next]
[also build test ERROR on next-20241105]
[cannot apply to linus/master drm-intel/for-linux-next drm-intel/for-linux-next-fixes drm-tip/drm-tip v6.12-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Maarten-Lankhorst/drm-xe-display-Add-intel_plane_initial_vblank_wait/20241105-202047
base: https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe-next
patch link: https://lore.kernel.org/r/20241105121857.17389-2-maarten.lankhorst%40linux.intel.com
patch subject: [PATCH 2/9] drm/xe/display: Add intel_plane_initial_vblank_wait
config: i386-defconfig (https://download.01.org/0day-ci/archive/20241106/202411060402.TB3RmJ09-lkp@intel.com/config)
compiler: clang version 19.1.3 (https://github.com/llvm/llvm-project ab51eccf88f5321e7c60591c5546b254b6afab99)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241106/202411060402.TB3RmJ09-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202411060402.TB3RmJ09-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/i915/display/intel_plane_initial.c:8:
In file included from drivers/gpu/drm/i915/i915_drv.h:40:
In file included from drivers/gpu/drm/i915/display/intel_display_core.h:16:
In file included from include/drm/drm_connector.h:32:
In file included from include/drm/drm_util.h:36:
In file included from include/linux/kgdb.h:19:
In file included from include/linux/kprobes.h:28:
In file included from include/linux/ftrace.h:13:
In file included from include/linux/kallsyms.h:13:
In file included from include/linux/mm.h:2213:
include/linux/vmstat.h:518:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
518 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
>> drivers/gpu/drm/i915/display/intel_plane_initial.c:17:38: error: a parameter list without types is only allowed in a function definition
17 | void intel_plane_initial_vblank_wait(plane);(struct intel_plane *plane)
| ^
>> drivers/gpu/drm/i915/display/intel_plane_initial.c:17:46: error: expected identifier or '('
17 | void intel_plane_initial_vblank_wait(plane);(struct intel_plane *plane)
| ^
>> drivers/gpu/drm/i915/display/intel_plane_initial.c:17:46: error: expected ')'
drivers/gpu/drm/i915/display/intel_plane_initial.c:17:45: note: to match this '('
17 | void intel_plane_initial_vblank_wait(plane);(struct intel_plane *plane)
| ^
>> drivers/gpu/drm/i915/display/intel_plane_initial.c:448:4: error: call to undeclared function 'intel_initial_vblank_wait'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
448 | intel_initial_vblank_wait(crtc);
| ^
drivers/gpu/drm/i915/display/intel_plane_initial.c:448:4: note: did you mean 'intel_plane_initial_vblank_wait'?
drivers/gpu/drm/i915/display/intel_plane_initial.h:11:6: note: 'intel_plane_initial_vblank_wait' declared here
11 | void intel_plane_initial_vblank_wait(struct intel_plane *plane);
| ^
1 warning and 4 errors generated.
vim +17 drivers/gpu/drm/i915/display/intel_plane_initial.c
16
> 17 void intel_plane_initial_vblank_wait(plane);(struct intel_plane *plane)
18 {
19 struct intel_crtc *crtc = intel_crtc_for_pipe(to_intel_display(plane), plane->pipe);
20
21 intel_crtc_wait_for_next_vblank(crtc);
22 }
23
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/9] drm/xe: Move suballocator init to after display init
2024-11-05 12:18 [PATCH 1/9] drm/xe: Remove double pageflip Maarten Lankhorst
2024-11-05 12:18 ` [PATCH 2/9] drm/xe/display: Add intel_plane_initial_vblank_wait Maarten Lankhorst
@ 2024-11-05 12:18 ` Maarten Lankhorst
2024-11-05 12:18 ` [PATCH 4/9] drm/xe: Defer irq init until after xe_display_init_noaccel Maarten Lankhorst
` (6 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Maarten Lankhorst @ 2024-11-05 12:18 UTC (permalink / raw)
To: intel-xe; +Cc: intel-gfx, Maarten Lankhorst
No allocations should be done before we have had a chance to preserve
the display fb.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/xe/xe_device.c | 6 ++++++
drivers/gpu/drm/xe/xe_tile.c | 12 ++++++++----
drivers/gpu/drm/xe/xe_tile.h | 1 +
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index a0d29d5cb7b70..cef782f244e1a 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -730,6 +730,12 @@ int xe_device_probe(struct xe_device *xe)
if (err)
goto err;
+ for_each_tile(tile, xe, id) {
+ err = xe_tile_init(tile);
+ if (err)
+ goto err;
+ }
+
for_each_gt(gt, xe, id) {
last_gt = id;
diff --git a/drivers/gpu/drm/xe/xe_tile.c b/drivers/gpu/drm/xe/xe_tile.c
index 07cf7cfe4abd5..2825553b568f7 100644
--- a/drivers/gpu/drm/xe/xe_tile.c
+++ b/drivers/gpu/drm/xe/xe_tile.c
@@ -170,10 +170,6 @@ int xe_tile_init_noalloc(struct xe_tile *tile)
if (err)
return err;
- tile->mem.kernel_bb_pool = xe_sa_bo_manager_init(tile, SZ_1M, 16);
- if (IS_ERR(tile->mem.kernel_bb_pool))
- return PTR_ERR(tile->mem.kernel_bb_pool);
-
xe_wa_apply_tile_workarounds(tile);
err = xe_tile_sysfs_init(tile);
@@ -181,6 +177,14 @@ int xe_tile_init_noalloc(struct xe_tile *tile)
return 0;
}
+int xe_tile_init(struct xe_tile *tile)
+{
+ tile->mem.kernel_bb_pool = xe_sa_bo_manager_init(tile, SZ_1M, 16);
+ if (IS_ERR(tile->mem.kernel_bb_pool))
+ return PTR_ERR(tile->mem.kernel_bb_pool);
+
+ return 0;
+}
void xe_tile_migrate_wait(struct xe_tile *tile)
{
xe_migrate_wait(tile->migrate);
diff --git a/drivers/gpu/drm/xe/xe_tile.h b/drivers/gpu/drm/xe/xe_tile.h
index 1c9e42ade6b05..eb939316d55b0 100644
--- a/drivers/gpu/drm/xe/xe_tile.h
+++ b/drivers/gpu/drm/xe/xe_tile.h
@@ -12,6 +12,7 @@ struct xe_tile;
int xe_tile_init_early(struct xe_tile *tile, struct xe_device *xe, u8 id);
int xe_tile_init_noalloc(struct xe_tile *tile);
+int xe_tile_init(struct xe_tile *tile);
void xe_tile_migrate_wait(struct xe_tile *tile);
--
2.45.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 4/9] drm/xe: Defer irq init until after xe_display_init_noaccel
2024-11-05 12:18 [PATCH 1/9] drm/xe: Remove double pageflip Maarten Lankhorst
2024-11-05 12:18 ` [PATCH 2/9] drm/xe/display: Add intel_plane_initial_vblank_wait Maarten Lankhorst
2024-11-05 12:18 ` [PATCH 3/9] drm/xe: Move suballocator init to after display init Maarten Lankhorst
@ 2024-11-05 12:18 ` Maarten Lankhorst
2024-11-05 12:18 ` [PATCH 5/9] drm/xe/display: Use a single early init call for display Maarten Lankhorst
` (5 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Maarten Lankhorst @ 2024-11-05 12:18 UTC (permalink / raw)
To: intel-xe; +Cc: intel-gfx, Maarten Lankhorst
Technically, I believe this means that xe_display_init_noirq and
xe_display_init_noaccel can be merged together now.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/xe/xe_device.c | 12 ++++--------
drivers/gpu/drm/xe/xe_tile.c | 7 +++++++
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index cef782f244e1a..b9948b2dc8d1d 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -41,7 +41,6 @@
#include "xe_hw_engine_group.h"
#include "xe_hwmon.h"
#include "xe_irq.h"
-#include "xe_memirq.h"
#include "xe_mmio.h"
#include "xe_module.h"
#include "xe_observation.h"
@@ -673,9 +672,6 @@ int xe_device_probe(struct xe_device *xe)
err = xe_ggtt_init_early(tile->mem.ggtt);
if (err)
return err;
- err = xe_memirq_init(&tile->memirq);
- if (err)
- return err;
}
for_each_gt(gt, xe, id) {
@@ -695,10 +691,6 @@ int xe_device_probe(struct xe_device *xe)
if (err)
return err;
- err = xe_irq_install(xe);
- if (err)
- goto err;
-
err = probe_has_flat_ccs(xe);
if (err)
goto err;
@@ -736,6 +728,10 @@ int xe_device_probe(struct xe_device *xe)
goto err;
}
+ err = xe_irq_install(xe);
+ if (err)
+ goto err;
+
for_each_gt(gt, xe, id) {
last_gt = id;
diff --git a/drivers/gpu/drm/xe/xe_tile.c b/drivers/gpu/drm/xe/xe_tile.c
index 2825553b568f7..d07c1fba793ca 100644
--- a/drivers/gpu/drm/xe/xe_tile.c
+++ b/drivers/gpu/drm/xe/xe_tile.c
@@ -10,6 +10,7 @@
#include "xe_device.h"
#include "xe_ggtt.h"
#include "xe_gt.h"
+#include "xe_memirq.h"
#include "xe_migrate.h"
#include "xe_pcode.h"
#include "xe_sa.h"
@@ -179,6 +180,12 @@ int xe_tile_init_noalloc(struct xe_tile *tile)
int xe_tile_init(struct xe_tile *tile)
{
+ int err;
+
+ err = xe_memirq_init(&tile->memirq);
+ if (err)
+ return err;
+
tile->mem.kernel_bb_pool = xe_sa_bo_manager_init(tile, SZ_1M, 16);
if (IS_ERR(tile->mem.kernel_bb_pool))
return PTR_ERR(tile->mem.kernel_bb_pool);
--
2.45.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/9] drm/xe/display: Use a single early init call for display
2024-11-05 12:18 [PATCH 1/9] drm/xe: Remove double pageflip Maarten Lankhorst
` (2 preceding siblings ...)
2024-11-05 12:18 ` [PATCH 4/9] drm/xe: Defer irq init until after xe_display_init_noaccel Maarten Lankhorst
@ 2024-11-05 12:18 ` Maarten Lankhorst
2024-11-05 12:18 ` [PATCH 6/9] drm/xe/sriov: Move VF bootstrap and query_config to vf_guc_init Maarten Lankhorst
` (4 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Maarten Lankhorst @ 2024-11-05 12:18 UTC (permalink / raw)
To: intel-xe; +Cc: intel-gfx, Maarten Lankhorst
Instead of 3 different calls, it should be safe to unify to a single
call now. This makes the init sequence cleaner, and display less
tangled.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/xe/display/xe_display.c | 72 +++++++------------------
drivers/gpu/drm/xe/display/xe_display.h | 8 +--
drivers/gpu/drm/xe/xe_device.c | 10 +---
3 files changed, 23 insertions(+), 67 deletions(-)
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index b5502f335f531..a9ce4f561e7aa 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -100,31 +100,7 @@ int xe_display_create(struct xe_device *xe)
return drmm_add_action_or_reset(&xe->drm, display_destroy, NULL);
}
-static void xe_display_fini_nommio(struct drm_device *dev, void *dummy)
-{
- struct xe_device *xe = to_xe_device(dev);
-
- if (!xe->info.probe_display)
- return;
-
- intel_power_domains_cleanup(xe);
-}
-
-int xe_display_init_nommio(struct xe_device *xe)
-{
- if (!xe->info.probe_display)
- return 0;
-
- /* Fake uncore lock */
- spin_lock_init(&xe->uncore.lock);
-
- /* This must be called before any calls to HAS_PCH_* */
- intel_detect_pch(xe);
-
- return drmm_add_action_or_reset(&xe->drm, xe_display_fini_nommio, xe);
-}
-
-static void xe_display_fini_noirq(void *arg)
+static void xe_display_fini_early(void *arg)
{
struct xe_device *xe = arg;
struct intel_display *display = &xe->display;
@@ -132,11 +108,13 @@ static void xe_display_fini_noirq(void *arg)
if (!xe->info.probe_display)
return;
+ intel_display_driver_remove_nogem(xe);
intel_display_driver_remove_noirq(xe);
intel_opregion_cleanup(display);
+ intel_power_domains_cleanup(xe);
}
-int xe_display_init_noirq(struct xe_device *xe)
+int xe_display_init_early(struct xe_device *xe)
{
struct intel_display *display = &xe->display;
int err;
@@ -144,6 +122,12 @@ int xe_display_init_noirq(struct xe_device *xe)
if (!xe->info.probe_display)
return 0;
+ /* Fake uncore lock */
+ spin_lock_init(&xe->uncore.lock);
+
+ /* This must be called before any calls to HAS_PCH_* */
+ intel_detect_pch(xe);
+
intel_display_driver_early_probe(xe);
/* Early display init.. */
@@ -160,36 +144,20 @@ int xe_display_init_noirq(struct xe_device *xe)
intel_display_device_info_runtime_init(xe);
err = intel_display_driver_probe_noirq(xe);
- if (err) {
- intel_opregion_cleanup(display);
- return err;
- }
-
- return devm_add_action_or_reset(xe->drm.dev, xe_display_fini_noirq, xe);
-}
-
-static void xe_display_fini_noaccel(void *arg)
-{
- struct xe_device *xe = arg;
-
- if (!xe->info.probe_display)
- return;
-
- intel_display_driver_remove_nogem(xe);
-}
-
-int xe_display_init_noaccel(struct xe_device *xe)
-{
- int err;
-
- if (!xe->info.probe_display)
- return 0;
+ if (err)
+ goto err_opregion;
err = intel_display_driver_probe_nogem(xe);
if (err)
- return err;
+ goto err_noirq;
- return devm_add_action_or_reset(xe->drm.dev, xe_display_fini_noaccel, xe);
+ return devm_add_action_or_reset(xe->drm.dev, xe_display_fini_early, xe);
+err_noirq:
+ intel_display_driver_remove_noirq(xe);
+ intel_power_domains_cleanup(xe);
+err_opregion:
+ intel_opregion_cleanup(display);
+ return err;
}
int xe_display_init(struct xe_device *xe)
diff --git a/drivers/gpu/drm/xe/display/xe_display.h b/drivers/gpu/drm/xe/display/xe_display.h
index 17afa537aee50..255cffa328160 100644
--- a/drivers/gpu/drm/xe/display/xe_display.h
+++ b/drivers/gpu/drm/xe/display/xe_display.h
@@ -20,9 +20,7 @@ int xe_display_create(struct xe_device *xe);
int xe_display_probe(struct xe_device *xe);
-int xe_display_init_nommio(struct xe_device *xe);
-int xe_display_init_noirq(struct xe_device *xe);
-int xe_display_init_noaccel(struct xe_device *xe);
+int xe_display_init_early(struct xe_device *xe);
int xe_display_init(struct xe_device *xe);
void xe_display_fini(struct xe_device *xe);
@@ -53,9 +51,7 @@ static inline int xe_display_create(struct xe_device *xe) { return 0; }
static inline int xe_display_probe(struct xe_device *xe) { return 0; }
-static inline int xe_display_init_nommio(struct xe_device *xe) { return 0; }
-static inline int xe_display_init_noirq(struct xe_device *xe) { return 0; }
-static inline int xe_display_init_noaccel(struct xe_device *xe) { return 0; }
+static inline int xe_display_init_early(struct xe_device *xe) { return 0; }
static inline int xe_display_init(struct xe_device *xe) { return 0; }
static inline void xe_display_fini(struct xe_device *xe) {}
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index b9948b2dc8d1d..f1147ebeeff31 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -632,10 +632,6 @@ int xe_device_probe(struct xe_device *xe)
return err;
xe->info.mem_region_mask = 1;
- err = xe_display_init_nommio(xe);
- if (err)
- return err;
-
err = xe_set_dma_info(xe);
if (err)
return err;
@@ -687,10 +683,6 @@ int xe_device_probe(struct xe_device *xe)
if (err)
return err;
- err = xe_display_init_noirq(xe);
- if (err)
- return err;
-
err = probe_has_flat_ccs(xe);
if (err)
goto err;
@@ -718,7 +710,7 @@ int xe_device_probe(struct xe_device *xe)
* This is the reason the first allocation needs to be done
* inside display.
*/
- err = xe_display_init_noaccel(xe);
+ err = xe_display_init_early(xe);
if (err)
goto err;
--
2.45.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 6/9] drm/xe/sriov: Move VF bootstrap and query_config to vf_guc_init
2024-11-05 12:18 [PATCH 1/9] drm/xe: Remove double pageflip Maarten Lankhorst
` (3 preceding siblings ...)
2024-11-05 12:18 ` [PATCH 5/9] drm/xe/display: Use a single early init call for display Maarten Lankhorst
@ 2024-11-05 12:18 ` Maarten Lankhorst
2024-11-05 12:18 ` [PATCH 7/9] drm/xe: Simplify GuC early initialisation Maarten Lankhorst
` (3 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Maarten Lankhorst @ 2024-11-05 12:18 UTC (permalink / raw)
To: intel-xe; +Cc: intel-gfx, Maarten Lankhorst
We want to split up GUC init to an alloc and noalloc part to keep the
init path the same for VF and !VF as much as possible.
Everything in vf_guc_init should be done as early as possible, otherwise
VRAM probing becomes impossible.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 1 -
drivers/gpu/drm/xe/xe_guc.c | 17 +++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
index d3baba50f0851..521aaa3631f06 100644
--- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
+++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
@@ -885,7 +885,6 @@ u32 xe_gt_sriov_vf_read32(struct xe_gt *gt, struct xe_reg reg)
struct vf_runtime_reg *rr;
xe_gt_assert(gt, IS_SRIOV_VF(gt_to_xe(gt)));
- xe_gt_assert(gt, gt->sriov.vf.pf_version.major);
xe_gt_assert(gt, !reg.vf);
if (reg.addr == GMD_ID.addr) {
diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
index 7f704346a8f4d..709c219c6a5b1 100644
--- a/drivers/gpu/drm/xe/xe_guc.c
+++ b/drivers/gpu/drm/xe/xe_guc.c
@@ -301,6 +301,7 @@ static int xe_guc_realloc_post_hwconfig(struct xe_guc *guc)
static int vf_guc_init(struct xe_guc *guc)
{
+ struct xe_gt *gt = guc_to_gt(guc);
int err;
xe_guc_comm_init_early(guc);
@@ -313,6 +314,14 @@ static int vf_guc_init(struct xe_guc *guc)
if (err)
return err;
+ err = xe_gt_sriov_vf_bootstrap(gt);
+ if (err)
+ return err;
+
+ err = xe_gt_sriov_vf_query_config(gt);
+ if (err)
+ return err;
+
return 0;
}
@@ -753,14 +762,6 @@ static int vf_guc_min_load_for_hwconfig(struct xe_guc *guc)
struct xe_gt *gt = guc_to_gt(guc);
int ret;
- ret = xe_gt_sriov_vf_bootstrap(gt);
- if (ret)
- return ret;
-
- ret = xe_gt_sriov_vf_query_config(gt);
- if (ret)
- return ret;
-
ret = xe_guc_hwconfig_init(guc);
if (ret)
return ret;
--
2.45.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 7/9] drm/xe: Simplify GuC early initialisation
2024-11-05 12:18 [PATCH 1/9] drm/xe: Remove double pageflip Maarten Lankhorst
` (4 preceding siblings ...)
2024-11-05 12:18 ` [PATCH 6/9] drm/xe/sriov: Move VF bootstrap and query_config to vf_guc_init Maarten Lankhorst
@ 2024-11-05 12:18 ` Maarten Lankhorst
2024-11-05 12:18 ` [PATCH 8/9] drm/xe: Make it possible to read instance0 MCR registers after xe_gt_mcr_init_early Maarten Lankhorst
` (2 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Maarten Lankhorst @ 2024-11-05 12:18 UTC (permalink / raw)
To: intel-xe; +Cc: intel-gfx, Maarten Lankhorst
Add a 2-stage GuC init. An early one for everything that is needed
for VF, and a full one that loads GuC and is allowed to do allocations.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/xe/tests/xe_guc_relay_test.c | 2 +-
drivers/gpu/drm/xe/xe_device.c | 16 ------
drivers/gpu/drm/xe/xe_gt.c | 9 +++-
drivers/gpu/drm/xe/xe_guc.c | 51 ++++++++++++--------
drivers/gpu/drm/xe/xe_guc.h | 1 +
drivers/gpu/drm/xe/xe_guc_ct.c | 28 +++++++----
drivers/gpu/drm/xe/xe_guc_ct.h | 1 +
drivers/gpu/drm/xe/xe_guc_relay.c | 6 +--
drivers/gpu/drm/xe/xe_guc_relay.h | 2 +-
drivers/gpu/drm/xe/xe_huc.h | 1 +
drivers/gpu/drm/xe/xe_uc.c | 21 ++++++++
drivers/gpu/drm/xe/xe_uc.h | 1 +
12 files changed, 88 insertions(+), 51 deletions(-)
diff --git a/drivers/gpu/drm/xe/tests/xe_guc_relay_test.c b/drivers/gpu/drm/xe/tests/xe_guc_relay_test.c
index 13701451b9235..b951d55ef1b32 100644
--- a/drivers/gpu/drm/xe/tests/xe_guc_relay_test.c
+++ b/drivers/gpu/drm/xe/tests/xe_guc_relay_test.c
@@ -42,7 +42,7 @@ static int relay_test_init(struct kunit *test)
kunit_activate_static_stub(test, relay_get_totalvfs,
replacement_relay_get_totalvfs);
- KUNIT_ASSERT_EQ(test, xe_guc_relay_init(relay), 0);
+ KUNIT_ASSERT_EQ(test, xe_guc_relay_init_noalloc(relay), 0);
KUNIT_EXPECT_TRUE(test, relay_is_ready(relay));
relay->last_rid = TEST_RID - 1;
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index f1147ebeeff31..5dafd48d5478b 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -646,25 +646,9 @@ int xe_device_probe(struct xe_device *xe)
err = xe_gt_init_early(gt);
if (err)
return err;
-
- /*
- * Only after this point can GT-specific MMIO operations
- * (including things like communication with the GuC)
- * be performed.
- */
- xe_gt_mmio_init(gt);
}
for_each_tile(tile, xe, id) {
- if (IS_SRIOV_VF(xe)) {
- xe_guc_comm_init_early(&tile->primary_gt->uc.guc);
- err = xe_gt_sriov_vf_bootstrap(tile->primary_gt);
- if (err)
- return err;
- err = xe_gt_sriov_vf_query_config(tile->primary_gt);
- if (err)
- return err;
- }
err = xe_ggtt_init_early(tile->mem.ggtt);
if (err)
return err;
diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index d6744be01a687..dc6901255dc91 100644
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -387,7 +387,14 @@ int xe_gt_init_early(struct xe_gt *gt)
xe_force_wake_init_gt(gt, gt_to_fw(gt));
spin_lock_init(>->global_invl_lock);
- return 0;
+ /*
+ * Only after this point can GT-specific MMIO operations
+ * (including things like communication with the GuC)
+ * be performed.
+ */
+ xe_gt_mmio_init(gt);
+
+ return xe_uc_init_noalloc(>->uc);
}
static void dump_pat_on_error(struct xe_gt *gt)
diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
index 709c219c6a5b1..89aa4598bf3c4 100644
--- a/drivers/gpu/drm/xe/xe_guc.c
+++ b/drivers/gpu/drm/xe/xe_guc.c
@@ -299,21 +299,11 @@ static int xe_guc_realloc_post_hwconfig(struct xe_guc *guc)
return 0;
}
-static int vf_guc_init(struct xe_guc *guc)
+static int vf_guc_init_noalloc(struct xe_guc *guc)
{
struct xe_gt *gt = guc_to_gt(guc);
int err;
- xe_guc_comm_init_early(guc);
-
- err = xe_guc_ct_init(&guc->ct);
- if (err)
- return err;
-
- err = xe_guc_relay_init(&guc->relay);
- if (err)
- return err;
-
err = xe_gt_sriov_vf_bootstrap(gt);
if (err)
return err;
@@ -325,6 +315,35 @@ static int vf_guc_init(struct xe_guc *guc)
return 0;
}
+int xe_guc_init_noalloc(struct xe_guc *guc)
+{
+ struct xe_device *xe = guc_to_xe(guc);
+ struct xe_gt *gt = guc_to_gt(guc);
+ int ret;
+
+ xe_guc_comm_init_early(guc);
+
+ ret = xe_guc_ct_init_noalloc(&guc->ct);
+ if (ret)
+ goto out;
+
+ ret = xe_guc_relay_init_noalloc(&guc->relay);
+ if (ret)
+ goto out;
+
+ if (IS_SRIOV_VF(xe)) {
+ ret = vf_guc_init_noalloc(guc);
+ if (ret)
+ goto out;
+ }
+
+ return 0;
+
+out:
+ xe_gt_err(gt, "GuC init failed with %pe\n", ERR_PTR(ret));
+ return ret;
+}
+
int xe_guc_init(struct xe_guc *guc)
{
struct xe_device *xe = guc_to_xe(guc);
@@ -334,13 +353,13 @@ int xe_guc_init(struct xe_guc *guc)
guc->fw.type = XE_UC_FW_TYPE_GUC;
ret = xe_uc_fw_init(&guc->fw);
if (ret)
- goto out;
+ return ret;
if (!xe_uc_fw_is_enabled(&guc->fw))
return 0;
if (IS_SRIOV_VF(xe)) {
- ret = vf_guc_init(guc);
+ ret = xe_guc_ct_init(&guc->ct);
if (ret)
goto out;
return 0;
@@ -362,10 +381,6 @@ int xe_guc_init(struct xe_guc *guc)
if (ret)
goto out;
- ret = xe_guc_relay_init(&guc->relay);
- if (ret)
- goto out;
-
xe_uc_fw_change_status(&guc->fw, XE_UC_FIRMWARE_LOADABLE);
ret = devm_add_action_or_reset(xe->drm.dev, guc_fini_hw, guc);
@@ -374,8 +389,6 @@ int xe_guc_init(struct xe_guc *guc)
guc_init_params(guc);
- xe_guc_comm_init_early(guc);
-
return 0;
out:
diff --git a/drivers/gpu/drm/xe/xe_guc.h b/drivers/gpu/drm/xe/xe_guc.h
index 58338be445585..965bf72912009 100644
--- a/drivers/gpu/drm/xe/xe_guc.h
+++ b/drivers/gpu/drm/xe/xe_guc.h
@@ -26,6 +26,7 @@
struct drm_printer;
void xe_guc_comm_init_early(struct xe_guc *guc);
+int xe_guc_init_noalloc(struct xe_guc *guc);
int xe_guc_init(struct xe_guc *guc);
int xe_guc_init_post_hwconfig(struct xe_guc *guc);
int xe_guc_post_load_init(struct xe_guc *guc);
diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c
index a405b9218ad2d..f0bbc6bbf6170 100644
--- a/drivers/gpu/drm/xe/xe_guc_ct.c
+++ b/drivers/gpu/drm/xe/xe_guc_ct.c
@@ -203,12 +203,10 @@ static void primelockdep(struct xe_guc_ct *ct)
fs_reclaim_release(GFP_KERNEL);
}
-int xe_guc_ct_init(struct xe_guc_ct *ct)
+int xe_guc_ct_init_noalloc(struct xe_guc_ct *ct)
{
struct xe_device *xe = ct_to_xe(ct);
struct xe_gt *gt = ct_to_gt(ct);
- struct xe_tile *tile = gt_to_tile(gt);
- struct xe_bo *bo;
int err;
xe_gt_assert(gt, !(guc_ct_size() % PAGE_SIZE));
@@ -234,6 +232,23 @@ int xe_guc_ct_init(struct xe_guc_ct *ct)
primelockdep(ct);
+ err = drmm_add_action_or_reset(&xe->drm, guc_ct_fini, ct);
+ if (err)
+ return err;
+
+ xe_gt_assert(gt, ct->state == XE_GUC_CT_STATE_NOT_INITIALIZED);
+ ct->state = XE_GUC_CT_STATE_DISABLED;
+ return 0;
+}
+ALLOW_ERROR_INJECTION(xe_guc_ct_init_noalloc, ERRNO); /* See xe_pci_probe() */
+
+int xe_guc_ct_init(struct xe_guc_ct *ct)
+{
+ struct xe_device *xe = ct_to_xe(ct);
+ struct xe_gt *gt = ct_to_gt(ct);
+ struct xe_tile *tile = gt_to_tile(gt);
+ struct xe_bo *bo;
+
bo = xe_managed_bo_create_pin_map(xe, tile, guc_ct_size(),
XE_BO_FLAG_SYSTEM |
XE_BO_FLAG_GGTT |
@@ -242,13 +257,6 @@ int xe_guc_ct_init(struct xe_guc_ct *ct)
return PTR_ERR(bo);
ct->bo = bo;
-
- err = drmm_add_action_or_reset(&xe->drm, guc_ct_fini, ct);
- if (err)
- return err;
-
- xe_gt_assert(gt, ct->state == XE_GUC_CT_STATE_NOT_INITIALIZED);
- ct->state = XE_GUC_CT_STATE_DISABLED;
return 0;
}
ALLOW_ERROR_INJECTION(xe_guc_ct_init, ERRNO); /* See xe_pci_probe() */
diff --git a/drivers/gpu/drm/xe/xe_guc_ct.h b/drivers/gpu/drm/xe/xe_guc_ct.h
index 82c4ae458dda3..9f28fc135890d 100644
--- a/drivers/gpu/drm/xe/xe_guc_ct.h
+++ b/drivers/gpu/drm/xe/xe_guc_ct.h
@@ -11,6 +11,7 @@
struct drm_printer;
struct xe_device;
+int xe_guc_ct_init_noalloc(struct xe_guc_ct *ct);
int xe_guc_ct_init(struct xe_guc_ct *ct);
int xe_guc_ct_enable(struct xe_guc_ct *ct);
void xe_guc_ct_disable(struct xe_guc_ct *ct);
diff --git a/drivers/gpu/drm/xe/xe_guc_relay.c b/drivers/gpu/drm/xe/xe_guc_relay.c
index 8f62de026724c..b778d0e0253de 100644
--- a/drivers/gpu/drm/xe/xe_guc_relay.c
+++ b/drivers/gpu/drm/xe/xe_guc_relay.c
@@ -322,7 +322,7 @@ static void __fini_relay(struct drm_device *drm, void *arg)
}
/**
- * xe_guc_relay_init - Initialize a &xe_guc_relay
+ * xe_guc_relay_init_noalloc - Initialize a &xe_guc_relay
* @relay: the &xe_guc_relay to initialize
*
* Initialize remaining members of &xe_guc_relay that may depend
@@ -330,7 +330,7 @@ static void __fini_relay(struct drm_device *drm, void *arg)
*
* Return: 0 on success or a negative error code on failure.
*/
-int xe_guc_relay_init(struct xe_guc_relay *relay)
+int xe_guc_relay_init_noalloc(struct xe_guc_relay *relay)
{
const int XE_RELAY_MEMPOOL_MIN_NUM = 1;
struct xe_device *xe = relay_to_xe(relay);
@@ -356,7 +356,7 @@ int xe_guc_relay_init(struct xe_guc_relay *relay)
return drmm_add_action_or_reset(&xe->drm, __fini_relay, relay);
}
-ALLOW_ERROR_INJECTION(xe_guc_relay_init, ERRNO); /* See xe_pci_probe() */
+ALLOW_ERROR_INJECTION(xe_guc_relay_init_noalloc, ERRNO); /* See xe_pci_probe() */
static u32 to_relay_error(int err)
{
diff --git a/drivers/gpu/drm/xe/xe_guc_relay.h b/drivers/gpu/drm/xe/xe_guc_relay.h
index 385429aa188ab..e0afff4542cfc 100644
--- a/drivers/gpu/drm/xe/xe_guc_relay.h
+++ b/drivers/gpu/drm/xe/xe_guc_relay.h
@@ -11,7 +11,7 @@
struct xe_guc_relay;
-int xe_guc_relay_init(struct xe_guc_relay *relay);
+int xe_guc_relay_init_noalloc(struct xe_guc_relay *relay);
int xe_guc_relay_send_to_pf(struct xe_guc_relay *relay,
const u32 *msg, u32 len, u32 *buf, u32 buf_size);
diff --git a/drivers/gpu/drm/xe/xe_huc.h b/drivers/gpu/drm/xe/xe_huc.h
index fa1c45e704432..bc6f93028c2b6 100644
--- a/drivers/gpu/drm/xe/xe_huc.h
+++ b/drivers/gpu/drm/xe/xe_huc.h
@@ -17,6 +17,7 @@ enum xe_huc_auth_types {
XE_HUC_AUTH_TYPES_COUNT
};
+int xe_huc_init_noalloc(struct xe_huc *huc);
int xe_huc_init(struct xe_huc *huc);
int xe_huc_init_post_hwconfig(struct xe_huc *huc);
int xe_huc_upload(struct xe_huc *huc);
diff --git a/drivers/gpu/drm/xe/xe_uc.c b/drivers/gpu/drm/xe/xe_uc.c
index 0d073a9987c2e..45d0c2f26754c 100644
--- a/drivers/gpu/drm/xe/xe_uc.c
+++ b/drivers/gpu/drm/xe/xe_uc.c
@@ -32,6 +32,27 @@ uc_to_xe(struct xe_uc *uc)
}
/* Should be called once at driver load only */
+int xe_uc_init_noalloc(struct xe_uc *uc)
+{
+ int ret;
+
+ /*
+ * We call the GuC/HuC/GSC init functions even if GuC submission is off
+ * to correctly move our tracking of the FW state to "disabled".
+ */
+ ret = xe_guc_init_noalloc(&uc->guc);
+ if (ret)
+ goto err;
+
+ /* HuC and GSC have no early dependencies and can be completely initialised during full xe_uc_init(). */
+
+ return 0;
+
+err:
+ xe_gt_err(uc_to_gt(uc), "Failed to early initialize uC (%pe)\n", ERR_PTR(ret));
+ return ret;
+}
+
int xe_uc_init(struct xe_uc *uc)
{
int ret;
diff --git a/drivers/gpu/drm/xe/xe_uc.h b/drivers/gpu/drm/xe/xe_uc.h
index 506517c113339..650e95585b4ba 100644
--- a/drivers/gpu/drm/xe/xe_uc.h
+++ b/drivers/gpu/drm/xe/xe_uc.h
@@ -8,6 +8,7 @@
struct xe_uc;
+int xe_uc_init_noalloc(struct xe_uc *uc);
int xe_uc_init(struct xe_uc *uc);
int xe_uc_init_hwconfig(struct xe_uc *uc);
int xe_uc_init_post_hwconfig(struct xe_uc *uc);
--
2.45.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 8/9] drm/xe: Make it possible to read instance0 MCR registers after xe_gt_mcr_init_early
2024-11-05 12:18 [PATCH 1/9] drm/xe: Remove double pageflip Maarten Lankhorst
` (5 preceding siblings ...)
2024-11-05 12:18 ` [PATCH 7/9] drm/xe: Simplify GuC early initialisation Maarten Lankhorst
@ 2024-11-05 12:18 ` Maarten Lankhorst
2024-11-05 12:18 ` [PATCH 9/9] drm/xe: Split init of xe_gt_init_hwconfig to xe_gt_init and *_early Maarten Lankhorst
2024-11-05 12:52 ` ✗ Fi.CI.BUILD: failure for series starting with [1/9] drm/xe: Remove double pageflip Patchwork
8 siblings, 0 replies; 13+ messages in thread
From: Maarten Lankhorst @ 2024-11-05 12:18 UTC (permalink / raw)
To: intel-xe; +Cc: intel-gfx, Maarten Lankhorst
After mcr_init_early, we need to be able to do VRAM and CCS probing
without hwconfig probe. Fortunately the relevant registers are all
instance 0, which fortunately means no dependencies on further initialisation
is required.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/xe/xe_gt_mcr.c | 47 ++++++++++++++++++--------------
drivers/gpu/drm/xe/xe_gt_types.h | 2 ++
2 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_gt_mcr.c b/drivers/gpu/drm/xe/xe_gt_mcr.c
index 5013d674e17da..4b23c96290046 100644
--- a/drivers/gpu/drm/xe/xe_gt_mcr.c
+++ b/drivers/gpu/drm/xe/xe_gt_mcr.c
@@ -413,12 +413,6 @@ static void init_steering_sqidi_psmi(struct xe_gt *gt)
gt->steering[SQIDI_PSMI].instance_target = select & 0x1;
}
-static void init_steering_inst0(struct xe_gt *gt)
-{
- gt->steering[INSTANCE0].group_target = 0; /* unused */
- gt->steering[INSTANCE0].instance_target = 0; /* unused */
-}
-
static const struct {
const char *name;
void (*init)(struct xe_gt *gt);
@@ -429,7 +423,7 @@ static const struct {
[DSS] = { "DSS", init_steering_dss },
[OADDRM] = { "OADDRM / GPMXMT", init_steering_oaddrm },
[SQIDI_PSMI] = { "SQIDI_PSMI", init_steering_sqidi_psmi },
- [INSTANCE0] = { "INSTANCE 0", init_steering_inst0 },
+ [INSTANCE0] = { "INSTANCE 0", NULL },
[IMPLICIT_STEERING] = { "IMPLICIT", NULL },
};
@@ -439,25 +433,17 @@ static const struct {
*
* Perform early software only initialization of the MCR lock to allow
* the synchronization on accessing the STEER_SEMAPHORE register and
- * use the xe_gt_mcr_multicast_write() function.
+ * use the xe_gt_mcr_multicast_write() function, plus the minimum
+ * safe MCR registers required for VRAM/CCS probing.
*/
void xe_gt_mcr_init_early(struct xe_gt *gt)
{
+ struct xe_device *xe = gt_to_xe(gt);
+
BUILD_BUG_ON(IMPLICIT_STEERING + 1 != NUM_STEERING_TYPES);
BUILD_BUG_ON(ARRAY_SIZE(xe_steering_types) != NUM_STEERING_TYPES);
spin_lock_init(>->mcr_lock);
-}
-
-/**
- * xe_gt_mcr_init - Normal initialization of the MCR support
- * @gt: GT structure
- *
- * Perform normal initialization of the MCR for all usages.
- */
-void xe_gt_mcr_init(struct xe_gt *gt)
-{
- struct xe_device *xe = gt_to_xe(gt);
if (IS_SRIOV_VF(xe))
return;
@@ -498,10 +484,27 @@ void xe_gt_mcr_init(struct xe_gt *gt)
}
}
+ /* Mark instance 0 as initialised, we need this early for VRAM and CCS probe. */
+ gt->steering[INSTANCE0].initialised = true;
+}
+
+/**
+ * xe_gt_mcr_init - Normal initialization of the MCR support
+ * @gt: GT structure
+ *
+ * Perform normal initialization of the MCR for all usages.
+ */
+void xe_gt_mcr_init(struct xe_gt *gt)
+{
+ if (IS_SRIOV_VF(gt_to_xe(gt)))
+ return;
+
/* Select non-terminated steering target for each type */
- for (int i = 0; i < NUM_STEERING_TYPES; i++)
+ for (int i = 0; i < NUM_STEERING_TYPES; i++) {
+ gt->steering[i].initialised = true;
if (gt->steering[i].ranges && xe_steering_types[i].init)
xe_steering_types[i].init(gt);
+ }
}
/**
@@ -563,6 +566,10 @@ static bool xe_gt_mcr_get_nonterminated_steering(struct xe_gt *gt,
for (int i = 0; gt->steering[type].ranges[i].end > 0; i++) {
if (xe_mmio_in_range(>->mmio, >->steering[type].ranges[i], reg)) {
+ drm_WARN(>_to_xe(gt)->drm, !gt->steering[type].initialised,
+ "Uninitialised usage of MCR register %s/%#x\n",
+ xe_steering_types[type].name, reg.addr);
+
*group = gt->steering[type].group_target;
*instance = gt->steering[type].instance_target;
return true;
diff --git a/drivers/gpu/drm/xe/xe_gt_types.h b/drivers/gpu/drm/xe/xe_gt_types.h
index a287b98ee70b4..4254665366ffe 100644
--- a/drivers/gpu/drm/xe/xe_gt_types.h
+++ b/drivers/gpu/drm/xe/xe_gt_types.h
@@ -375,6 +375,8 @@ struct xe_gt {
u16 group_target;
/** @steering.instance_target: instance to steer accesses to */
u16 instance_target;
+ /** @steering.initialised: Whether this steering range is initialised */
+ bool initialised;
} steering[NUM_STEERING_TYPES];
/**
--
2.45.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 9/9] drm/xe: Split init of xe_gt_init_hwconfig to xe_gt_init and *_early
2024-11-05 12:18 [PATCH 1/9] drm/xe: Remove double pageflip Maarten Lankhorst
` (6 preceding siblings ...)
2024-11-05 12:18 ` [PATCH 8/9] drm/xe: Make it possible to read instance0 MCR registers after xe_gt_mcr_init_early Maarten Lankhorst
@ 2024-11-05 12:18 ` Maarten Lankhorst
2024-11-05 12:52 ` ✗ Fi.CI.BUILD: failure for series starting with [1/9] drm/xe: Remove double pageflip Patchwork
8 siblings, 0 replies; 13+ messages in thread
From: Maarten Lankhorst @ 2024-11-05 12:18 UTC (permalink / raw)
To: intel-xe; +Cc: intel-gfx, Maarten Lankhorst
Now that we added the separate step of initialising GUC in
xe_gt_init_early, it should be ok to initialise the minimum during early
init, and the rest after allocations are allowed.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/xe/xe_device.c | 6 ----
drivers/gpu/drm/xe/xe_gt.c | 66 +++++++++++++++++-----------------
drivers/gpu/drm/xe/xe_gt.h | 1 -
3 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index 5dafd48d5478b..e11acd5475867 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -654,12 +654,6 @@ int xe_device_probe(struct xe_device *xe)
return err;
}
- for_each_gt(gt, xe, id) {
- err = xe_gt_init_hwconfig(gt);
- if (err)
- return err;
- }
-
err = xe_devcoredump_init(xe);
if (err)
return err;
diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index dc6901255dc91..a6154d1bad9f0 100644
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -364,6 +364,21 @@ int xe_gt_record_default_lrcs(struct xe_gt *gt)
return err;
}
+static int gt_init_mcr(struct xe_gt *gt)
+{
+ unsigned int fw_ref;
+
+ fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
+ if (!fw_ref)
+ return -ETIMEDOUT;
+
+ xe_gt_mcr_init_early(gt);
+ xe_pat_init(gt);
+
+ xe_force_wake_put(gt_to_fw(gt), fw_ref);
+ return 0;
+}
+
int xe_gt_init_early(struct xe_gt *gt)
{
int err;
@@ -394,7 +409,11 @@ int xe_gt_init_early(struct xe_gt *gt)
*/
xe_gt_mmio_init(gt);
- return xe_uc_init_noalloc(>->uc);
+ err = xe_uc_init_noalloc(>->uc);
+ if (err)
+ return err;
+
+ return gt_init_mcr(gt);
}
static void dump_pat_on_error(struct xe_gt *gt)
@@ -419,6 +438,18 @@ static int gt_fw_domain_init(struct xe_gt *gt)
goto err_hw_fence_irq;
}
+ err = xe_uc_init(>->uc);
+ if (err)
+ goto err_force_wake;
+
+ err = xe_uc_init_hwconfig(>->uc);
+ if (err)
+ goto err_force_wake;
+
+ xe_gt_topology_init(gt);
+ xe_gt_mcr_init(gt);
+ xe_gt_enable_host_l2_vram(gt);
+
if (!xe_gt_is_media_type(gt)) {
err = xe_ggtt_init(gt_to_tile(gt)->mem.ggtt);
if (err)
@@ -550,39 +581,6 @@ static int all_fw_domain_init(struct xe_gt *gt)
return err;
}
-/*
- * Initialize enough GT to be able to load GuC in order to obtain hwconfig and
- * enable CTB communication.
- */
-int xe_gt_init_hwconfig(struct xe_gt *gt)
-{
- unsigned int fw_ref;
- int err;
-
- fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
- if (!fw_ref)
- return -ETIMEDOUT;
-
- xe_gt_mcr_init_early(gt);
- xe_pat_init(gt);
-
- err = xe_uc_init(>->uc);
- if (err)
- goto out_fw;
-
- err = xe_uc_init_hwconfig(>->uc);
- if (err)
- goto out_fw;
-
- xe_gt_topology_init(gt);
- xe_gt_mcr_init(gt);
- xe_gt_enable_host_l2_vram(gt);
-
-out_fw:
- xe_force_wake_put(gt_to_fw(gt), fw_ref);
- return err;
-}
-
int xe_gt_init(struct xe_gt *gt)
{
int err;
diff --git a/drivers/gpu/drm/xe/xe_gt.h b/drivers/gpu/drm/xe/xe_gt.h
index 82b9b7f82fcab..0c026cc91ffe9 100644
--- a/drivers/gpu/drm/xe/xe_gt.h
+++ b/drivers/gpu/drm/xe/xe_gt.h
@@ -28,7 +28,6 @@ static inline bool xe_fault_inject_gt_reset(void)
}
struct xe_gt *xe_gt_alloc(struct xe_tile *tile);
-int xe_gt_init_hwconfig(struct xe_gt *gt);
int xe_gt_init_early(struct xe_gt *gt);
int xe_gt_init(struct xe_gt *gt);
void xe_gt_mmio_init(struct xe_gt *gt);
--
2.45.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* ✗ Fi.CI.BUILD: failure for series starting with [1/9] drm/xe: Remove double pageflip
2024-11-05 12:18 [PATCH 1/9] drm/xe: Remove double pageflip Maarten Lankhorst
` (7 preceding siblings ...)
2024-11-05 12:18 ` [PATCH 9/9] drm/xe: Split init of xe_gt_init_hwconfig to xe_gt_init and *_early Maarten Lankhorst
@ 2024-11-05 12:52 ` Patchwork
8 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2024-11-05 12:52 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/9] drm/xe: Remove double pageflip
URL : https://patchwork.freedesktop.org/series/140945/
State : failure
== Summary ==
Error: make failed
CALL scripts/checksyscalls.sh
DESCEND objtool
INSTALL libsubcmd_headers
CC [M] drivers/gpu/drm/i915/display/intel_plane_initial.o
drivers/gpu/drm/i915/display/intel_plane_initial.c:17:1: error: parameter names (without types) in function declaration [-Werror]
17 | void intel_plane_initial_vblank_wait(plane);(struct intel_plane *plane)
| ^~~~
drivers/gpu/drm/i915/display/intel_plane_initial.c:17:46: error: expected identifier or ‘(’ before ‘struct’
17 | void intel_plane_initial_vblank_wait(plane);(struct intel_plane *plane)
| ^~~~~~
drivers/gpu/drm/i915/display/intel_plane_initial.c: In function ‘intel_initial_plane_config’:
drivers/gpu/drm/i915/display/intel_plane_initial.c:448:25: error: implicit declaration of function ‘intel_initial_vblank_wait’; did you mean ‘intel_plane_initial_vblank_wait’? [-Werror=implicit-function-declaration]
448 | intel_initial_vblank_wait(crtc);
| ^~~~~~~~~~~~~~~~~~~~~~~~~
| intel_plane_initial_vblank_wait
cc1: all warnings being treated as errors
make[6]: *** [scripts/Makefile.build:229: drivers/gpu/drm/i915/display/intel_plane_initial.o] Error 1
make[5]: *** [scripts/Makefile.build:478: drivers/gpu/drm/i915] Error 2
make[4]: *** [scripts/Makefile.build:478: drivers/gpu/drm] Error 2
make[3]: *** [scripts/Makefile.build:478: drivers/gpu] Error 2
make[2]: *** [scripts/Makefile.build:478: drivers] Error 2
make[1]: *** [/home/kbuild2/kernel/Makefile:1936: .] Error 2
make: *** [Makefile:224: __sub-make] Error 2
Build failed, no error log produced
^ permalink raw reply [flat|nested] 13+ messages in thread