Skip to content

Commit

Permalink
drm/xe: Don't rely on indirect includes from xe_mmio.h
Browse files Browse the repository at this point in the history
These compilation units use udelay() or some GT oriented printk
functions without explicitly including proper header files, and
relying on #includes from the xe_mmio.h instead. Fix that.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Francois Dugast <francois.dugast@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240520181814.2392-3-michal.wajdeczko@intel.com
  • Loading branch information
Michal Wajdeczko committed May 22, 2024
1 parent 31a278b commit 26a2295
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/xe/xe_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include "xe_device.h"

#include <linux/delay.h>
#include <linux/units.h>

#include <drm/drm_aperture.h>
Expand Down Expand Up @@ -32,6 +33,7 @@
#include "xe_gsc_proxy.h"
#include "xe_gt.h"
#include "xe_gt_mcr.h"
#include "xe_gt_printk.h"
#include "xe_hwmon.h"
#include "xe_irq.h"
#include "xe_memirq.h"
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/xe/xe_gsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#include "xe_gsc.h"

#include <linux/delay.h>

#include <drm/drm_managed.h>

#include <generated/xe_wa_oob.h>
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/xe/xe_gt_ccs_mode.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "xe_assert.h"
#include "xe_gt.h"
#include "xe_gt_ccs_mode.h"
#include "xe_gt_printk.h"
#include "xe_gt_sysfs.h"
#include "xe_mmio.h"

Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/xe/xe_guc_ads.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "xe_bo.h"
#include "xe_gt.h"
#include "xe_gt_ccs_mode.h"
#include "xe_gt_printk.h"
#include "xe_guc.h"
#include "xe_guc_ct.h"
#include "xe_hw_engine.h"
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/xe/xe_huc.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#include "xe_huc.h"

#include <linux/delay.h>

#include <drm/drm_managed.h>

#include "abi/gsc_pxp_commands_abi.h"
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/xe/xe_mocs.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "xe_force_wake.h"
#include "xe_gt.h"
#include "xe_gt_mcr.h"
#include "xe_gt_printk.h"
#include "xe_mmio.h"
#include "xe_platform_types.h"
#include "xe_pm.h"
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "xe_bo.h"
#include "xe_device.h"
#include "xe_gt.h"
#include "xe_gt_printk.h"
#include "xe_mmio.h"
#include "xe_res_cursor.h"
#include "xe_sriov.h"
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/xe/xe_uc_fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "xe_force_wake.h"
#include "xe_gsc.h"
#include "xe_gt.h"
#include "xe_gt_printk.h"
#include "xe_map.h"
#include "xe_mmio.h"
#include "xe_module.h"
Expand Down

0 comments on commit 26a2295

Please sign in to comment.