Hi, respinning this series as there was a rebase conflict in its latest version. Andi Changelog: ========== v3 -> v4: - Rebase on top of the latest drm-tip v2 -> v3: - Remove patch 1 that contained guc_to_i915() v1 -> v2: - add the gt_to_guc() helper and change files in: - i915/gt/ - i915/gt/uc - i915/ Andi Shyti (4): drm/i915/gt: Create the gt_to_guc() wrapper drm/i915/guc: Use the new gt_to_guc() wrapper drm/i915: Use the new gt_to_guc() wrapper drm/i915/guc: Use the ce_to_guc() wrapper whenever possible drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 +-- drivers/gpu/drm/i915/gt/intel_ggtt.c | 9 ++---- drivers/gpu/drm/i915/gt/intel_gt.h | 5 ++++ drivers/gpu/drm/i915/gt/intel_gt_irq.c | 6 ++-- drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 8 ++--- drivers/gpu/drm/i915/gt/intel_rc6.c | 4 +-- drivers/gpu/drm/i915/gt/intel_rps.c | 2 +- drivers/gpu/drm/i915/gt/intel_tlb.c | 2 +- drivers/gpu/drm/i915/gt/selftest_slpc.c | 6 ++-- drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c | 4 +-- drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c | 3 +- drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_capture.c | 6 ++-- .../gpu/drm/i915/gt/uc/intel_guc_hwconfig.c | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 30 +++++++++---------- drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 +-- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 4 +-- drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 2 +- drivers/gpu/drm/i915/i915_debugfs_params.c | 2 +- .../i915/selftests/intel_scheduler_helpers.c | 4 +-- 21 files changed, 57 insertions(+), 54 deletions(-) -- 2.43.0