More preparation for multi gt patches
Subsystems (4)
v3 cover More preparation for multi gt patches
Hi,
the first of the two patches concludes the first stage of refactoring which makes the use of intel_gt on the different subsystem. It's taken from Matt's series and it has alread been reviewed. The patch has just been replaced before any multitile patches and I think it can be already pushed.
The second patch is on more step to prepare for the coming multi tile. It's very invasive but it's an effort that can be paid once and for all in order to have a cleaner way to refer to GTs.
Andi
Changelog:
==========
v2 -> v3: https://patchwork.freedesktop.org/series/97020/
- sed -i ... took too much freedom and changed more than it was supposed to.
- fix a compile error which did not appear in my local build
v1 -> v2: https://patchwork.freedesktop.org/series/97020/
- patch 2: do not use anymore the reference i915->gt but use to_root_gt(), coming from Matt Roper's patch.
- fix some comments from Chris.
Andi Shyti (1):
drm/i915: Use to_root_gt() to refer to the root tile
Michał Winiarski (1):
drm/i915: Store backpointer to GT in uncore
.../gpu/drm/i915/display/intel_atomic_plane.c | 4 +- drivers/gpu/drm/i915/display/intel_display.c | 23 +++++--- drivers/gpu/drm/i915/display/intel_dpt.c | 2 +- drivers/gpu/drm/i915/display/intel_overlay.c | 2 +- .../drm/i915/display/skl_universal_plane.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_context.c | 22 ++++---- drivers/gpu/drm/i915/gem/i915_gem_create.c | 2 +- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_pm.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 3 +- drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 12 ++-- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- .../gpu/drm/i915/gem/selftests/huge_pages.c | 4 +- .../i915/gem/selftests/i915_gem_client_blt.c | 2 +- .../drm/i915/gem/selftests/i915_gem_context.c | 10 ++-- .../drm/i915/gem/selftests/i915_gem_migrate.c | 2 +- .../drm/i915/gem/selftests/i915_gem_mman.c | 28 +++++----- drivers/gpu/drm/i915/gt/intel_engine_user.c | 2 +- drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +- drivers/gpu/drm/i915/gt/intel_rps.c | 12 ++-- drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 +- drivers/gpu/drm/i915/gt/mock_engine.c | 10 ++-- drivers/gpu/drm/i915/gt/selftest_context.c | 2 +- drivers/gpu/drm/i915/gt/selftest_engine.c | 2 +- drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 4 +- .../drm/i915/gt/selftest_engine_heartbeat.c | 4 +- drivers/gpu/drm/i915/gt/selftest_execlists.c | 6 +- drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 8 +-- drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- drivers/gpu/drm/i915/gt/selftest_lrc.c | 2 +- drivers/gpu/drm/i915/gt/selftest_migrate.c | 4 +- drivers/gpu/drm/i915/gt/selftest_mocs.c | 2 +- drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +- .../drm/i915/gt/selftest_ring_submission.c | 4 +- drivers/gpu/drm/i915/gt/selftest_slpc.c | 6 +- drivers/gpu/drm/i915/gt/selftest_timeline.c | 6 +- .../gpu/drm/i915/gt/selftest_workarounds.c | 4 +- drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 +- drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 2 +- .../drm/i915/gt/uc/selftest_guc_multi_lrc.c | 2 +- drivers/gpu/drm/i915/gvt/gvt.c | 2 +- drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 38 ++++++------- drivers/gpu/drm/i915/i915_debugfs_params.c | 4 +- drivers/gpu/drm/i915/i915_driver.c | 30 +++++----- drivers/gpu/drm/i915/i915_drv.h | 9 ++- drivers/gpu/drm/i915/i915_gem.c | 16 +++--- drivers/gpu/drm/i915/i915_getparam.c | 10 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- drivers/gpu/drm/i915/i915_irq.c | 56 +++++++++---------- drivers/gpu/drm/i915/i915_perf.c | 2 +- drivers/gpu/drm/i915/i915_pmu.c | 14 ++--- drivers/gpu/drm/i915/i915_query.c | 2 +- drivers/gpu/drm/i915/i915_sysfs.c | 22 ++++---- drivers/gpu/drm/i915/intel_gvt.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 9 +-- drivers/gpu/drm/i915/intel_uncore.h | 3 +- drivers/gpu/drm/i915/intel_wopcm.c | 2 +- drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 6 +- drivers/gpu/drm/i915/selftests/i915_active.c | 2 +- drivers/gpu/drm/i915/selftests/i915_gem.c | 2 +- .../gpu/drm/i915/selftests/i915_gem_evict.c | 6 +- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +- drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- drivers/gpu/drm/i915/selftests/i915_request.c | 10 ++-- .../gpu/drm/i915/selftests/i915_selftest.c | 4 +- .../gpu/drm/i915/selftests/igt_flush_test.c | 2 +- .../gpu/drm/i915/selftests/igt_live_test.c | 4 +- .../drm/i915/selftests/intel_memory_region.c | 4 +- drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 +- .../gpu/drm/i915/selftests/mock_gem_device.c | 31 +++++----- drivers/gpu/drm/i915/selftests/mock_gtt.c | 6 +- drivers/gpu/drm/i915/selftests/mock_uncore.c | 2 +- 76 files changed, 283 insertions(+), 264 deletions(-)
Signature · 1 line
2.33.1
PATCH v3 1/2 drm/i915: Store backpointer to GT in uncore
From: Michał Winiarski <[email protected]>
We now support a per-gt uncore, yet we're not able to infer which GT we're operating upon. Let's store a backpointer for now.
--- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 9 +++++---- drivers/gpu/drm/i915/intel_uncore.h | 3 ++- drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 +-- drivers/gpu/drm/i915/selftests/mock_uncore.c | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/i915_driver.c +1 -1
@@ -316,7 +316,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)intel_step_init (dev_priv);intel_uncore_mmio_debug_init_early (&dev_priv->mmio_debug); -intel_uncore_init_early (&dev_priv->uncore, dev_priv); +intel_uncore_init_early (&dev_priv->uncore, &dev_priv->gt);spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->gpu_error.lock);
drivers/gpu/drm/i915/intel_uncore.c +5 -4
@@ -2061,12 +2061,13 @@ void intel_uncore_cleanup_mmio(struct intel_uncore *uncore) }void intel_uncore_init_early (struct intel_uncore *uncore, -struct drm_i915_private *i915) +struct intel_gt *gt) {spin_lock_init (&uncore->lock); - uncore->i915 = i915; - uncore->rpm = &i915->runtime_pm; - uncore->debug = &i915->mmio_debug; + uncore->i915 = gt->i915; + uncore->gt = gt; + uncore->rpm = >->i915->runtime_pm; + uncore->debug = >->i915->mmio_debug; }static void uncore_raw_init (struct intel_uncore *uncore)
drivers/gpu/drm/i915/intel_uncore.h +2 -1
@@ -129,6 +129,7 @@ struct intel_uncore {void __iomem *regs;struct drm_i915_private *i915; +struct intel_gt *gt;struct intel_runtime_pm *rpm;spinlock_t lock;/** lock is also taken in irq contexts. */
@@ -217,7 +218,7 @@ u32 intel_uncore_read_with_mcr_steering(struct intel_uncore *uncore,void intel_uncore_mmio_debug_init_early (struct intel_uncore_mmio_debug *mmio_debug);void intel_uncore_init_early (struct intel_uncore *uncore, -struct drm_i915_private *i915); +struct intel_gt *gt);int intel_uncore_setup_mmio (struct intel_uncore *uncore);int intel_uncore_init_mmio (struct intel_uncore *uncore); void intel_uncore_prune_engine_fw_domains(struct intel_uncore *uncore,
drivers/gpu/drm/i915/selftests/mock_gem_device.c +1 -2
@@ -175,12 +175,11 @@ struct drm_i915_private *mock_gem_device(void)mkwrite_device_info (i915)->memory_regions =REGION_SMEM ;intel_memory_regions_hw_probe (i915); -mock_uncore_init (&i915->uncore, i915); -spin_lock_init (&i915->gpu_error.lock);i915_gem_init__mm (i915);intel_gt_init_early (&i915->gt, i915); +mock_uncore_init (&i915->uncore, i915);atomic_inc (&i915->gt.wakeref.count);/* disable; no hw support */ i915->gt.awake = -ENODEV ;
drivers/gpu/drm/i915/selftests/mock_uncore.c +1 -1
@@ -42,7 +42,7 @@ __nop_read(64)void mock_uncore_init (struct intel_uncore *uncore,struct drm_i915_private *i915) { -intel_uncore_init_early (uncore, i915); +intel_uncore_init_early (uncore, &i915->gt);ASSIGN_RAW_WRITE_MMIO_VFUNCS (uncore, nop);ASSIGN_RAW_READ_MMIO_VFUNCS (uncore, nop);
Signature · 1 line
2.33.1
PATCH v3 2/2 drm/i915: Use to_root_gt() to refer to the root tile
In reply to Andi ShytiStarting from a patch from Matt to_root_gt() returns the reference to the root tile in order to abstract the root tile from th callers.
Being the root tile identified as tile '0', embed the id in the name so that i915->gt becomes i915->gt0.
The renaming has been mostly done with the following command and some manual fixes.
sed -i -e sed -i 's/\&i915\->gt\./\&to_root_gt(i915)\->/g' \ -e sed -i 's/\&dev_priv\->gt\./\&to_root_gt(dev_priv)\->/g' \ -e 's/\&dev_priv\->gt/to_root_gt(dev_priv)/g' \ -e 's/\&i915\->gt/to_root_gt(i915)/g' \ -e 's/dev_priv\->gt\./to_root_gt(dev_priv)\->/g' \ -e 's/i915\->gt\./to_root_gt(i915)\->/g' \ `find drivers/gpu/drm/i915/ -name *.[ch]`
Two small changes have been added to this commit:
1. intel_reset_gpu() in intel_display.c retreives the gt from
to_scanout_gt()
2. in set_scheduler_caps() the gt is taken from the engine and
not from i915.--- .../gpu/drm/i915/display/intel_atomic_plane.c | 4 +- drivers/gpu/drm/i915/display/intel_display.c | 23 +++++--- drivers/gpu/drm/i915/display/intel_dpt.c | 2 +- drivers/gpu/drm/i915/display/intel_overlay.c | 2 +- .../drm/i915/display/skl_universal_plane.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_context.c | 22 ++++---- drivers/gpu/drm/i915/gem/i915_gem_create.c | 2 +- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_pm.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 3 +- drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 12 ++-- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- .../gpu/drm/i915/gem/selftests/huge_pages.c | 4 +- .../i915/gem/selftests/i915_gem_client_blt.c | 2 +- .../drm/i915/gem/selftests/i915_gem_context.c | 10 ++-- .../drm/i915/gem/selftests/i915_gem_migrate.c | 2 +- .../drm/i915/gem/selftests/i915_gem_mman.c | 28 +++++----- drivers/gpu/drm/i915/gt/intel_engine_user.c | 2 +- drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +- drivers/gpu/drm/i915/gt/intel_rps.c | 12 ++-- drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 +- drivers/gpu/drm/i915/gt/mock_engine.c | 10 ++-- drivers/gpu/drm/i915/gt/selftest_context.c | 2 +- drivers/gpu/drm/i915/gt/selftest_engine.c | 2 +- drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 4 +- .../drm/i915/gt/selftest_engine_heartbeat.c | 4 +- drivers/gpu/drm/i915/gt/selftest_execlists.c | 6 +- drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 8 +-- drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- drivers/gpu/drm/i915/gt/selftest_lrc.c | 2 +- drivers/gpu/drm/i915/gt/selftest_migrate.c | 4 +- drivers/gpu/drm/i915/gt/selftest_mocs.c | 2 +- drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +- .../drm/i915/gt/selftest_ring_submission.c | 4 +- drivers/gpu/drm/i915/gt/selftest_slpc.c | 6 +- drivers/gpu/drm/i915/gt/selftest_timeline.c | 6 +- .../gpu/drm/i915/gt/selftest_workarounds.c | 4 +- drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 +- drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 2 +- .../drm/i915/gt/uc/selftest_guc_multi_lrc.c | 2 +- drivers/gpu/drm/i915/gvt/gvt.c | 2 +- drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 38 ++++++------- drivers/gpu/drm/i915/i915_debugfs_params.c | 4 +- drivers/gpu/drm/i915/i915_driver.c | 30 +++++----- drivers/gpu/drm/i915/i915_drv.h | 9 ++- drivers/gpu/drm/i915/i915_gem.c | 16 +++--- drivers/gpu/drm/i915/i915_getparam.c | 10 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- drivers/gpu/drm/i915/i915_irq.c | 56 +++++++++---------- drivers/gpu/drm/i915/i915_perf.c | 2 +- drivers/gpu/drm/i915/i915_pmu.c | 14 ++--- drivers/gpu/drm/i915/i915_query.c | 2 +- drivers/gpu/drm/i915/i915_sysfs.c | 22 ++++---- drivers/gpu/drm/i915/intel_gvt.c | 2 +- drivers/gpu/drm/i915/intel_wopcm.c | 2 +- drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 6 +- drivers/gpu/drm/i915/selftests/i915_active.c | 2 +- drivers/gpu/drm/i915/selftests/i915_gem.c | 2 +- .../gpu/drm/i915/selftests/i915_gem_evict.c | 6 +- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +- drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- drivers/gpu/drm/i915/selftests/i915_request.c | 10 ++-- .../gpu/drm/i915/selftests/i915_selftest.c | 4 +- .../gpu/drm/i915/selftests/igt_flush_test.c | 2 +- .../gpu/drm/i915/selftests/igt_live_test.c | 4 +- .../drm/i915/selftests/intel_memory_region.c | 4 +- drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 +- .../gpu/drm/i915/selftests/mock_gem_device.c | 28 +++++----- drivers/gpu/drm/i915/selftests/mock_gtt.c | 6 +- drivers/gpu/drm/i915/selftests/mock_uncore.c | 2 +- 74 files changed, 275 insertions(+), 257 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic_plane.c +2 -2
@@ -818,7 +818,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane,* maximum clocks following a vblank miss (see do_rps_boost()). */ if (!state->rps_interactive) { -intel_rps_mark_interactive (&dev_priv->gt.rps, true); +intel_rps_mark_interactive (&to_root_gt (dev_priv)->rps, true); state->rps_interactive = true; }
@@ -852,7 +852,7 @@ intel_cleanup_plane_fb(struct drm_plane *plane,return ;if (state->rps_interactive) { -intel_rps_mark_interactive (&dev_priv->gt.rps, false); +intel_rps_mark_interactive (&to_root_gt (dev_priv)->rps, false); state->rps_interactive = false; }
drivers/gpu/drm/i915/display/intel_display.c +14 -9
@@ -124,6 +124,11 @@ static void ilk_pfit_enable(const struct intel_crtc_state *crtc_state);static void intel_modeset_setup_hw_state (struct drm_device *dev,struct drm_modeset_acquire_ctx *ctx); +static struct intel_gt *to_scanout_gt (struct drm_i915_private *i915) +{ +return i915->ggtt.vm.gt; +} +/** * intel_update_watermarks - update FIFO watermark values based on current modes * @dev_priv: i915 device
@@ -838,7 +843,7 @@ __intel_display_resume(struct drm_device *dev,static bool gpu_reset_clobbers_display (struct drm_i915_private *dev_priv) {return (INTEL_INFO (dev_priv)->gpu_reset_clobbers_display && -intel_has_gpu_reset (&dev_priv->gt)); +intel_has_gpu_reset (to_scanout_gt (dev_priv))); }void intel_display_prepare_reset (struct drm_i915_private *dev_priv)
@@ -857,14 +862,14 @@ void intel_display_prepare_reset(struct drm_i915_private *dev_priv)return ;/* We have a modeset vs reset deadlock, defensively unbreak it. */ -set_bit (I915_RESET_MODESET , &dev_priv->gt.reset.flags); +set_bit (I915_RESET_MODESET , &to_root_gt (dev_priv)->reset.flags);smp_mb__after_atomic (); -wake_up_bit (&dev_priv->gt.reset.flags,I915_RESET_MODESET ); +wake_up_bit (&to_root_gt (dev_priv)->reset.flags,I915_RESET_MODESET );if (atomic_read (&dev_priv->gpu_error.pending_fb_pin)) {drm_dbg_kms (&dev_priv->drm,"Modeset potentially stuck, unbreaking through wedging\n" ); -intel_gt_set_wedged (&dev_priv->gt); +intel_gt_set_wedged (to_root_gt (dev_priv)); }/*
@@ -915,7 +920,7 @@ void intel_display_finish_reset(struct drm_i915_private *dev_priv)return ;/* reset doesn't touch the display */ -if (!test_bit (I915_RESET_MODESET , &dev_priv->gt.reset.flags)) +if (!test_bit (I915_RESET_MODESET , &to_root_gt (dev_priv)->reset.flags))return ; state =fetch_and_zero (&dev_priv->modeset_restore_state);
@@ -953,7 +958,7 @@ void intel_display_finish_reset(struct drm_i915_private *dev_priv)drm_modeset_acquire_fini (ctx);mutex_unlock (&dev->mode_config.mutex); -clear_bit_unlock (I915_RESET_MODESET , &dev_priv->gt.reset.flags); +clear_bit_unlock (I915_RESET_MODESET , &to_root_gt (dev_priv)->reset.flags); }static void icl_set_pipe_chicken (const struct intel_crtc_state *crtc_state)
@@ -8550,19 +8555,19 @@ static void intel_atomic_commit_fence_wait(struct intel_atomic_state *intel_statfor (;;) {prepare_to_wait (&intel_state->commit_ready.wait, &wait_fence,TASK_UNINTERRUPTIBLE ); -prepare_to_wait (bit_waitqueue (&dev_priv->gt.reset.flags, +prepare_to_wait (bit_waitqueue (&to_root_gt (dev_priv)->reset.flags,I915_RESET_MODESET ), &wait_reset,TASK_UNINTERRUPTIBLE );if (i915_sw_fence_done (&intel_state->commit_ready) || -test_bit (I915_RESET_MODESET , &dev_priv->gt.reset.flags)) +test_bit (I915_RESET_MODESET , &to_root_gt (dev_priv)->reset.flags))break ;schedule (); }finish_wait (&intel_state->commit_ready.wait, &wait_fence); -finish_wait (bit_waitqueue (&dev_priv->gt.reset.flags, +finish_wait (bit_waitqueue (&to_root_gt (dev_priv)->reset.flags,I915_RESET_MODESET ), &wait_reset); }
drivers/gpu/drm/i915/display/intel_dpt.c +1 -1
@@ -258,7 +258,7 @@ intel_dpt_create(struct intel_framebuffer *fb) vm = &dpt->vm; - vm->gt = &i915->gt; + vm->gt =to_root_gt (i915); vm->i915 = i915; vm->dma = i915->drm.dev; vm->total = (size /sizeof (gen8_pte_t)) *I915_GTT_PAGE_SIZE ;
drivers/gpu/drm/i915/display/intel_overlay.c +1 -1
@@ -1382,7 +1382,7 @@ void intel_overlay_setup(struct drm_i915_private *dev_priv)if (!HAS_OVERLAY (dev_priv))return ; - engine = dev_priv->gt.engine[RCS0 ]; + engine =to_root_gt (dev_priv)->engine[RCS0 ];if (!engine || !engine->kernel_context)return ;
drivers/gpu/drm/i915/display/skl_universal_plane.c +1 -1
@@ -1727,7 +1727,7 @@ static bool bo_has_valid_encryption(struct drm_i915_gem_object *obj) {struct drm_i915_private *i915 =to_i915 (obj->base.dev); -return intel_pxp_key_check (&i915->gt.pxp, obj, false) ==0 ; +return intel_pxp_key_check (&to_root_gt (i915)->pxp, obj, false) ==0 ; }static bool pxp_is_borked (struct drm_i915_gem_object *obj)
drivers/gpu/drm/i915/gem/i915_gem_context.c +11 -11
@@ -237,7 +237,7 @@ static int proto_context_set_persistence(struct drm_i915_private *i915,* colateral damage, and we should not pretend we can by * exposing the interface. */ -if (!intel_has_reset_engine (&i915->gt)) +if (!intel_has_reset_engine (to_root_gt (i915)))return -ENODEV ; pc->user_flags &= ~BIT (UCONTEXT_PERSISTENCE );
@@ -254,7 +254,7 @@ static int proto_context_set_protected(struct drm_i915_private *i915,if (!protected) { pc->uses_protected_content = false; - }else if (!intel_pxp_is_enabled (&i915->gt.pxp)) { + }else if (!intel_pxp_is_enabled (&to_root_gt (i915)->pxp)) { ret = -ENODEV ; }else if ((pc->user_flags &BIT (UCONTEXT_RECOVERABLE )) || !(pc->user_flags &BIT (UCONTEXT_BANNABLE ))) {
@@ -268,8 +268,8 @@ static int proto_context_set_protected(struct drm_i915_private *i915,*/ pc->pxp_wakeref =intel_runtime_pm_get (&i915->runtime_pm); -if (!intel_pxp_is_active (&i915->gt.pxp)) - ret =intel_pxp_start (&i915->gt.pxp); +if (!intel_pxp_is_active (&to_root_gt (i915)->pxp)) + ret =intel_pxp_start (&to_root_gt (i915)->pxp); }return ret;
@@ -571,7 +571,7 @@ set_proto_ctx_engines_parallel_submit(struct i915_user_extension __user *base,intel_engine_mask_t prev_mask;/* FIXME: This is NIY for execlists */ -if (!(intel_uc_uses_guc_submission (&i915->gt.uc))) +if (!(intel_uc_uses_guc_submission (&to_root_gt (i915)->uc)))return -ENODEV ;if (get_user (slot, &ext->engine_index))
@@ -833,7 +833,7 @@ static int set_proto_ctx_sseu(struct drm_i915_file_private *fpriv, sseu = &pc->legacy_rcs_sseu; } - ret =i915_gem_user_to_context_sseu (&i915->gt, &user_sseu, sseu); + ret =i915_gem_user_to_context_sseu (to_root_gt (i915), &user_sseu, sseu);if (ret)return ret;
@@ -1044,7 +1044,7 @@ static struct i915_gem_engines *alloc_engines(unsigned int count)static struct i915_gem_engines *default_engines (struct i915_gem_context *ctx,struct intel_sseu rcs_sseu) { -const struct intel_gt *gt = &ctx->i915->gt; +const struct intel_gt *gt =to_root_gt (ctx->i915);struct intel_engine_cs *engine;struct i915_gem_engines *e, *err;enum intel_engine_id id;
@@ -1521,7 +1521,7 @@ static int __context_set_persistence(struct i915_gem_context *ctx, bool state)* colateral damage, and we should not pretend we can by * exposing the interface. */ -if (!intel_has_reset_engine (&ctx->i915->gt)) +if (!intel_has_reset_engine (to_root_gt (ctx->i915)))return -ENODEV ;i915_gem_context_clear_persistence (ctx);
@@ -1559,7 +1559,7 @@ i915_gem_create_context(struct drm_i915_private *i915, }else if (HAS_FULL_PPGTT (i915)) {struct i915_ppgtt *ppgtt; - ppgtt =i915_ppgtt_create (&i915->gt,0 ); + ppgtt =i915_ppgtt_create (to_root_gt (i915),0 );if (IS_ERR (ppgtt)) {drm_dbg (&i915->drm,"PPGTT setup failed (%ld)\n" ,PTR_ERR (ppgtt));
@@ -1742,7 +1742,7 @@ int i915_gem_vm_create_ioctl(struct drm_device *dev, void *data,if (args->flags)return -EINVAL ; - ppgtt =i915_ppgtt_create (&i915->gt,0 ); + ppgtt =i915_ppgtt_create (to_root_gt (i915),0 );if (IS_ERR (ppgtt))return PTR_ERR (ppgtt);
@@ -2194,7 +2194,7 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,if (args->flags &I915_CONTEXT_CREATE_FLAGS_UNKNOWN )return -EINVAL ; - ret =intel_gt_terminally_wedged (&i915->gt); + ret =intel_gt_terminally_wedged (to_root_gt (i915));if (ret)return ret;
drivers/gpu/drm/i915/gem/i915_gem_create.c +1 -1
@@ -379,7 +379,7 @@ static int ext_set_protected(struct i915_user_extension __user *base, void *dataif (ext.flags)return -EINVAL ; -if (!intel_pxp_is_enabled (&ext_data->i915->gt.pxp)) +if (!intel_pxp_is_enabled (&to_root_gt (ext_data->i915)->pxp))return -ENODEV ; ext_data->flags |=I915_BO_PROTECTED ;
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +2 -2
@@ -2287,9 +2287,9 @@ static int eb_submit(struct i915_execbuffer *eb)return err; } -static int num_vcs_engines (const struct drm_i915_private *i915) +static int num_vcs_engines (struct drm_i915_private *i915) { -return hweight_long (VDBOX_MASK (&i915->gt)); +return hweight_long (VDBOX_MASK (to_root_gt (i915))); }/*
drivers/gpu/drm/i915/gem/i915_gem_mman.c +1 -1
@@ -645,7 +645,7 @@ mmap_offset_attach(struct drm_i915_gem_object *obj, goto insert;/* Attempt to reap some mmap space from dead objects */ - err =intel_gt_retire_requests_timeout (&i915->gt,MAX_SCHEDULE_TIMEOUT , + err =intel_gt_retire_requests_timeout (to_root_gt (i915),MAX_SCHEDULE_TIMEOUT ,NULL );if (err) goto err;
drivers/gpu/drm/i915/gem/i915_gem_phys.c +4 -2
@@ -19,6 +19,7 @@static int i915_gem_object_get_pages_phys (struct drm_i915_gem_object *obj) {struct address_space *mapping = obj->base.filp->f_mapping; +struct drm_i915_private *i915 =to_i915 (obj->base.dev);struct scatterlist *sg;struct sg_table *st;dma_addr_t dma;
@@ -73,7 +74,7 @@ static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj) dst +=PAGE_SIZE ; } -intel_gt_chipset_flush (&to_i915 (obj->base.dev)->gt); +intel_gt_chipset_flush (to_root_gt (i915));/* We're no longer struct page backed */ obj->mem_flags &= ~I915_BO_FLAG_STRUCT_PAGE ;
@@ -140,6 +141,7 @@ int i915_gem_object_pwrite_phys(struct drm_i915_gem_object *obj, {void *vaddr =sg_page (obj->mm.pages->sgl) + args->offset;char __user *user_data =u64_to_user_ptr (args->data_ptr); +struct drm_i915_private *i915 =to_i915 (obj->base.dev);int err; err = i915_gem_object_wait(obj,
@@ -159,7 +161,7 @@ int i915_gem_object_pwrite_phys(struct drm_i915_gem_object *obj,return -EFAULT ;drm_clflush_virt_range (vaddr, args->size); -intel_gt_chipset_flush (&to_i915 (obj->base.dev)->gt); +intel_gt_chipset_flush (to_root_gt (i915));i915_gem_object_flush_frontbuffer (obj,ORIGIN_CPU );return 0 ;
drivers/gpu/drm/i915/gem/i915_gem_pm.c +3 -3
@@ -35,7 +35,7 @@ void i915_gem_suspend(struct drm_i915_private *i915)* state. Fortunately, the kernel_context is disposable and we do * not rely on its state. */ -intel_gt_suspend_prepare (&i915->gt); +intel_gt_suspend_prepare (to_root_gt (i915));i915_gem_drain_freed_objects (i915); }
@@ -153,7 +153,7 @@ void i915_gem_suspend_late(struct drm_i915_private *i915)* machine in an unusable condition. */ -intel_gt_suspend_late (&i915->gt); +intel_gt_suspend_late (to_root_gt (i915));spin_lock_irqsave (&i915->mm.obj_lock, flags);for (phase = phases; *phase; phase++) {
@@ -223,7 +223,7 @@ void i915_gem_resume(struct drm_i915_private *i915)* guarantee that the context image is complete. So let's just reset * it and start again. */ -intel_gt_resume (&i915->gt); +intel_gt_resume (to_root_gt (i915)); ret =lmem_restore (i915,I915_TTM_BACKUP_ALLOW_GPU );GEM_WARN_ON (ret);
drivers/gpu/drm/i915/gem/i915_gem_shrinker.c +1 -1
@@ -153,7 +153,7 @@ i915_gem_shrink(struct i915_gem_ww_ctx *ww,*/ if (shrink &I915_SHRINK_ACTIVE )/* Retire requests to unpin all idle contexts */ -intel_gt_retire_requests (&i915->gt); +intel_gt_retire_requests (to_root_gt (i915));/* * As we may completely rewrite the (un)bound list whilst unbinding
drivers/gpu/drm/i915/gem/i915_gem_throttle.c +2 -1
@@ -38,12 +38,13 @@ i915_gem_throttle_ioctl(struct drm_device *dev, void *data, {const unsigned long recent_enough = jiffies -DRM_I915_THROTTLE_JIFFIES ;struct drm_i915_file_private *file_priv = file->driver_priv; +struct drm_i915_private *i915 =to_i915 (dev);struct i915_gem_context *ctx;unsigned long idx;long ret;/* ABI: return -EIO if already wedged */ - ret =intel_gt_terminally_wedged (&to_i915 (dev)->gt); + ret =intel_gt_terminally_wedged (to_root_gt (i915));if (ret)return ret;
drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c +6 -6
@@ -166,7 +166,7 @@ static struct dma_fence *i915_ttm_accel_move(struct ttm_buffer_object *bo,enum i915_cache_level src_level, dst_level;int ret; -if (!i915->gt.migrate.context ||intel_gt_is_wedged (&i915->gt)) +if (!to_root_gt (i915)->migrate.context ||intel_gt_is_wedged (to_root_gt (i915)))return ERR_PTR (-EINVAL );/* With fail_gpu_migration, we always perform a GPU clear. */
@@ -179,8 +179,8 @@ static struct dma_fence *i915_ttm_accel_move(struct ttm_buffer_object *bo, !I915_SELFTEST_ONLY(fail_gpu_migration))return ERR_PTR (-EINVAL ); -intel_engine_pm_get (i915->gt.migrate.context->engine); - ret =intel_context_migrate_clear (i915->gt.migrate.context,NULL , +intel_engine_pm_get (to_root_gt (i915)->migrate.context->engine); + ret =intel_context_migrate_clear (to_root_gt (i915)->migrate.context,NULL , dst_st->sgl, dst_level,i915_ttm_gtt_binds_lmem (dst_mem),0 , &rq);
@@ -192,8 +192,8 @@ static struct dma_fence *i915_ttm_accel_move(struct ttm_buffer_object *bo,return ERR_CAST (src_rsgt); src_level =i915_ttm_cache_level (i915, bo->resource, src_ttm); -intel_engine_pm_get (i915->gt.migrate.context->engine); - ret = intel_context_migrate_copy(i915->gt.migrate.context, +intel_engine_pm_get (to_root_gt (i915)->migrate.context->engine); + ret = intel_context_migrate_copy(to_root_gt(i915)->migrate.context, NULL, src_rsgt->table.sgl, src_level, i915_ttm_gtt_binds_lmem(bo->resource),
@@ -204,7 +204,7 @@ static struct dma_fence *i915_ttm_accel_move(struct ttm_buffer_object *bo,i915_refct_sgt_put (src_rsgt); } -intel_engine_pm_put (i915->gt.migrate.context->engine); +intel_engine_pm_put (to_root_gt (i915)->migrate.context->engine);if (ret && rq) {i915_request_wait (rq,0 ,MAX_SCHEDULE_TIMEOUT );
drivers/gpu/drm/i915/gem/i915_gem_userptr.c +1 -1
@@ -529,7 +529,7 @@ i915_gem_userptr_ioctl(struct drm_device *dev,* On almost all of the older hw, we cannot tell the GPU that * a page is readonly. */ -if (!dev_priv->gt.vm->has_read_only) +if (!to_root_gt (dev_priv)->vm->has_read_only)return -ENODEV ; }
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +2 -2
@@ -1705,7 +1705,7 @@ int i915_gem_huge_page_mock_selftests(void)mkwrite_device_info (dev_priv)->ppgtt_type =INTEL_PPGTT_FULL ;mkwrite_device_info (dev_priv)->ppgtt_size =48 ; - ppgtt =i915_ppgtt_create (&dev_priv->gt,0 ); + ppgtt =i915_ppgtt_create (to_root_gt (dev_priv),0 );if (IS_ERR (ppgtt)) { err =PTR_ERR (ppgtt); goto out_unlock;
@@ -1747,7 +1747,7 @@ int i915_gem_huge_page_live_selftests(struct drm_i915_private *i915)return 0 ; } -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ;return i915_live_subtests (tests, i915);
drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c +1 -1
@@ -592,7 +592,7 @@ int i915_gem_client_blt_live_selftests(struct drm_i915_private *i915) SUBTEST(igt_client_tiled_blits), }; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ;return i915_live_subtests (tests, i915);
drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c +5 -5
@@ -90,7 +90,7 @@ static int live_nop_switch(void *arg) }if (i915_request_wait (rq,0 ,HZ ) <0 ) {pr_err ("Failed to populated %d contexts\n" , nctx); -intel_gt_set_wedged (&i915->gt); +intel_gt_set_wedged (to_root_gt (i915));i915_request_put (rq); err = -EIO ; goto out_file;
@@ -146,7 +146,7 @@ static int live_nop_switch(void *arg)if (i915_request_wait (rq,0 ,HZ /5 ) <0 ) {pr_err ("Switching between %ld contexts timed out\n" , prime); -intel_gt_set_wedged (&i915->gt); +intel_gt_set_wedged (to_root_gt (i915));i915_request_put (rq);break ; }
@@ -1223,7 +1223,7 @@ __igt_ctx_sseu(struct drm_i915_private *i915,return 0 ;if (flags &TEST_RESET ) -igt_global_reset_lock (&i915->gt); +igt_global_reset_lock (to_root_gt (i915)); obj =i915_gem_object_create_internal (i915,PAGE_SIZE );if (IS_ERR (obj)) {
@@ -1306,7 +1306,7 @@ __igt_ctx_sseu(struct drm_i915_private *i915, out_unlock:if (flags &TEST_RESET ) -igt_global_reset_unlock (&i915->gt); +igt_global_reset_unlock (to_root_gt (i915));if (ret)pr_err ("%s: Failed with %d!\n" , name, ret);
@@ -1877,7 +1877,7 @@ int i915_gem_context_live_selftests(struct drm_i915_private *i915) SUBTEST(igt_vm_isolation), }; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ;return i915_live_subtests (tests, i915);
drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c +1 -1
@@ -261,5 +261,5 @@ int i915_gem_migrate_live_selftests(struct drm_i915_private *i915)if (!HAS_LMEM (i915))return 0 ; -return intel_gt_live_subtests (tests, &i915->gt); +return intel_gt_live_subtests (tests,to_root_gt (i915)); }
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +15 -13
@@ -84,6 +84,7 @@ static int check_partial_mapping(struct drm_i915_gem_object *obj, struct rnd_state *prng) {const unsigned long npages = obj->base.size /PAGE_SIZE ; +struct drm_i915_private *i915 =to_i915 (obj->base.dev);struct i915_ggtt_view view;struct i915_vma *vma;unsigned long page;
@@ -141,7 +142,7 @@ static int check_partial_mapping(struct drm_i915_gem_object *obj,if (offset >= obj->base.size) goto out; -intel_gt_flush_ggtt_writes (&to_i915 (obj->base.dev)->gt); +intel_gt_flush_ggtt_writes (to_root_gt (i915)); p =i915_gem_object_get_page (obj, offset >>PAGE_SHIFT ); cpu =kmap (p) +offset_in_page (offset);
@@ -173,8 +174,9 @@ static int check_partial_mappings(struct drm_i915_gem_object *obj, const struct tile *tile, unsigned long end_time) { -const unsigned int nreal = obj->scratch /PAGE_SIZE ;const unsigned long npages = obj->base.size /PAGE_SIZE ; +struct drm_i915_private *i915 =to_i915 (obj->base.dev); +const unsigned int nreal = obj->scratch /PAGE_SIZE ;struct i915_vma *vma;unsigned long page;int err;
@@ -234,7 +236,7 @@ static int check_partial_mappings(struct drm_i915_gem_object *obj,if (offset >= obj->base.size)continue ; -intel_gt_flush_ggtt_writes (&to_i915 (obj->base.dev)->gt); +intel_gt_flush_ggtt_writes (to_root_gt (i915)); p =i915_gem_object_get_page (obj, offset >>PAGE_SHIFT ); cpu =kmap (p) +offset_in_page (offset);
@@ -616,14 +618,14 @@ static bool assert_mmap_offset(struct drm_i915_private *i915,static void disable_retire_worker (struct drm_i915_private *i915) {i915_gem_driver_unregister__shrinker (i915); -intel_gt_pm_get (&i915->gt); -cancel_delayed_work_sync (&i915->gt.requests.retire_work); +intel_gt_pm_get (to_root_gt (i915)); +cancel_delayed_work_sync (&to_root_gt (i915)->requests.retire_work); }static void restore_retire_worker (struct drm_i915_private *i915) {igt_flush_test (i915); -intel_gt_pm_put (&i915->gt); +intel_gt_pm_put (to_root_gt (i915));i915_gem_driver_register__shrinker (i915); }
@@ -651,8 +653,8 @@ static int igt_mmap_offset_exhaustion(void *arg)/* Disable background reaper */ disable_retire_worker (i915); -GEM_BUG_ON (!i915->gt.awake); -intel_gt_retire_requests (&i915->gt); +GEM_BUG_ON (!to_root_gt (i915)->awake); +intel_gt_retire_requests (to_root_gt (i915));i915_gem_drain_freed_objects (i915);/* Trim the device mmap space to only a page */
@@ -728,7 +730,7 @@ static int igt_mmap_offset_exhaustion(void *arg)/* Now fill with busy dead objects that we expect to reap */ for (loop =0 ; loop <3 ; loop++) { -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))break ; obj =i915_gem_object_create_internal (i915,PAGE_SIZE );
@@ -942,7 +944,7 @@ static int __igt_mmap(struct drm_i915_private *i915, }if (type ==I915_MMAP_TYPE_GTT ) -intel_gt_flush_ggtt_writes (&i915->gt); +intel_gt_flush_ggtt_writes (to_root_gt (i915)); err =wc_check (obj);if (err == -ENXIO )
@@ -1049,7 +1051,7 @@ static int __igt_mmap_access(struct drm_i915_private *i915, goto out_unmap; } -intel_gt_flush_ggtt_writes (&i915->gt); +intel_gt_flush_ggtt_writes (to_root_gt (i915)); err =access_process_vm (current, addr, &x,sizeof (x),0 );if (err !=sizeof (x)) {
@@ -1065,7 +1067,7 @@ static int __igt_mmap_access(struct drm_i915_private *i915, goto out_unmap; } -intel_gt_flush_ggtt_writes (&i915->gt); +intel_gt_flush_ggtt_writes (to_root_gt (i915)); err =__get_user (y, ptr);if (err) {
@@ -1165,7 +1167,7 @@ static int __igt_mmap_gpu(struct drm_i915_private *i915, }if (type ==I915_MMAP_TYPE_GTT ) -intel_gt_flush_ggtt_writes (&i915->gt); +intel_gt_flush_ggtt_writes (to_root_gt (i915));for_each_uabi_engine (engine, i915) {struct i915_request *rq;
drivers/gpu/drm/i915/gt/intel_engine_user.c +1 -1
@@ -116,7 +116,7 @@ static void set_scheduler_caps(struct drm_i915_private *i915) disabled |= (I915_SCHEDULER_CAP_ENABLED |I915_SCHEDULER_CAP_PRIORITY ); -if (intel_uc_uses_guc_submission (&i915->gt.uc)) +if (intel_uc_uses_guc_submission (&engine->gt->uc)) enabled |=I915_SCHEDULER_CAP_STATIC_PRIORITY_MAP ;for (i =0 ; i <ARRAY_SIZE (map); i++) {
drivers/gpu/drm/i915/gt/intel_ggtt.c +1 -1
@@ -1229,7 +1229,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915) {int ret; - ret =ggtt_probe_hw (&i915->ggtt, &i915->gt); + ret =ggtt_probe_hw (&i915->ggtt,to_root_gt (i915));if (ret)return ret;
drivers/gpu/drm/i915/gt/intel_rps.c +6 -6
@@ -2302,7 +2302,7 @@ unsigned long i915_read_mch_val(void)return 0 ; with_intel_runtime_pm(&i915->runtime_pm, wakeref) { -struct intel_ips *ips = &i915->gt.rps.ips; +struct intel_ips *ips = &to_root_gt (i915)->rps.ips;spin_lock_irq (&mchdev_lock); chipset_val =__ips_chipset_val (ips);
@@ -2329,7 +2329,7 @@ bool i915_gpu_raise(void)if (!i915)return false; - rps = &i915->gt.rps; + rps = &to_root_gt (i915)->rps;spin_lock_irq (&mchdev_lock);if (rps->max_freq_softlimit < rps->max_freq)
@@ -2356,7 +2356,7 @@ bool i915_gpu_lower(void)if (!i915)return false; - rps = &i915->gt.rps; + rps = &to_root_gt (i915)->rps;spin_lock_irq (&mchdev_lock);if (rps->max_freq_softlimit > rps->min_freq)
@@ -2382,7 +2382,7 @@ bool i915_gpu_busy(void)if (!i915)return false; - ret = i915->gt.awake; + ret =to_root_gt (i915)->awake;drm_dev_put (&i915->drm);return ret;
@@ -2405,11 +2405,11 @@ bool i915_gpu_turbo_disable(void)if (!i915)return false; - rps = &i915->gt.rps; + rps = &to_root_gt (i915)->rps;spin_lock_irq (&mchdev_lock); rps->max_freq_softlimit = rps->min_freq; - ret = !__gen5_rps_set (&i915->gt.rps, rps->min_freq); + ret = !__gen5_rps_set (&to_root_gt (i915)->rps, rps->min_freq);spin_unlock_irq (&mchdev_lock);drm_dev_put (&i915->drm);
drivers/gpu/drm/i915/gt/intel_workarounds.c +2 -1
@@ -936,7 +936,8 @@ hsw_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)static void gen9_wa_init_mcr (struct drm_i915_private *i915,struct i915_wa_list *wal) { -const struct sseu_dev_info *sseu = &i915->gt.info.sseu; +const struct sseu_dev_info *sseu = &to_root_gt (i915)->info.sseu; +unsigned int slice, subslice;u32 mcr, mcr_mask;
drivers/gpu/drm/i915/gt/mock_engine.c +5 -5
@@ -345,7 +345,7 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,struct mock_engine *engine;GEM_BUG_ON (id >=I915_NUM_ENGINES ); -GEM_BUG_ON (!i915->gt.uncore); +GEM_BUG_ON (!to_root_gt (i915)->uncore); engine =kzalloc (sizeof (*engine) +PAGE_SIZE ,GFP_KERNEL );if (!engine)
@@ -353,8 +353,8 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,/* minimal engine setup for requests */ engine->base.i915 = i915; - engine->base.gt = &i915->gt; - engine->base.uncore = i915->gt.uncore; + engine->base.gt =to_root_gt (i915); + engine->base.uncore =to_root_gt (i915)->uncore;snprintf (engine->base.name,sizeof (engine->base.name),"%s" , name); engine->base.id = id; engine->base.mask =BIT (id);
@@ -377,8 +377,8 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, engine->base.release = mock_engine_release; - i915->gt.engine[id] = &engine->base; - i915->gt.engine_class[0 ][id] = &engine->base; +to_root_gt (i915)->engine[id] = &engine->base; +to_root_gt (i915)->engine_class[0 ][id] = &engine->base;/* fake hw queue */ spin_lock_init (&engine->hw_lock);
drivers/gpu/drm/i915/gt/selftest_context.c +1 -1
@@ -442,7 +442,7 @@ int intel_context_live_selftests(struct drm_i915_private *i915)SUBTEST (live_active_context), SUBTEST(live_remote_context), }; -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);if (intel_gt_is_wedged (gt))return 0 ;
drivers/gpu/drm/i915/gt/selftest_engine.c +1 -1
@@ -12,7 +12,7 @@ int intel_engine_live_selftests(struct drm_i915_private *i915) live_engine_pm_selftests, NULL, }; -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);typeof (*tests) *fn;for (fn = tests; *fn; fn++) {
drivers/gpu/drm/i915/gt/selftest_engine_cs.c +2 -2
@@ -361,10 +361,10 @@ int intel_engine_cs_perf_selftests(struct drm_i915_private *i915) SUBTEST(perf_mi_noop), }; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ; -return intel_gt_live_subtests (tests, &i915->gt); +return intel_gt_live_subtests (tests,to_root_gt (i915)); }static int intel_mmio_bases_check (void *arg)
drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c +2 -2
@@ -378,13 +378,13 @@ int intel_heartbeat_live_selftests(struct drm_i915_private *i915)int saved_hangcheck;int err; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ; saved_hangcheck = i915->params.enable_hangcheck; i915->params.enable_hangcheck =INT_MAX ; - err =intel_gt_live_subtests (tests, &i915->gt); + err =intel_gt_live_subtests (tests,to_root_gt (i915)); i915->params.enable_hangcheck = saved_hangcheck;return err;
drivers/gpu/drm/i915/gt/selftest_execlists.c +3 -3
@@ -4502,11 +4502,11 @@ int intel_execlists_live_selftests(struct drm_i915_private *i915) SUBTEST(live_virtual_reset), }; -if (i915->gt.submission_method !=INTEL_SUBMISSION_ELSP ) +if (to_root_gt (i915)->submission_method !=INTEL_SUBMISSION_ELSP )return 0 ; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ; -return intel_gt_live_subtests (tests, &i915->gt); +return intel_gt_live_subtests (tests,to_root_gt (i915)); }
drivers/gpu/drm/i915/gt/selftest_gt_pm.c +4 -4
@@ -193,10 +193,10 @@ int intel_gt_pm_live_selftests(struct drm_i915_private *i915) SUBTEST(live_gt_resume), }; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ; -return intel_gt_live_subtests (tests, &i915->gt); +return intel_gt_live_subtests (tests,to_root_gt (i915)); }int intel_gt_pm_late_selftests (struct drm_i915_private *i915)
@@ -210,8 +210,8 @@ int intel_gt_pm_late_selftests(struct drm_i915_private *i915) SUBTEST(live_rc6_ctx_wa), }; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ; -return intel_gt_live_subtests (tests, &i915->gt); +return intel_gt_live_subtests (tests,to_root_gt (i915)); }
drivers/gpu/drm/i915/gt/selftest_hangcheck.c +1 -1
@@ -2018,7 +2018,7 @@ int intel_hangcheck_live_selftests(struct drm_i915_private *i915)SUBTEST (igt_reset_evict_fence), SUBTEST(igt_handle_error), }; -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);intel_wakeref_t wakeref;int err;
drivers/gpu/drm/i915/gt/selftest_lrc.c +1 -1
@@ -1847,5 +1847,5 @@ int intel_lrc_live_selftests(struct drm_i915_private *i915)if (!HAS_LOGICAL_RING_CONTEXTS (i915))return 0 ; -return intel_gt_live_subtests (tests, &i915->gt); +return intel_gt_live_subtests (tests,to_root_gt (i915)); }
drivers/gpu/drm/i915/gt/selftest_migrate.c +2 -2
@@ -441,7 +441,7 @@ int intel_migrate_live_selftests(struct drm_i915_private *i915)SUBTEST (thread_global_copy), SUBTEST(thread_global_clear), }; -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);if (!gt->migrate.context)return 0 ;
@@ -657,7 +657,7 @@ int intel_migrate_perf_selftests(struct drm_i915_private *i915)SUBTEST (perf_clear_blt), SUBTEST(perf_copy_blt), }; -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);if (intel_gt_is_wedged (gt))return 0 ;
drivers/gpu/drm/i915/gt/selftest_mocs.c +1 -1
@@ -451,5 +451,5 @@ int intel_mocs_live_selftests(struct drm_i915_private *i915)if (!get_mocs_settings (i915, &table))return 0 ; -return intel_gt_live_subtests (tests, &i915->gt); +return intel_gt_live_subtests (tests,to_root_gt (i915)); }
drivers/gpu/drm/i915/gt/selftest_reset.c +1 -1
@@ -376,7 +376,7 @@ int intel_reset_live_selftests(struct drm_i915_private *i915)SUBTEST (igt_atomic_reset), SUBTEST(igt_atomic_engine_reset), }; -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);if (!intel_has_gpu_reset (gt))return 0 ;
drivers/gpu/drm/i915/gt/selftest_ring_submission.c +2 -2
@@ -291,8 +291,8 @@ int intel_ring_submission_live_selftests(struct drm_i915_private *i915) SUBTEST(live_ctx_switch_wa), }; -if (i915->gt.submission_method >INTEL_SUBMISSION_RING ) +if (to_root_gt (i915)->submission_method >INTEL_SUBMISSION_RING )return 0 ; -return intel_gt_live_subtests (tests, &i915->gt); +return intel_gt_live_subtests (tests,to_root_gt (i915)); }
drivers/gpu/drm/i915/gt/selftest_slpc.c +3 -3
@@ -39,7 +39,7 @@ static int slpc_set_max_freq(struct intel_guc_slpc *slpc, u32 freq)static int live_slpc_clamp_min (void *arg) {struct drm_i915_private *i915 = arg; -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);struct intel_guc_slpc *slpc = >->uc.guc.slpc;struct intel_rps *rps = >->rps;struct intel_engine_cs *engine;
@@ -166,7 +166,7 @@ static int live_slpc_clamp_min(void *arg)static int live_slpc_clamp_max (void *arg) {struct drm_i915_private *i915 = arg; -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);struct intel_guc_slpc *slpc;struct intel_rps *rps;struct intel_engine_cs *engine;
@@ -304,7 +304,7 @@ int intel_slpc_live_selftests(struct drm_i915_private *i915) SUBTEST(live_slpc_clamp_min), }; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ;return i915_live_subtests (tests, i915);
drivers/gpu/drm/i915/gt/selftest_timeline.c +3 -3
@@ -159,7 +159,7 @@ static int mock_hwsp_freelist(void *arg)INIT_RADIX_TREE (&state.cachelines,GFP_KERNEL ); state.prng =I915_RND_STATE_INITIALIZER (i915_selftest.random_seed); - state.gt = &i915->gt; + state.gt =to_root_gt (i915);/* * Create a bunch of timelines and check that their HWSP do not overlap.
@@ -1416,8 +1416,8 @@ int intel_timeline_live_selftests(struct drm_i915_private *i915) SUBTEST(live_hwsp_rollover_user), }; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ; -return intel_gt_live_subtests (tests, &i915->gt); +return intel_gt_live_subtests (tests,to_root_gt (i915)); }
drivers/gpu/drm/i915/gt/selftest_workarounds.c +2 -2
@@ -1387,8 +1387,8 @@ int intel_workarounds_live_selftests(struct drm_i915_private *i915) SUBTEST(live_engine_reset_workarounds), }; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ; -return intel_gt_live_subtests (tests, &i915->gt); +return intel_gt_live_subtests (tests,to_root_gt (i915)); }
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +1 -1
@@ -623,7 +623,7 @@ int intel_guc_slpc_enable(struct intel_guc_slpc *slpc)if (unlikely (ret <0 ))return ret; -intel_guc_pm_intrmsk_enable (&i915->gt); +intel_guc_pm_intrmsk_enable (to_root_gt (i915));slpc_get_rp_values (slpc);
drivers/gpu/drm/i915/gt/uc/selftest_guc.c +1 -1
@@ -115,7 +115,7 @@ int intel_guc_live_selftests(struct drm_i915_private *i915)static const struct i915_subtest tests[] = {SUBTEST (intel_guc_scrub_ctbs), }; -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);if (intel_gt_is_wedged (gt))return 0 ;
drivers/gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c +1 -1
@@ -167,7 +167,7 @@ int intel_guc_multi_lrc_live_selftests(struct drm_i915_private *i915)static const struct i915_subtest tests[] = {SUBTEST (intel_guc_multi_lrc_basic), }; -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);if (intel_gt_is_wedged (gt))return 0 ;
drivers/gpu/drm/i915/gvt/gvt.c +1 -1
@@ -205,7 +205,7 @@ int intel_gvt_init_device(struct drm_i915_private *i915)spin_lock_init (&gvt->scheduler.mmio_context_lock);mutex_init (&gvt->lock);mutex_init (&gvt->sched_lock); - gvt->gt = &i915->gt; + gvt->gt =to_root_gt (i915); i915->gvt = gvt;init_device_info (gvt);
drivers/gpu/drm/i915/gvt/scheduler.c +1 -1
@@ -1386,7 +1386,7 @@ int intel_vgpu_setup_submission(struct intel_vgpu *vgpu)enum intel_engine_id i;int ret; - ppgtt =i915_ppgtt_create (&i915->gt,I915_BO_ALLOC_PM_EARLY ); + ppgtt =i915_ppgtt_create (to_root_gt (i915),I915_BO_ALLOC_PM_EARLY );if (IS_ERR (ppgtt))return PTR_ERR (ppgtt);
drivers/gpu/drm/i915/i915_debugfs.c +19 -19
@@ -65,7 +65,7 @@ static int i915_capabilities(struct seq_file *m, void *data)intel_device_info_print_static (INTEL_INFO (i915), &p);intel_device_info_print_runtime (RUNTIME_INFO (i915), &p); -intel_gt_info_print (&i915->gt.info, &p); +intel_gt_info_print (&to_root_gt (i915)->info, &p);intel_driver_caps_print (&i915->caps, &p);kernel_param_lock (THIS_MODULE );
@@ -293,7 +293,7 @@ static int i915_gpu_info_open(struct inode *inode, struct file *file) gpu =NULL ;with_intel_runtime_pm (&i915->runtime_pm, wakeref) - gpu = i915_gpu_coredump(&i915->gt, ALL_ENGINES); + gpu = i915_gpu_coredump(to_root_gt(i915), ALL_ENGINES);if (IS_ERR (gpu))return PTR_ERR (gpu);
@@ -351,7 +351,7 @@ static const struct file_operations i915_error_state_fops = {static int i915_frequency_info (struct seq_file *m,void *unused) {struct drm_i915_private *i915 =node_to_i915 (m->private); -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);struct drm_printer p =drm_seq_file_printer (m);intel_gt_pm_frequency_dump (gt, &p);
@@ -439,11 +439,11 @@ static int i915_swizzle_info(struct seq_file *m, void *data)static int i915_rps_boost_info (struct seq_file *m,void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private); -struct intel_rps *rps = &dev_priv->gt.rps; +struct intel_rps *rps = &to_root_gt (dev_priv)->rps;seq_printf (m,"RPS enabled? %s\n" ,yesno (intel_rps_is_enabled (rps)));seq_printf (m,"RPS active? %s\n" ,yesno (intel_rps_is_active (rps))); -seq_printf (m,"GPU busy? %s\n" ,yesno (dev_priv->gt.awake)); +seq_printf (m,"GPU busy? %s\n" ,yesno (to_root_gt (dev_priv)->awake));seq_printf (m,"Boosts outstanding? %d\n" ,atomic_read (&rps->num_waiters));seq_printf (m,"Interactive? %d\n" ,READ_ONCE (rps->power.interactive));
@@ -476,7 +476,7 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)seq_printf (m,"Runtime power status: %s\n" ,enableddisabled (!dev_priv->power_domains.init_wakeref)); -seq_printf (m,"GPU idle: %s\n" ,yesno (!dev_priv->gt.awake)); +seq_printf (m,"GPU idle: %s\n" ,yesno (!to_root_gt (dev_priv)->awake));seq_printf (m,"IRQs disabled: %s\n" ,yesno (!intel_irqs_enabled (dev_priv)));#ifdef CONFIG_PM
@@ -508,18 +508,18 @@ static int i915_engine_info(struct seq_file *m, void *unused) wakeref =intel_runtime_pm_get (&i915->runtime_pm);seq_printf (m,"GT awake? %s [%d], %llums\n" , -yesno (i915->gt.awake), -atomic_read (&i915->gt.wakeref.count), -ktime_to_ms (intel_gt_get_awake_time (&i915->gt))); +yesno (to_root_gt (i915)->awake), +atomic_read (&to_root_gt (i915)->wakeref.count), +ktime_to_ms (intel_gt_get_awake_time (to_root_gt (i915))));seq_printf (m,"CS timestamp frequency: %u Hz, %d ns\n" , - i915->gt.clock_frequency, - i915->gt.clock_period_ns); +to_root_gt (i915)->clock_frequency, +to_root_gt (i915)->clock_period_ns); p =drm_seq_file_printer (m);for_each_uabi_engine (engine, i915)intel_engine_dump (engine, &p,"%s\n" , engine->name); -intel_gt_show_timelines (&i915->gt, &p, i915_request_show_with_schedule); +intel_gt_show_timelines (to_root_gt (i915), &p, i915_request_show_with_schedule);intel_runtime_pm_put (&i915->runtime_pm, wakeref);
@@ -558,14 +558,14 @@ static int i915_wedged_get(void *data, u64 *val) {struct drm_i915_private *i915 = data; -return intel_gt_debugfs_reset_show (&i915->gt, val); +return intel_gt_debugfs_reset_show (to_root_gt (i915), val); }static int i915_wedged_set (void *data,u64 val) {struct drm_i915_private *i915 = data; -return intel_gt_debugfs_reset_store (&i915->gt, val); +return intel_gt_debugfs_reset_store (to_root_gt (i915), val); } DEFINE_SIMPLE_ATTRIBUTE(i915_wedged_fops,
@@ -581,7 +581,7 @@ i915_perf_noa_delay_set(void *data, u64 val)* This would lead to infinite waits as we're doing timestamp * difference on the CS with only 32bits. */ -if (intel_gt_ns_to_clock_interval (&i915->gt, val) >U32_MAX ) +if (intel_gt_ns_to_clock_interval (to_root_gt (i915), val) >U32_MAX )return -EINVAL ;atomic64_set (&i915->perf.noa_programming_delay, val);
@@ -671,7 +671,7 @@ i915_drop_caches_set(void *data, u64 val)DRM_DEBUG ("Dropping caches: 0x%08llx [0x%08llx]\n" , val, val &DROP_ALL ); - ret =gt_drop_caches (&i915->gt, val); + ret =gt_drop_caches (to_root_gt (i915), val);if (ret)return ret;
@@ -702,7 +702,7 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_drop_caches_fops,static int i915_sseu_status (struct seq_file *m,void *unused) {struct drm_i915_private *i915 =node_to_i915 (m->private); -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);return intel_sseu_status (m, gt); }
@@ -711,14 +711,14 @@ static int i915_forcewake_open(struct inode *inode, struct file *file) {struct drm_i915_private *i915 = inode->i_private; -return intel_gt_pm_debugfs_forcewake_user_open (&i915->gt); +return intel_gt_pm_debugfs_forcewake_user_open (to_root_gt (i915)); }static int i915_forcewake_release (struct inode *inode,struct file *file) {struct drm_i915_private *i915 = inode->i_private; -return intel_gt_pm_debugfs_forcewake_user_release (&i915->gt); +return intel_gt_pm_debugfs_forcewake_user_release (to_root_gt (i915)); }static const struct file_operations i915_forcewake_fops = {
drivers/gpu/drm/i915/i915_debugfs_params.c +2 -2
@@ -40,8 +40,8 @@ static int notify_guc(struct drm_i915_private *i915) {int ret =0 ; -if (intel_uc_uses_guc_submission (&i915->gt.uc)) - ret =intel_guc_global_policies_update (&i915->gt.uc.guc); +if (intel_uc_uses_guc_submission (&to_root_gt (i915)->uc)) + ret =intel_guc_global_policies_update (&to_root_gt (i915)->uc.guc);return ret; }
drivers/gpu/drm/i915/i915_driver.c +15 -15
@@ -292,7 +292,7 @@ static void intel_detect_preproduction_hw(struct drm_i915_private *dev_priv)static void sanitize_gpu (struct drm_i915_private *i915) {if (!INTEL_INFO (i915)->gpu_reset_clobbers_display) -__intel_gt_reset (&i915->gt,ALL_ENGINES ); +__intel_gt_reset (to_root_gt (i915),ALL_ENGINES ); }/**
@@ -316,7 +316,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)intel_step_init (dev_priv);intel_uncore_mmio_debug_init_early (&dev_priv->mmio_debug); -intel_uncore_init_early (&dev_priv->uncore, &dev_priv->gt); +intel_uncore_init_early (&dev_priv->uncore,to_root_gt (dev_priv));spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->gpu_error.lock);
@@ -347,7 +347,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)intel_wopcm_init_early (&dev_priv->wopcm); -intel_gt_init_early (&dev_priv->gt, dev_priv); +intel_gt_init_early (to_root_gt (dev_priv), dev_priv);i915_gem_init_early (dev_priv);
@@ -368,7 +368,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) err_gem:i915_gem_cleanup_early (dev_priv); -intel_gt_driver_late_release (&dev_priv->gt); +intel_gt_driver_late_release (to_root_gt (dev_priv));intel_region_ttm_device_fini (dev_priv); err_ttm:vlv_suspend_cleanup (dev_priv);
@@ -387,7 +387,7 @@ static void i915_driver_late_release(struct drm_i915_private *dev_priv)intel_irq_fini (dev_priv);intel_power_domains_cleanup (dev_priv);i915_gem_cleanup_early (dev_priv); -intel_gt_driver_late_release (&dev_priv->gt); +intel_gt_driver_late_release (to_root_gt (dev_priv));intel_region_ttm_device_fini (dev_priv);vlv_suspend_cleanup (dev_priv);i915_workqueues_cleanup (dev_priv);
@@ -430,7 +430,7 @@ static int i915_driver_mmio_probe(struct drm_i915_private *dev_priv)intel_setup_mchbar (dev_priv);intel_device_info_runtime_init (dev_priv); - ret =intel_gt_init_mmio (&dev_priv->gt); + ret =intel_gt_init_mmio (to_root_gt (dev_priv));if (ret) goto err_uncore;
@@ -587,9 +587,9 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)if (ret) goto err_ggtt; -intel_gt_init_hw_early (&dev_priv->gt, &dev_priv->ggtt); +intel_gt_init_hw_early (to_root_gt (dev_priv), &dev_priv->ggtt); - ret =intel_gt_probe_lmem (&dev_priv->gt); + ret =intel_gt_probe_lmem (to_root_gt (dev_priv));if (ret) goto err_mem_regions;
@@ -702,7 +702,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)/* Depends on sysfs having been initialized */ i915_perf_register (dev_priv); -intel_gt_driver_register (&dev_priv->gt); +intel_gt_driver_register (to_root_gt (dev_priv));intel_display_driver_register (dev_priv);
@@ -730,7 +730,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)intel_display_driver_unregister (dev_priv); -intel_gt_driver_unregister (&dev_priv->gt); +intel_gt_driver_unregister (to_root_gt (dev_priv));i915_perf_unregister (dev_priv);i915_pmu_unregister (dev_priv);
@@ -756,7 +756,7 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv)intel_device_info_print_static (INTEL_INFO (dev_priv), &p);intel_device_info_print_runtime (RUNTIME_INFO (dev_priv), &p); -intel_gt_info_print (&dev_priv->gt.info, &p); +intel_gt_info_print (&to_root_gt (dev_priv)->info, &p); }if (IS_ENABLED (CONFIG_DRM_I915_DEBUG ))
@@ -1378,7 +1378,7 @@ static int i915_drm_resume_early(struct drm_device *dev)intel_uncore_resume_early (&dev_priv->uncore); -intel_gt_check_and_clear_faults (&dev_priv->gt); +intel_gt_check_and_clear_faults (to_root_gt (dev_priv));intel_display_power_resume_early (dev_priv);
@@ -1561,7 +1561,7 @@ static int intel_runtime_suspend(struct device *kdev)*/ i915_gem_runtime_suspend (dev_priv); -intel_gt_runtime_suspend (&dev_priv->gt); +intel_gt_runtime_suspend (to_root_gt (dev_priv));intel_runtime_pm_disable_interrupts (dev_priv);
@@ -1577,7 +1577,7 @@ static int intel_runtime_suspend(struct device *kdev)intel_runtime_pm_enable_interrupts (dev_priv); -intel_gt_runtime_resume (&dev_priv->gt); +intel_gt_runtime_resume (to_root_gt (dev_priv));enable_rpm_wakeref_asserts (rpm);
@@ -1665,7 +1665,7 @@ static int intel_runtime_resume(struct device *kdev)* No point of rolling back things in case of an error, as the best * we can do is to hope that things will still work (and disable RPM). */ -intel_gt_runtime_resume (&dev_priv->gt); +intel_gt_runtime_resume (to_root_gt (dev_priv));/* * On VLV/CHV display interrupts are part of the display
drivers/gpu/drm/i915/i915_drv.h +7 -2
@@ -1193,7 +1193,7 @@ struct drm_i915_private {struct i915_perf perf;/* Abstract the submission mechanism (legacy ringbuffer or execlists) away */ -struct intel_gt gt; +struct intel_gt gt0; struct { struct i915_gem_contexts {
@@ -1726,7 +1726,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_PXP (dev_priv) ((IS_ENABLED(CONFIG_DRM_I915_PXP) && \ INTEL_INFO(dev_priv)->has_pxp) && \ - VDBOX_MASK(&dev_priv->gt)) + VDBOX_MASK(to_root_gt(dev_priv)))#define HAS_GMCH (dev_priv) (INTEL_INFO(dev_priv)->display.has_gmch)
@@ -1752,6 +1752,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define INTEL_DISPLAY_ENABLED (dev_priv) \ (drm_WARN_ON(&(dev_priv)->drm, !HAS_DISPLAY(dev_priv)), !(dev_priv)->params.disable_display) +static inline struct intel_gt *to_root_gt (struct drm_i915_private *i915) +{ +return &i915->gt0; +} +static inline bool run_as_guest (void ) {return !hypervisor_is_type (X86_HYPER_NATIVE );
drivers/gpu/drm/i915/i915_gem.c +8 -8
@@ -1049,7 +1049,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)if (ret)return ret; -intel_uc_fetch_firmwares (&dev_priv->gt.uc); +intel_uc_fetch_firmwares (&to_root_gt (dev_priv)->uc);intel_wopcm_init (&dev_priv->wopcm); ret =i915_init_ggtt (dev_priv);
@@ -1069,7 +1069,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)*/ intel_init_clock_gating (dev_priv); - ret =intel_gt_init (&dev_priv->gt); + ret =intel_gt_init (to_root_gt (dev_priv));if (ret) goto err_unlock;
@@ -1085,7 +1085,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)i915_gem_drain_workqueue (dev_priv);if (ret != -EIO ) -intel_uc_cleanup_firmwares (&dev_priv->gt.uc); +intel_uc_cleanup_firmwares (&to_root_gt (dev_priv)->uc);if (ret == -EIO ) {/*
@@ -1093,10 +1093,10 @@ int i915_gem_init(struct drm_i915_private *dev_priv)* as wedged. But we only want to do this when the GPU is angry, * for all other failure, such as an allocation failure, bail. */ -if (!intel_gt_is_wedged (&dev_priv->gt)) { +if (!intel_gt_is_wedged (to_root_gt (dev_priv))) {i915_probe_error (dev_priv,"Failed to initialize GPU, declaring it wedged!\n" ); -intel_gt_set_wedged (&dev_priv->gt); +intel_gt_set_wedged (to_root_gt (dev_priv)); }/* Minimal basic recovery for KMS */
@@ -1127,7 +1127,7 @@ void i915_gem_driver_remove(struct drm_i915_private *dev_priv)intel_wakeref_auto_fini (&dev_priv->ggtt.userfault_wakeref);i915_gem_suspend_late (dev_priv); -intel_gt_driver_remove (&dev_priv->gt); +intel_gt_driver_remove (to_root_gt (dev_priv)); dev_priv->uabi_engines =RB_ROOT ;/* Flush any outstanding unpin_work. */
@@ -1138,9 +1138,9 @@ void i915_gem_driver_remove(struct drm_i915_private *dev_priv)void i915_gem_driver_release (struct drm_i915_private *dev_priv) { -intel_gt_driver_release (&dev_priv->gt); +intel_gt_driver_release (to_root_gt (dev_priv)); -intel_uc_cleanup_firmwares (&dev_priv->gt.uc); +intel_uc_cleanup_firmwares (&to_root_gt (dev_priv)->uc);i915_gem_drain_freed_objects (dev_priv);
drivers/gpu/drm/i915/i915_getparam.c +5 -5
@@ -13,7 +13,7 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data, {struct drm_i915_private *i915 =to_i915 (dev);struct pci_dev *pdev =to_pci_dev (dev->dev); -const struct sseu_dev_info *sseu = &i915->gt.info.sseu; +const struct sseu_dev_info *sseu = &to_root_gt (i915)->info.sseu;drm_i915_getparam_t *param = data;int value =0 ;
@@ -82,8 +82,8 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data,break ;case I915_PARAM_HAS_GPU_RESET : value = i915->params.enable_hangcheck && -intel_has_gpu_reset (&i915->gt); -if (value &&intel_has_reset_engine (&i915->gt)) +intel_has_gpu_reset (to_root_gt (i915)); +if (value &&intel_has_reset_engine (to_root_gt (i915))) value =2 ;break ;case I915_PARAM_HAS_RESOURCE_STREAMER :
@@ -96,7 +96,7 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data, value = sseu->min_eu_in_pool;break ;case I915_PARAM_HUC_STATUS : - value =intel_huc_check_status (&i915->gt.uc.huc); + value =intel_huc_check_status (&to_root_gt (i915)->uc.huc);if (value <0 )return value;break ;
@@ -158,7 +158,7 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data,return -ENODEV ;break ;case I915_PARAM_CS_TIMESTAMP_FREQUENCY : - value = i915->gt.clock_frequency; + value =to_root_gt (i915)->clock_frequency;break ;case I915_PARAM_MMAP_GTT_COHERENT : value =INTEL_INFO (i915)->has_coherent_ggtt;
drivers/gpu/drm/i915/i915_gpu_error.c +2 -2
@@ -504,7 +504,7 @@ static void error_print_context(struct drm_i915_error_state_buf *m,const char *header, const struct i915_gem_context_coredump *ctx) { - const u32 period = m->i915->gt.clock_period_ns; + const u32 period = to_root_gt(m->i915)->clock_period_ns; err_printf(m, "%s%s[%d] prio %d, guilty %d active %d, runtime total %lluns, avg %lluns\n", header, ctx->comm, ctx->pid, ctx->sched_attr.priority,
@@ -1784,7 +1784,7 @@ i915_gpu_coredump_alloc(struct drm_i915_private *i915, gfp_t gfp) error->time =ktime_get_real (); error->boottime =ktime_get_boottime (); - error->uptime =ktime_sub (ktime_get (), i915->gt.last_init_time); + error->uptime =ktime_sub (ktime_get (),to_root_gt (i915)->last_init_time); error->capture = jiffies;capture_gen (error);
drivers/gpu/drm/i915/i915_irq.c +28 -28
211 lines not on this page · raw message
drivers/gpu/drm/i915/i915_perf.c +1 -1
@@ -4443,7 +4443,7 @@ void i915_perf_init(struct drm_i915_private *i915)mutex_init (&perf->lock);/* Choose a representative limit */ - oa_sample_rate_hard_limit = i915->gt.clock_frequency /2 ; + oa_sample_rate_hard_limit =to_root_gt (i915)->clock_frequency /2 ;mutex_init (&perf->metrics_lock);idr_init_base (&perf->metrics_idr,1 );
drivers/gpu/drm/i915/i915_pmu.c +7 -7
@@ -210,8 +210,8 @@ static void init_rc6(struct i915_pmu *pmu)struct drm_i915_private *i915 =container_of (pmu,typeof (*i915), pmu);intel_wakeref_t wakeref; - with_intel_runtime_pm(i915->gt.uncore->rpm, wakeref) { - pmu->sample[__I915_SAMPLE_RC6].cur =__get_rc6 (&i915->gt); + with_intel_runtime_pm(to_root_gt(i915)->uncore->rpm, wakeref) { + pmu->sample[__I915_SAMPLE_RC6].cur =__get_rc6 (to_root_gt (i915)); pmu->sample[__I915_SAMPLE_RC6_LAST_REPORTED].cur = pmu->sample[__I915_SAMPLE_RC6].cur; pmu->sleep_last =ktime_get_raw ();
@@ -222,7 +222,7 @@ static void park_rc6(struct drm_i915_private *i915) {struct i915_pmu *pmu = &i915->pmu; - pmu->sample[__I915_SAMPLE_RC6].cur =__get_rc6 (&i915->gt); + pmu->sample[__I915_SAMPLE_RC6].cur =__get_rc6 (to_root_gt (i915)); pmu->sleep_last =ktime_get_raw (); }
@@ -419,7 +419,7 @@ static enum hrtimer_restart i915_sample(struct hrtimer *hrtimer)struct drm_i915_private *i915 = container_of(hrtimer, struct drm_i915_private, pmu.timer);struct i915_pmu *pmu = &i915->pmu; -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);unsigned int period_ns;ktime_t now;
@@ -476,7 +476,7 @@ engine_event_status(struct intel_engine_cs *engine,static int config_status (struct drm_i915_private *i915,u64 config) { -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);switch (config) {case I915_PMU_ACTUAL_FREQUENCY :
@@ -601,10 +601,10 @@ static u64 __i915_pmu_event_read(struct perf_event *event) val =READ_ONCE (pmu->irq_count);break ;case I915_PMU_RC6_RESIDENCY : - val =get_rc6 (&i915->gt); + val =get_rc6 (to_root_gt (i915));break ;case I915_PMU_SOFTWARE_GT_AWAKE_TIME : - val =ktime_to_ns (intel_gt_get_awake_time (&i915->gt)); + val =ktime_to_ns (intel_gt_get_awake_time (to_root_gt (i915)));break ; } }
drivers/gpu/drm/i915/i915_query.c +1 -1
@@ -31,7 +31,7 @@ static int copy_query_item(void *query_hdr, size_t query_sz,static int query_topology_info (struct drm_i915_private *dev_priv,struct drm_i915_query_item *query_item) { -const struct sseu_dev_info *sseu = &dev_priv->gt.info.sseu; +const struct sseu_dev_info *sseu = &to_root_gt (dev_priv)->info.sseu;struct drm_i915_query_topology_info topo;u32 slice_length, subslice_length, eu_length, total_length;int ret;
drivers/gpu/drm/i915/i915_sysfs.c +11 -11
@@ -52,7 +52,7 @@ static u32 calc_residency(struct drm_i915_private *dev_priv,u64 res =0 ;with_intel_runtime_pm (&dev_priv->runtime_pm, wakeref) - res = intel_rc6_residency_us(&dev_priv->gt.rc6, reg); + res = intel_rc6_residency_us(&to_root_gt(dev_priv)->rc6, reg);return DIV_ROUND_CLOSEST_ULL (res,1000 ); }
@@ -260,7 +260,7 @@ static ssize_t gt_act_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) { struct drm_i915_private *i915 = kdev_minor_to_i915(kdev); -struct intel_rps *rps = &i915->gt.rps; +struct intel_rps *rps = &to_root_gt (i915)->rps;return sysfs_emit (buf,"%d\n" ,intel_rps_read_actual_frequency (rps)); }
@@ -269,7 +269,7 @@ static ssize_t gt_cur_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) { struct drm_i915_private *i915 = kdev_minor_to_i915(kdev); -struct intel_rps *rps = &i915->gt.rps; +struct intel_rps *rps = &to_root_gt (i915)->rps;return sysfs_emit (buf,"%d\n" ,intel_rps_get_requested_frequency (rps)); }
@@ -277,7 +277,7 @@ static ssize_t gt_cur_freq_mhz_show(struct device *kdev,static ssize_t gt_boost_freq_mhz_show (struct device *kdev,struct device_attribute *attr,char *buf) {struct drm_i915_private *i915 =kdev_minor_to_i915 (kdev); -struct intel_rps *rps = &i915->gt.rps; +struct intel_rps *rps = &to_root_gt (i915)->rps;return sysfs_emit (buf,"%d\n" ,intel_rps_get_boost_frequency (rps)); }
@@ -287,7 +287,7 @@ static ssize_t gt_boost_freq_mhz_store(struct device *kdev, const char *buf, size_t count) {struct drm_i915_private *dev_priv =kdev_minor_to_i915 (kdev); -struct intel_rps *rps = &dev_priv->gt.rps; +struct intel_rps *rps = &to_root_gt (dev_priv)->rps;ssize_t ret;u32 val;
@@ -304,7 +304,7 @@ static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) { struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev); -struct intel_rps *rps = &dev_priv->gt.rps; +struct intel_rps *rps = &to_root_gt (dev_priv)->rps;return sysfs_emit (buf,"%d\n" ,intel_gpu_freq (rps, rps->efficient_freq)); }
@@ -312,7 +312,7 @@ static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev,static ssize_t gt_max_freq_mhz_show (struct device *kdev,struct device_attribute *attr,char *buf) {struct drm_i915_private *dev_priv =kdev_minor_to_i915 (kdev); -struct intel_gt *gt = &dev_priv->gt; +struct intel_gt *gt =to_root_gt (dev_priv);struct intel_rps *rps = >->rps;return sysfs_emit (buf,"%d\n" ,intel_rps_get_max_frequency (rps));
@@ -323,7 +323,7 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev, const char *buf, size_t count) {struct drm_i915_private *dev_priv =kdev_minor_to_i915 (kdev); -struct intel_gt *gt = &dev_priv->gt; +struct intel_gt *gt =to_root_gt (dev_priv);struct intel_rps *rps = >->rps;ssize_t ret;u32 val;
@@ -340,7 +340,7 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev,static ssize_t gt_min_freq_mhz_show (struct device *kdev,struct device_attribute *attr,char *buf) {struct drm_i915_private *i915 =kdev_minor_to_i915 (kdev); -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);struct intel_rps *rps = >->rps;return sysfs_emit (buf,"%d\n" ,intel_rps_get_min_frequency (rps));
@@ -351,7 +351,7 @@ static ssize_t gt_min_freq_mhz_store(struct device *kdev, const char *buf, size_t count) {struct drm_i915_private *i915 =kdev_minor_to_i915 (kdev); -struct intel_rps *rps = &i915->gt.rps; +struct intel_rps *rps = &to_root_gt (i915)->rps;ssize_t ret;u32 val;
@@ -381,7 +381,7 @@ static DEVICE_ATTR(gt_RPn_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL);static ssize_t gt_rp_mhz_show (struct device *kdev,struct device_attribute *attr,char *buf) {struct drm_i915_private *dev_priv =kdev_minor_to_i915 (kdev); -struct intel_rps *rps = &dev_priv->gt.rps; +struct intel_rps *rps = &to_root_gt (dev_priv)->rps;u32 val;if (attr == &dev_attr_gt_RP0_freq_mhz)
drivers/gpu/drm/i915/intel_gvt.c +1 -1
@@ -109,7 +109,7 @@ int intel_gvt_init(struct drm_i915_private *dev_priv)return 0 ; } -if (intel_uc_wants_guc_submission (&dev_priv->gt.uc)) { +if (intel_uc_wants_guc_submission (&to_root_gt (dev_priv)->uc)) {drm_err (&dev_priv->drm,"i915 GVT-g loading failed due to Graphics virtualization is not yet supported with GuC submission\n" );return -EIO ;
drivers/gpu/drm/i915/intel_wopcm.c +1 -1
@@ -220,7 +220,7 @@ static bool __wopcm_regs_locked(struct intel_uncore *uncore,void intel_wopcm_init (struct intel_wopcm *wopcm) {struct drm_i915_private *i915 =wopcm_to_i915 (wopcm); -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);u32 guc_fw_size =intel_uc_fw_get_upload_size (>->uc.guc.fw);u32 huc_fw_size =intel_uc_fw_get_upload_size (>->uc.huc.fw);u32 ctx_rsvd =context_reserved_size (i915);
drivers/gpu/drm/i915/pxp/intel_pxp_tee.c +4 -2
@@ -14,9 +14,11 @@#include "intel_pxp_tee.h" #include "intel_pxp_tee_interface.h" -static inline struct intel_pxp *i915_dev_to_pxp (struct device *i915_kdev) +static struct intel_pxp *i915_dev_to_pxp (struct device *i915_kdev) { -return &kdev_to_i915 (i915_kdev)->gt.pxp; +struct drm_i915_private *i915 =kdev_to_i915 (i915_kdev); + +return &to_root_gt (i915)->pxp; } static int intel_pxp_tee_io_message(struct intel_pxp *pxp,
drivers/gpu/drm/i915/selftests/i915_active.c +1 -1
@@ -254,7 +254,7 @@ int i915_active_live_selftests(struct drm_i915_private *i915) SUBTEST(live_active_barrier), }; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ;return i915_subtests (tests, i915);
drivers/gpu/drm/i915/selftests/i915_gem.c +1 -1
@@ -248,7 +248,7 @@ int i915_gem_live_selftests(struct drm_i915_private *i915) SUBTEST(igt_gem_ww_ctx), }; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ;return i915_live_subtests (tests, i915);
drivers/gpu/drm/i915/selftests/i915_gem_evict.c +3 -3
@@ -545,7 +545,7 @@ int i915_gem_evict_mock_selftests(void)return -ENOMEM ;with_intel_runtime_pm (&i915->runtime_pm, wakeref) - err = i915_subtests(tests, &i915->gt); + err = i915_subtests(tests, to_root_gt(i915));mock_destroy_device (i915);return err;
@@ -557,8 +557,8 @@ int i915_gem_evict_live_selftests(struct drm_i915_private *i915) SUBTEST(igt_evict_contexts), }; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ; -return intel_gt_live_subtests (tests, &i915->gt); +return intel_gt_live_subtests (tests,to_root_gt (i915)); }
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +2 -2
@@ -155,7 +155,7 @@ static int igt_ppgtt_alloc(void *arg)if (!HAS_PPGTT (dev_priv))return 0 ; - ppgtt =i915_ppgtt_create (&dev_priv->gt,0 ); + ppgtt =i915_ppgtt_create (to_root_gt (dev_priv),0 );if (IS_ERR (ppgtt))return PTR_ERR (ppgtt);
@@ -1053,7 +1053,7 @@ static int exercise_ppgtt(struct drm_i915_private *dev_priv,if (IS_ERR (file))return PTR_ERR (file); - ppgtt =i915_ppgtt_create (&dev_priv->gt,0 ); + ppgtt =i915_ppgtt_create (to_root_gt (dev_priv),0 );if (IS_ERR (ppgtt)) { err =PTR_ERR (ppgtt); goto out_free;
drivers/gpu/drm/i915/selftests/i915_perf.c +1 -1
@@ -424,7 +424,7 @@ int i915_perf_live_selftests(struct drm_i915_private *i915)if (!perf->metrics_kobj || !perf->ops.enable_metric_set)return 0 ; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ; err =alloc_empty_config (&i915->perf);
drivers/gpu/drm/i915/selftests/i915_request.c +5 -5
@@ -831,7 +831,7 @@ static struct i915_vma *empty_batch(struct drm_i915_private *i915)__i915_gem_object_flush_map (obj,0 ,64 );i915_gem_object_unpin_map (obj); -intel_gt_chipset_flush (&i915->gt); +intel_gt_chipset_flush (to_root_gt (i915)); vma =i915_vma_instance (obj, &i915->ggtt.vm,NULL );if (IS_ERR (vma)) {
@@ -972,7 +972,7 @@ static struct i915_vma *recursive_batch(struct drm_i915_private *i915)if (IS_ERR (obj))return ERR_CAST (obj); - vma =i915_vma_instance (obj, i915->gt.vm,NULL ); + vma =i915_vma_instance (obj,to_root_gt (i915)->vm,NULL );if (IS_ERR (vma)) { err =PTR_ERR (vma); goto err;
@@ -1004,7 +1004,7 @@ static struct i915_vma *recursive_batch(struct drm_i915_private *i915)__i915_gem_object_flush_map (obj,0 ,64 );i915_gem_object_unpin_map (obj); -intel_gt_chipset_flush (&i915->gt); +intel_gt_chipset_flush (to_root_gt (i915));return vma;
@@ -1690,7 +1690,7 @@ int i915_request_live_selftests(struct drm_i915_private *i915) SUBTEST(live_breadcrumbs_smoketest), }; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ;return i915_subtests (tests, i915);
@@ -3081,7 +3081,7 @@ int i915_request_perf_selftests(struct drm_i915_private *i915) SUBTEST(perf_parallel_engines), }; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ;return i915_subtests (tests, i915);
drivers/gpu/drm/i915/selftests/i915_selftest.c +2 -2
@@ -298,10 +298,10 @@ int __i915_live_setup(void *data)struct drm_i915_private *i915 = data;/* The selftests expect an idle system */ -if (intel_gt_pm_wait_for_idle (&i915->gt)) +if (intel_gt_pm_wait_for_idle (to_root_gt (i915)))return -EIO ; -return intel_gt_terminally_wedged (&i915->gt); +return intel_gt_terminally_wedged (to_root_gt (i915)); }int __i915_live_teardown (int err,void *data)
drivers/gpu/drm/i915/selftests/igt_flush_test.c +1 -1
@@ -14,7 +14,7 @@int igt_flush_test (struct drm_i915_private *i915) { -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);int ret =intel_gt_is_wedged (gt) ? -EIO :0 ;cond_resched ();
drivers/gpu/drm/i915/selftests/igt_live_test.c +2 -2
@@ -16,7 +16,7 @@ int igt_live_test_begin(struct igt_live_test *t,const char *func, const char *name) { - struct intel_gt *gt = &i915->gt; + struct intel_gt *gt = to_root_gt(i915);struct intel_engine_cs *engine;enum intel_engine_id id;int err;
@@ -57,7 +57,7 @@ int igt_live_test_end(struct igt_live_test *t)return -EIO ; } -for_each_engine (engine, &i915->gt, id) { +for_each_engine (engine,to_root_gt (i915), id) {if (t->reset_engine[id] ==i915_reset_engine_count (&i915->gpu_error, engine))continue ;
drivers/gpu/drm/i915/selftests/intel_memory_region.c +2 -2
@@ -1217,7 +1217,7 @@ int intel_memory_region_live_selftests(struct drm_i915_private *i915)return 0 ; } -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ;return i915_live_subtests (tests, i915);
@@ -1229,7 +1229,7 @@ int intel_memory_region_perf_selftests(struct drm_i915_private *i915) SUBTEST(perf_memcpy), }; -if (intel_gt_is_wedged (&i915->gt)) +if (intel_gt_is_wedged (to_root_gt (i915)))return 0 ;return i915_live_subtests (tests, i915);
drivers/gpu/drm/i915/selftests/intel_uncore.c +1 -1
@@ -344,5 +344,5 @@ int intel_uncore_live_selftests(struct drm_i915_private *i915) SUBTEST(live_forcewake_domains), }; -return intel_gt_live_subtests (tests, &i915->gt); +return intel_gt_live_subtests (tests,to_root_gt (i915)); }
drivers/gpu/drm/i915/selftests/mock_gem_device.c +14 -14
@@ -45,7 +45,7 @@void mock_device_flush (struct drm_i915_private *i915) { -struct intel_gt *gt = &i915->gt; +struct intel_gt *gt =to_root_gt (i915);struct intel_engine_cs *engine;enum intel_engine_id id;
@@ -64,7 +64,7 @@ static void mock_device_release(struct drm_device *dev) goto out;mock_device_flush (i915); -intel_gt_driver_remove (&i915->gt); +intel_gt_driver_remove (to_root_gt (i915));i915_gem_drain_workqueue (i915);i915_gem_drain_freed_objects (i915);
@@ -73,7 +73,7 @@ static void mock_device_release(struct drm_device *dev)destroy_workqueue (i915->wq);intel_region_ttm_device_fini (i915); -intel_gt_driver_late_release (&i915->gt); +intel_gt_driver_late_release (to_root_gt (i915));intel_memory_regions_driver_release (i915);drm_mode_config_cleanup (&i915->drm);
@@ -178,10 +178,10 @@ struct drm_i915_private *mock_gem_device(void)spin_lock_init (&i915->gpu_error.lock);i915_gem_init__mm (i915); -intel_gt_init_early (&i915->gt, i915); +intel_gt_init_early (to_root_gt (i915), i915);mock_uncore_init (&i915->uncore, i915); -atomic_inc (&i915->gt.wakeref.count);/* disable; no hw support */ - i915->gt.awake = -ENODEV ; +atomic_inc (&to_root_gt (i915)->wakeref.count);/* disable; no hw support */ +to_root_gt (i915)->awake = -ENODEV ; ret =intel_region_ttm_device_init (i915);if (ret)
@@ -194,19 +194,19 @@ struct drm_i915_private *mock_gem_device(void)mock_init_contexts (i915);mock_init_ggtt (i915, &i915->ggtt); - i915->gt.vm =i915_vm_get (&i915->ggtt.vm); +to_root_gt (i915)->vm =i915_vm_get (&i915->ggtt.vm);mkwrite_device_info (i915)->platform_engine_mask =BIT (0 ); - i915->gt.info.engine_mask =BIT (0 ); +to_root_gt (i915)->info.engine_mask =BIT (0 ); - i915->gt.engine[RCS0 ] =mock_engine (i915,"mock" ,RCS0 ); -if (!i915->gt.engine[RCS0 ]) +to_root_gt (i915)->engine[RCS0 ] =mock_engine (i915,"mock" ,RCS0 ); +if (!to_root_gt (i915)->engine[RCS0 ]) goto err_unlock; -if (mock_engine_init (i915->gt.engine[RCS0 ])) +if (mock_engine_init (to_root_gt (i915)->engine[RCS0 ])) goto err_context; -__clear_bit (I915_WEDGED , &i915->gt.reset.flags); +__clear_bit (I915_WEDGED , &to_root_gt (i915)->reset.flags);intel_engines_driver_register (i915); i915->do_release = true;
@@ -215,13 +215,13 @@ struct drm_i915_private *mock_gem_device(void)return i915; err_context: -intel_gt_driver_remove (&i915->gt); +intel_gt_driver_remove (to_root_gt (i915)); err_unlock:destroy_workqueue (i915->wq); err_drv:intel_region_ttm_device_fini (i915); err_ttm: -intel_gt_driver_late_release (&i915->gt); +intel_gt_driver_late_release (to_root_gt (i915));intel_memory_regions_driver_release (i915);drm_mode_config_cleanup (&i915->drm);mock_destroy_device (i915);
drivers/gpu/drm/i915/selftests/mock_gtt.c +3 -3
@@ -70,7 +70,7 @@ struct i915_ppgtt *mock_ppgtt(struct drm_i915_private *i915, const char *name)if (!ppgtt)return NULL ; - ppgtt->vm.gt = &i915->gt; + ppgtt->vm.gt =to_root_gt (i915); ppgtt->vm.i915 = i915; ppgtt->vm.total =round_down (U64_MAX ,PAGE_SIZE ); ppgtt->vm.dma = i915->drm.dev;
@@ -109,7 +109,7 @@ void mock_init_ggtt(struct drm_i915_private *i915, struct i915_ggtt *ggtt) {memset (ggtt,0 ,sizeof (*ggtt)); - ggtt->vm.gt = &i915->gt; + ggtt->vm.gt =to_root_gt (i915); ggtt->vm.i915 = i915; ggtt->vm.is_ggtt = true;
@@ -130,7 +130,7 @@ void mock_init_ggtt(struct drm_i915_private *i915, struct i915_ggtt *ggtt) ggtt->vm.vma_ops.clear_pages = clear_pages;i915_address_space_init (&ggtt->vm,VM_CLASS_GGTT ); - i915->gt.ggtt = ggtt; +to_root_gt (i915)->ggtt = ggtt; }void mock_fini_ggtt (struct i915_ggtt *ggtt)
drivers/gpu/drm/i915/selftests/mock_uncore.c +1 -1
@@ -42,7 +42,7 @@ __nop_read(64)void mock_uncore_init (struct intel_uncore *uncore,struct drm_i915_private *i915) { -intel_uncore_init_early (uncore, &i915->gt); +intel_uncore_init_early (uncore,to_root_gt (i915));ASSIGN_RAW_WRITE_MMIO_VFUNCS (uncore, nop);ASSIGN_RAW_READ_MMIO_VFUNCS (uncore, nop);
Signature · 1 line
2.33.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for More preparation for multi gt patches (rev3)
In reply to Andi Shyti== Series Details ==
== Series Details ==
Series: More preparation for multi gt patches (rev3)
URL : https://patchwork.freedesktop.org/series/97020/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for More preparation for multi gt patches (rev3)
In reply to Andi Shyti== Series Details ==
== Series Details ==
Series: More preparation for multi gt patches (rev3)
URL : https://patchwork.freedesktop.org/series/97020/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10916 -> Patchwork_21661
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_21661 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_21661, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/index.html
Participating hosts (42 -> 34)
------------------------------
Additional (1): fi-icl-u2
Missing (9): bat-dg1-6 fi-tgl-u2 bat-dg1-5 fi-bdw-gvtdvm fi-bsw-cyan bat-adlp-6 bat-adlp-4 bat-jsl-2 bat-jsl-1
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_21661:
### IGT changes ###
#### Possible regressions ####
* igt@runner@aborted:
- fi-rkl-11600: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-rkl-11600/igt@[email protected]
- fi-hsw-4770: NOTRUN -> [FAIL][2]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-hsw-4770/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@runner@aborted:
- {fi-jsl-1}: NOTRUN -> [FAIL][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-jsl-1/igt@[email protected]
- {fi-ehl-2}: NOTRUN -> [FAIL][4]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-ehl-2/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_21661 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@runner@aborted:
- fi-snb-2600: NOTRUN -> [FAIL][5] ([i915#2426])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-snb-2600/igt@[email protected]
- fi-ilk-650: NOTRUN -> [FAIL][6] ([i915#2426])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-ilk-650/igt@[email protected]
- fi-bsw-kefka: NOTRUN -> [FAIL][7] ([i915#3690])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-bsw-kefka/igt@[email protected]
- fi-cfl-8700k: NOTRUN -> [FAIL][8] ([i915#2426] / [i915#3363])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-cfl-8700k/igt@[email protected]
- fi-cfl-8109u: NOTRUN -> [FAIL][9] ([i915#2426] / [i915#3363])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-cfl-8109u/igt@[email protected]
- fi-icl-u2: NOTRUN -> [FAIL][10] ([i915#2426] / [i915#3363] / [i915#3690])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-icl-u2/igt@[email protected]
- fi-glk-dsi: NOTRUN -> [FAIL][11] ([i915#2426] / [i915#3363] / [k.org#202321])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-glk-dsi/igt@[email protected]
- fi-kbl-8809g: NOTRUN -> [FAIL][12] ([i915#2426] / [i915#3363])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-kbl-8809g/igt@[email protected]
- fi-snb-2520m: NOTRUN -> [FAIL][13] ([i915#2426])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-snb-2520m/igt@[email protected]
- fi-bdw-5557u: NOTRUN -> [FAIL][14] ([i915#2426])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-bdw-5557u/igt@[email protected]
- fi-bwr-2160: NOTRUN -> [FAIL][15] ([i915#4529])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-bwr-2160/igt@[email protected]
- fi-kbl-soraka: NOTRUN -> [FAIL][16] ([i915#2426] / [i915#3363])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-kbl-soraka/igt@[email protected]
- fi-kbl-7500u: NOTRUN -> [FAIL][17] ([i915#2426] / [i915#3363])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-kbl-7500u/igt@[email protected]
- fi-kbl-guc: NOTRUN -> [FAIL][18] ([i915#2426] / [i915#3363])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-kbl-guc/igt@[email protected]
- fi-cml-u2: NOTRUN -> [FAIL][19] ([i915#2426] / [i915#3363])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-cml-u2/igt@[email protected]
- fi-rkl-guc: NOTRUN -> [FAIL][20] ([i915#2426])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-rkl-guc/igt@[email protected]
- fi-ivb-3770: NOTRUN -> [FAIL][21] ([i915#2426])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-ivb-3770/igt@[email protected]
- fi-bxt-dsi: NOTRUN -> [FAIL][22] ([i915#2426] / [i915#3363])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-bxt-dsi/igt@[email protected]
- fi-tgl-1115g4: NOTRUN -> [FAIL][23] ([i915#3690])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-tgl-1115g4/igt@[email protected]
- fi-elk-e7500: NOTRUN -> [FAIL][24] ([i915#2426])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-elk-e7500/igt@[email protected]
- fi-cfl-guc: NOTRUN -> [FAIL][25] ([i915#2426] / [i915#3363])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-cfl-guc/igt@[email protected]
- fi-kbl-7567u: NOTRUN -> [FAIL][26] ([i915#2426] / [i915#3363])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-kbl-7567u/igt@[email protected]
- fi-skl-guc: NOTRUN -> [FAIL][27] ([i915#2426] / [i915#3363])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-skl-guc/igt@[email protected]
- fi-skl-6700k2: NOTRUN -> [FAIL][28] ([i915#2426] / [i915#3363])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-skl-6700k2/igt@[email protected]
- fi-bsw-n3050: NOTRUN -> [FAIL][29] ([i915#3690])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-bsw-n3050/igt@[email protected]
- fi-blb-e6850: NOTRUN -> [FAIL][30] ([i915#2403] / [i915#2426])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-blb-e6850/igt@[email protected]
#### Warnings ####
* igt@runner@aborted:
- fi-skl-6600u: [FAIL][31] ([i915#3363] / [i915#4312]) -> [FAIL][32] ([i915#2426] / [i915#3363])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10916/fi-skl-6600u/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-skl-6600u/igt@[email protected]
- fi-bsw-nick: [FAIL][33] ([fdo#109271] / [i915#1436] / [i915#3428] / [i915#4312]) -> [FAIL][34] ([i915#3690])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10916/fi-bsw-nick/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-bsw-nick/igt@[email protected]
- fi-apl-guc: [FAIL][35] ([i915#2426] / [i915#3363] / [i915#4312]) -> [FAIL][36] ([i915#2426] / [i915#3363])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10916/fi-apl-guc/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/fi-apl-guc/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#2403]: https://gitlab.freedesktop.org/drm/intel/issues/2403
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2966]: https://gitlab.freedesktop.org/drm/intel/issues/2966
[i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363
[i915#3428]: https://gitlab.freedesktop.org/drm/intel/issues/3428
[i915#3690]: https://gitlab.freedesktop.org/drm/intel/issues/3690
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4529]: https://gitlab.freedesktop.org/drm/intel/issues/4529
[k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321
Build changes
-------------
* Linux: CI_DRM_10916 -> Patchwork_21661
CI-20190529: 20190529
CI_DRM_10916: 876217519d26774d843128cc66640ae501a5c38d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6286: cdcbf81f734fdb1d102e84490e49e9fec23760cd @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21661: 1e0dc81ceda7c692b41939fc1b3838afe53346f1 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
1e0dc81ceda7 drm/i915: Use to_root_gt() to refer to the root tile 715ab4b6b676 drm/i915: Store backpointer to GT in uncore
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21661/index.html