| Message ID | 20240520181814.2392-4-michal.wajdeczko@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/xe: Cleanup xe_mmio.h | expand |
On 20-05-2024 23:48, Michal Wajdeczko wrote: > We don't need <linux/delay.h> include since commit 5c09bd6ccd41 > ("drm/xe/mmio: Move xe_mmio_wait32() to xe_mmio.c"). > > We don't need <linux/io-64-nonatomic-lo-hi.h> include since commit > 54c659660d63 ("drm/xe: Make xe_mmio_read|write() functions non- > inline"). Please move /inline")./ to above line to silent checkpatch error. With that LGTM Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com> > > And since commit 924e6a9789a0 ("drm/xe/uapi: Remove MMIO ioctl") > we don't need forward declarations of drm_device and drm_file. > > Signed-off-by: Michal Wajdeczko<michal.wajdeczko@intel.com> > --- > drivers/gpu/drm/xe/xe_mmio.c | 7 +++++-- > drivers/gpu/drm/xe/xe_mmio.h | 9 +-------- > 2 files changed, 6 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c > index 05edab0e085d..548dc37e5893 100644 > --- a/drivers/gpu/drm/xe/xe_mmio.c > +++ b/drivers/gpu/drm/xe/xe_mmio.c > @@ -3,10 +3,12 @@ > * Copyright © 2021-2023 Intel Corporation > */ > > -#include <linux/minmax.h> > - > #include "xe_mmio.h" > > +#include <linux/delay.h> > +#include <linux/io-64-nonatomic-lo-hi.h> > +#include <linux/minmax.h> > + > #include <drm/drm_managed.h> > #include <drm/xe_drm.h> > > @@ -19,6 +21,7 @@ > #include "xe_ggtt.h" > #include "xe_gt.h" > #include "xe_gt_mcr.h" > +#include "xe_gt_printk.h" > #include "xe_macros.h" > #include "xe_module.h" > #include "xe_sriov.h" > diff --git a/drivers/gpu/drm/xe/xe_mmio.h b/drivers/gpu/drm/xe/xe_mmio.h > index 445ec6a0753e..9ef7deecf38f 100644 > --- a/drivers/gpu/drm/xe/xe_mmio.h > +++ b/drivers/gpu/drm/xe/xe_mmio.h > @@ -6,17 +6,10 @@ > #ifndef _XE_MMIO_H_ > #define _XE_MMIO_H_ > > -#include <linux/delay.h> > -#include <linux/io-64-nonatomic-lo-hi.h> > - > -#include "regs/xe_reg_defs.h" > -#include "xe_device_types.h" > -#include "xe_gt_printk.h" > #include "xe_gt_types.h" > > -struct drm_device; > -struct drm_file; > struct xe_device; > +struct xe_reg; > > #define LMEM_BAR 2 >
diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c index 05edab0e085d..548dc37e5893 100644 --- a/drivers/gpu/drm/xe/xe_mmio.c +++ b/drivers/gpu/drm/xe/xe_mmio.c @@ -3,10 +3,12 @@ * Copyright © 2021-2023 Intel Corporation */ -#include <linux/minmax.h> - #include "xe_mmio.h" +#include <linux/delay.h> +#include <linux/io-64-nonatomic-lo-hi.h> +#include <linux/minmax.h> + #include <drm/drm_managed.h> #include <drm/xe_drm.h> @@ -19,6 +21,7 @@ #include "xe_ggtt.h" #include "xe_gt.h" #include "xe_gt_mcr.h" +#include "xe_gt_printk.h" #include "xe_macros.h" #include "xe_module.h" #include "xe_sriov.h" diff --git a/drivers/gpu/drm/xe/xe_mmio.h b/drivers/gpu/drm/xe/xe_mmio.h index 445ec6a0753e..9ef7deecf38f 100644 --- a/drivers/gpu/drm/xe/xe_mmio.h +++ b/drivers/gpu/drm/xe/xe_mmio.h @@ -6,17 +6,10 @@ #ifndef _XE_MMIO_H_ #define _XE_MMIO_H_ -#include <linux/delay.h> -#include <linux/io-64-nonatomic-lo-hi.h> - -#include "regs/xe_reg_defs.h" -#include "xe_device_types.h" -#include "xe_gt_printk.h" #include "xe_gt_types.h" -struct drm_device; -struct drm_file; struct xe_device; +struct xe_reg; #define LMEM_BAR 2
We don't need <linux/delay.h> include since commit 5c09bd6ccd41 ("drm/xe/mmio: Move xe_mmio_wait32() to xe_mmio.c"). We don't need <linux/io-64-nonatomic-lo-hi.h> include since commit 54c659660d63 ("drm/xe: Make xe_mmio_read|write() functions non- inline"). And since commit 924e6a9789a0 ("drm/xe/uapi: Remove MMIO ioctl") we don't need forward declarations of drm_device and drm_file. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> --- drivers/gpu/drm/xe/xe_mmio.c | 7 +++++-- drivers/gpu/drm/xe/xe_mmio.h | 9 +-------- 2 files changed, 6 insertions(+), 10 deletions(-)