Drop a couple of unused variables and move the wopcm code under gt/uc. The 3 patches are independent from each other, I'm sending them as a series just to avoid spamming CI. Cc: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx> Cc: John Harrison <john.c.harrison@xxxxxxxxx> Cc: Matthew Brost <matthew.brost@xxxxxxxxx> Daniele Ceraolo Spurio (4): drm/i915/guc: drop guc parameter from guc_ggtt_offset drm/i915/guc: drop gt.pm_guc_events drm/i915: consolidate WOPCM management under gt/uc HAX: drm/i915: default to enable_guc=2 Documentation/gpu/i915.rst | 2 +- drivers/gpu/drm/i915/Makefile | 4 +- drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_types.h | 2 - drivers/gpu/drm/i915/gt/uc/intel_guc.c | 14 +- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 4 +- drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 5 +- drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 3 + .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 +- drivers/gpu/drm/i915/gt/uc/intel_huc.c | 3 +- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 67 +-------- drivers/gpu/drm/i915/gt/uc/intel_uc.h | 25 ++++ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 11 -- .../{intel_wopcm.c => gt/uc/intel_uc_wopcm.c} | 141 ++++++++++++------ drivers/gpu/drm/i915/i915_drv.c | 2 - drivers/gpu/drm/i915/i915_drv.h | 3 - drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 4 - drivers/gpu/drm/i915/i915_params.h | 2 +- drivers/gpu/drm/i915/intel_wopcm.h | 60 -------- 21 files changed, 146 insertions(+), 216 deletions(-) rename drivers/gpu/drm/i915/{intel_wopcm.c => gt/uc/intel_uc_wopcm.c} (71%) delete mode 100644 drivers/gpu/drm/i915/intel_wopcm.h -- 2.24.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx