From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: <intel-xe@lists.freedesktop.org>
Subject: Re: [PATCH] drm/xe: replace #include <drm/xe_drm.h> with <uapi/drm/xe_drm.h>
Date: Wed, 28 Aug 2024 15:17:14 -0400 [thread overview]
Message-ID: <Zs93uthBqfP2J61P@intel.com> (raw)
In-Reply-To: <20240827091539.4136838-1-jani.nikula@intel.com>
On Tue, Aug 27, 2024 at 12:15:39PM +0300, Jani Nikula wrote:
> include/drm/xe_drm.h does not exist. Prefer the explicit uapi include.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/xe/display/xe_display.c | 2 +-
> drivers/gpu/drm/xe/tests/xe_dma_buf.c | 2 +-
> drivers/gpu/drm/xe/xe_bo.c | 2 +-
> drivers/gpu/drm/xe/xe_device.c | 2 +-
> drivers/gpu/drm/xe/xe_drm_client.c | 2 +-
> drivers/gpu/drm/xe/xe_exec.c | 2 +-
> drivers/gpu/drm/xe/xe_exec_queue.c | 2 +-
> drivers/gpu/drm/xe/xe_gt.c | 2 +-
> drivers/gpu/drm/xe/xe_hw_engine.c | 2 +-
> drivers/gpu/drm/xe/xe_migrate.c | 2 +-
> drivers/gpu/drm/xe/xe_oa.c | 2 +-
> drivers/gpu/drm/xe/xe_oa_types.h | 2 +-
> drivers/gpu/drm/xe/xe_observation.c | 2 +-
> drivers/gpu/drm/xe/xe_pat.c | 2 +-
> drivers/gpu/drm/xe/xe_query.c | 2 +-
> drivers/gpu/drm/xe/xe_rtp.c | 2 +-
> drivers/gpu/drm/xe/xe_sched_job.c | 2 +-
> drivers/gpu/drm/xe/xe_sync.c | 2 +-
> drivers/gpu/drm/xe/xe_vm.c | 2 +-
> drivers/gpu/drm/xe/xe_wait_user_fence.c | 2 +-
> 20 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 78a884ddd499..e91d4d00e004 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -10,7 +10,7 @@
>
> #include <drm/drm_drv.h>
> #include <drm/drm_managed.h>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include "soc/intel_dram.h"
> #include "i915_drv.h" /* FIXME: HAS_DISPLAY() depends on this */
> diff --git a/drivers/gpu/drm/xe/tests/xe_dma_buf.c b/drivers/gpu/drm/xe/tests/xe_dma_buf.c
> index 13db6c0530b3..cedd3e88a6fb 100644
> --- a/drivers/gpu/drm/xe/tests/xe_dma_buf.c
> +++ b/drivers/gpu/drm/xe/tests/xe_dma_buf.c
> @@ -3,7 +3,7 @@
> * Copyright © 2022 Intel Corporation
> */
>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include <kunit/test.h>
> #include <kunit/visibility.h>
> diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
> index cbe7bf098970..0fc93d100c8c 100644
> --- a/drivers/gpu/drm/xe/xe_bo.c
> +++ b/drivers/gpu/drm/xe/xe_bo.c
> @@ -13,7 +13,7 @@
> #include <drm/ttm/ttm_device.h>
> #include <drm/ttm/ttm_placement.h>
> #include <drm/ttm/ttm_tt.h>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include "xe_device.h"
> #include "xe_dma_buf.h"
> diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
> index b6db7e082d88..1a0d7fdd094b 100644
> --- a/drivers/gpu/drm/xe/xe_device.c
> +++ b/drivers/gpu/drm/xe/xe_device.c
> @@ -15,7 +15,7 @@
> #include <drm/drm_ioctl.h>
> #include <drm/drm_managed.h>
> #include <drm/drm_print.h>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include "display/xe_display.h"
> #include "instructions/xe_gpu_commands.h"
> diff --git a/drivers/gpu/drm/xe/xe_drm_client.c b/drivers/gpu/drm/xe/xe_drm_client.c
> index 7ddd59908334..e64f4b645e2e 100644
> --- a/drivers/gpu/drm/xe/xe_drm_client.c
> +++ b/drivers/gpu/drm/xe/xe_drm_client.c
> @@ -5,7 +5,7 @@
> #include "xe_drm_client.h"
>
> #include <drm/drm_print.h>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
> #include <linux/kernel.h>
> #include <linux/slab.h>
> #include <linux/types.h>
> diff --git a/drivers/gpu/drm/xe/xe_exec.c b/drivers/gpu/drm/xe/xe_exec.c
> index 484acfbe0e61..7b38485817dc 100644
> --- a/drivers/gpu/drm/xe/xe_exec.c
> +++ b/drivers/gpu/drm/xe/xe_exec.c
> @@ -8,7 +8,7 @@
> #include <drm/drm_device.h>
> #include <drm/drm_exec.h>
> #include <drm/drm_file.h>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
> #include <linux/delay.h>
>
> #include "xe_bo.h"
> diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c
> index e53937fafd14..5a9cbc97f0be 100644
> --- a/drivers/gpu/drm/xe/xe_exec_queue.c
> +++ b/drivers/gpu/drm/xe/xe_exec_queue.c
> @@ -9,7 +9,7 @@
>
> #include <drm/drm_device.h>
> #include <drm/drm_file.h>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include "xe_device.h"
> #include "xe_gt.h"
> diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
> index 08a004d698d4..1bb66db47265 100644
> --- a/drivers/gpu/drm/xe/xe_gt.c
> +++ b/drivers/gpu/drm/xe/xe_gt.c
> @@ -8,7 +8,7 @@
> #include <linux/minmax.h>
>
> #include <drm/drm_managed.h>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include <generated/xe_wa_oob.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c
> index 18980238a2ea..6e4569aaf869 100644
> --- a/drivers/gpu/drm/xe/xe_hw_engine.c
> +++ b/drivers/gpu/drm/xe/xe_hw_engine.c
> @@ -8,7 +8,7 @@
> #include <linux/nospec.h>
>
> #include <drm/drm_managed.h>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include "regs/xe_engine_regs.h"
> #include "regs/xe_gt_regs.h"
> diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
> index cbf54be224c9..cfd31ae49cc1 100644
> --- a/drivers/gpu/drm/xe/xe_migrate.c
> +++ b/drivers/gpu/drm/xe/xe_migrate.c
> @@ -10,7 +10,7 @@
>
> #include <drm/drm_managed.h>
> #include <drm/ttm/ttm_tt.h>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include <generated/xe_wa_oob.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
> index 4d4541e0b24c..63286ed8457f 100644
> --- a/drivers/gpu/drm/xe/xe_oa.c
> +++ b/drivers/gpu/drm/xe/xe_oa.c
> @@ -10,7 +10,7 @@
>
> #include <drm/drm_drv.h>
> #include <drm/drm_managed.h>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include "abi/guc_actions_slpc_abi.h"
> #include "instructions/xe_mi_commands.h"
> diff --git a/drivers/gpu/drm/xe/xe_oa_types.h b/drivers/gpu/drm/xe/xe_oa_types.h
> index 540c3ec53a6d..8862eca73fbe 100644
> --- a/drivers/gpu/drm/xe/xe_oa_types.h
> +++ b/drivers/gpu/drm/xe/xe_oa_types.h
> @@ -11,7 +11,7 @@
> #include <linux/mutex.h>
> #include <linux/types.h>
>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
> #include "regs/xe_reg_defs.h"
> #include "xe_hw_engine_types.h"
>
> diff --git a/drivers/gpu/drm/xe/xe_observation.c b/drivers/gpu/drm/xe/xe_observation.c
> index a78c92a44ec2..8ec1b84cbb9e 100644
> --- a/drivers/gpu/drm/xe/xe_observation.c
> +++ b/drivers/gpu/drm/xe/xe_observation.c
> @@ -6,7 +6,7 @@
> #include <linux/errno.h>
> #include <linux/sysctl.h>
>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include "xe_oa.h"
> #include "xe_observation.h"
> diff --git a/drivers/gpu/drm/xe/xe_pat.c b/drivers/gpu/drm/xe/xe_pat.c
> index 722278cc23fc..f291a1730024 100644
> --- a/drivers/gpu/drm/xe/xe_pat.c
> +++ b/drivers/gpu/drm/xe/xe_pat.c
> @@ -5,7 +5,7 @@
>
> #include "xe_pat.h"
>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include <generated/xe_wa_oob.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
> index 73ef6e4c2dc9..28d9bb3b825d 100644
> --- a/drivers/gpu/drm/xe/xe_query.c
> +++ b/drivers/gpu/drm/xe/xe_query.c
> @@ -9,7 +9,7 @@
> #include <linux/sched/clock.h>
>
> #include <drm/ttm/ttm_placement.h>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include "regs/xe_engine_regs.h"
> #include "regs/xe_gt_regs.h"
> diff --git a/drivers/gpu/drm/xe/xe_rtp.c b/drivers/gpu/drm/xe/xe_rtp.c
> index e78ba324dd18..86c705d18c0d 100644
> --- a/drivers/gpu/drm/xe/xe_rtp.c
> +++ b/drivers/gpu/drm/xe/xe_rtp.c
> @@ -7,7 +7,7 @@
>
> #include <kunit/visibility.h>
>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include "xe_gt.h"
> #include "xe_gt_topology.h"
> diff --git a/drivers/gpu/drm/xe/xe_sched_job.c b/drivers/gpu/drm/xe/xe_sched_job.c
> index 9628f9deb3c0..e9b67df8cfdd 100644
> --- a/drivers/gpu/drm/xe/xe_sched_job.c
> +++ b/drivers/gpu/drm/xe/xe_sched_job.c
> @@ -5,7 +5,7 @@
>
> #include "xe_sched_job.h"
>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
> #include <linux/dma-fence-chain.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_sync.c b/drivers/gpu/drm/xe/xe_sync.c
> index ca826aeb41ea..43b3b1d310de 100644
> --- a/drivers/gpu/drm/xe/xe_sync.c
> +++ b/drivers/gpu/drm/xe/xe_sync.c
> @@ -12,7 +12,7 @@
>
> #include <drm/drm_print.h>
> #include <drm/drm_syncobj.h>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include "xe_device_types.h"
> #include "xe_exec_queue.h"
> diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
> index 4cc13eddb6b3..a670de50cf4a 100644
> --- a/drivers/gpu/drm/xe/xe_vm.c
> +++ b/drivers/gpu/drm/xe/xe_vm.c
> @@ -12,7 +12,7 @@
> #include <drm/drm_print.h>
> #include <drm/ttm/ttm_execbuf_util.h>
> #include <drm/ttm/ttm_tt.h>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
> #include <linux/ascii85.h>
> #include <linux/delay.h>
> #include <linux/kthread.h>
> diff --git a/drivers/gpu/drm/xe/xe_wait_user_fence.c b/drivers/gpu/drm/xe/xe_wait_user_fence.c
> index f69721339201..d46fa8374980 100644
> --- a/drivers/gpu/drm/xe/xe_wait_user_fence.c
> +++ b/drivers/gpu/drm/xe/xe_wait_user_fence.c
> @@ -8,7 +8,7 @@
> #include <drm/drm_device.h>
> #include <drm/drm_file.h>
> #include <drm/drm_utils.h>
> -#include <drm/xe_drm.h>
> +#include <uapi/drm/xe_drm.h>
>
> #include "xe_device.h"
> #include "xe_gt.h"
> --
> 2.39.2
>
prev parent reply other threads:[~2024-08-28 19:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-27 9:15 [PATCH] drm/xe: replace #include <drm/xe_drm.h> with <uapi/drm/xe_drm.h> Jani Nikula
2024-08-27 9:21 ` ✓ CI.Patch_applied: success for " Patchwork
2024-08-27 9:22 ` ✓ CI.checkpatch: " Patchwork
2024-08-27 9:23 ` ✓ CI.KUnit: " Patchwork
2024-08-27 9:35 ` ✓ CI.Build: " Patchwork
2024-08-27 9:37 ` ✓ CI.Hooks: " Patchwork
2024-08-27 9:39 ` ✓ CI.checksparse: " Patchwork
2024-08-27 9:58 ` ✓ CI.BAT: " Patchwork
2024-08-27 16:18 ` ✗ CI.FULL: failure " Patchwork
2024-08-28 19:17 ` Rodrigo Vivi [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zs93uthBqfP2J61P@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).