Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/xe/guc: Include only required GuC ABI headers

On i915 we were adding new GuC ABI headers directly to guc_fwif.h
file since we were replacing old definitions from that file.

On xe driver we could do more and better by including ABI headers
only in files that need those definitions.

Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/741
Cc: Jani Nikula <jani.nikula@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20231128203203.1147-3-michal.wajdeczko@intel.com
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

authored by

Michal Wajdeczko and committed by
Rodrigo Vivi
b67cb798 0a39ad21

+11 -6
+1
drivers/gpu/drm/xe/xe_gt_pagefault.c
··· 12 12 #include <drm/drm_managed.h> 13 13 #include <drm/ttm/ttm_execbuf_util.h> 14 14 15 + #include "abi/guc_actions_abi.h" 15 16 #include "xe_bo.h" 16 17 #include "xe_gt.h" 17 18 #include "xe_gt_tlb_invalidation.h"
+1
drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
··· 5 5 6 6 #include "xe_gt_tlb_invalidation.h" 7 7 8 + #include "abi/guc_actions_abi.h" 8 9 #include "xe_device.h" 9 10 #include "xe_gt.h" 10 11 #include "xe_guc.h"
+2
drivers/gpu/drm/xe/xe_guc.c
··· 7 7 8 8 #include <drm/drm_managed.h> 9 9 10 + #include "abi/guc_actions_abi.h" 11 + #include "abi/guc_errors_abi.h" 10 12 #include "generated/xe_wa_oob.h" 11 13 #include "regs/xe_gt_regs.h" 12 14 #include "regs/xe_guc_regs.h"
+2
drivers/gpu/drm/xe/xe_guc_ct.c
··· 11 11 12 12 #include <drm/drm_managed.h> 13 13 14 + #include "abi/guc_actions_abi.h" 15 + #include "abi/guc_klvs_abi.h" 14 16 #include "xe_bo.h" 15 17 #include "xe_device.h" 16 18 #include "xe_gt.h"
-6
drivers/gpu/drm/xe/xe_guc_fwif.h
··· 8 8 9 9 #include <linux/bits.h> 10 10 11 - #include "abi/guc_actions_abi.h" 12 - #include "abi/guc_actions_slpc_abi.h" 13 - #include "abi/guc_communication_ctb_abi.h" 14 - #include "abi/guc_communication_mmio_abi.h" 15 - #include "abi/guc_errors_abi.h" 16 11 #include "abi/guc_klvs_abi.h" 17 - #include "abi/guc_messages_abi.h" 18 12 19 13 #define G2H_LEN_DW_SCHED_CONTEXT_MODE_SET 4 20 14 #define G2H_LEN_DW_DEREGISTER_CONTEXT 3
+1
drivers/gpu/drm/xe/xe_guc_hwconfig.c
··· 7 7 8 8 #include <drm/drm_managed.h> 9 9 10 + #include "abi/guc_actions_abi.h" 10 11 #include "xe_bo.h" 11 12 #include "xe_device.h" 12 13 #include "xe_gt.h"
+2
drivers/gpu/drm/xe/xe_guc_pc.c
··· 9 9 10 10 #include <drm/drm_managed.h> 11 11 12 + #include "abi/guc_actions_abi.h" 13 + #include "abi/guc_actions_slpc_abi.h" 12 14 #include "regs/xe_gt_regs.h" 13 15 #include "regs/xe_regs.h" 14 16 #include "xe_bo.h"
+2
drivers/gpu/drm/xe/xe_guc_submit.c
··· 13 13 14 14 #include <drm/drm_managed.h> 15 15 16 + #include "abi/guc_actions_abi.h" 17 + #include "abi/guc_klvs_abi.h" 16 18 #include "regs/xe_lrc_layout.h" 17 19 #include "xe_assert.h" 18 20 #include "xe_devcoredump.h"