[PATCH -next 1/2] drm/xe: Remove duplicated include in xe_pt.c

[PATCH -next 1/2] drm/xe: Remove duplicated include in xe_pt.c

[Yang Li]

The header files xe_tlb_inval_job.h is included twice in xe_pt.c,
so one inclusion of each can be removed.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=24705
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 drivers/gpu/drm/xe/xe_pt.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
index 01eea8eb1779..3e33b10e7ba9 100644
--- a/drivers/gpu/drm/xe/xe_pt.c
+++ b/drivers/gpu/drm/xe/xe_pt.c
@@ -21,7 +21,6 @@
 #include "xe_sched_job.h"
 #include "xe_sync.h"
 #include "xe_svm.h"
-#include "xe_tlb_inval_job.h"
 #include "xe_trace.h"
 #include "xe_ttm_stolen_mgr.h"
 #include "xe_userptr.h"
-- 
2.43.7

[PATCH -next 2/2] drm/xe: Remove duplicated include in xe_tlb_inval.c

[Yang Li]

The header files xe_tlb_inval.h is included twice in xe_tlb_inval.c,
so one inclusion of each can be removed.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=24706
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 drivers/gpu/drm/xe/xe_tlb_inval.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/xe_tlb_inval.c b/drivers/gpu/drm/xe/xe_tlb_inval.c
index e6e97b5a7b5c..41e80d609815 100644
--- a/drivers/gpu/drm/xe/xe_tlb_inval.c
+++ b/drivers/gpu/drm/xe/xe_tlb_inval.c
@@ -17,7 +17,6 @@
 #include "xe_tlb_inval.h"
 #include "xe_mmio.h"
 #include "xe_pm.h"
-#include "xe_tlb_inval.h"
 #include "xe_trace.h"
 
 /**
-- 
2.43.7

Re: [PATCH -next 2/2] drm/xe: Remove duplicated include in xe_tlb_inval.c

[Rodrigo Vivi]

On Mon, Sep 15, 2025 at 04:06:47PM +0800, Yang Li wrote:
> The header files xe_tlb_inval.h is included twice in xe_tlb_inval.c,
> so one inclusion of each can be removed.
> 
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=24706
> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
> ---
>  drivers/gpu/drm/xe/xe_tlb_inval.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_tlb_inval.c b/drivers/gpu/drm/xe/xe_tlb_inval.c
> index e6e97b5a7b5c..41e80d609815 100644
> --- a/drivers/gpu/drm/xe/xe_tlb_inval.c
> +++ b/drivers/gpu/drm/xe/xe_tlb_inval.c
> @@ -17,7 +17,6 @@
>  #include "xe_tlb_inval.h"
>  #include "xe_mmio.h"
>  #include "xe_pm.h"
> -#include "xe_tlb_inval.h"

in both patches, please remove the other occurence so we
keep the alphabetical order.

>  #include "xe_trace.h"
>  
>  /**
> -- 
> 2.43.7
> 

Re: [PATCH -next 1/2] drm/xe: Remove duplicated include in xe_pt.c

[Lucas De Marchi]

On Mon, Sep 15, 2025 at 04:06:46PM +0800, Yang Li wrote:
>The header files xe_tlb_inval_job.h is included twice in xe_pt.c,
>so one inclusion of each can be removed.
>
>Reported-by: Abaci Robot <abaci@linux.alibaba.com>
>Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=24705
>Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
>---
> drivers/gpu/drm/xe/xe_pt.c | 1 -
> 1 file changed, 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
>index 01eea8eb1779..3e33b10e7ba9 100644
>--- a/drivers/gpu/drm/xe/xe_pt.c
>+++ b/drivers/gpu/drm/xe/xe_pt.c
>@@ -21,7 +21,6 @@
> #include "xe_sched_job.h"
> #include "xe_sync.h"
> #include "xe_svm.h"
>-#include "xe_tlb_inval_job.h"

however you removed the wrong one. `LANG=C sort -u` in this include
block would result in this:

| diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
| index 01eea8eb17795..a1c88f9a6c763 100644
| --- a/drivers/gpu/drm/xe/xe_pt.c
| +++ b/drivers/gpu/drm/xe/xe_pt.c
| @@ -13,14 +13,13 @@
|  #include "xe_drm_client.h"
|  #include "xe_exec_queue.h"
|  #include "xe_gt.h"
| -#include "xe_tlb_inval_job.h"
|  #include "xe_migrate.h"
|  #include "xe_pt_types.h"
|  #include "xe_pt_walk.h"
|  #include "xe_res_cursor.h"
|  #include "xe_sched_job.h"
| -#include "xe_sync.h"
|  #include "xe_svm.h"
| +#include "xe_sync.h"
|  #include "xe_tlb_inval_job.h"
|  #include "xe_trace.h"
|  #include "xe_ttm_stolen_mgr.h"

which is the preferred way to maintain the includes.

thanks
Lucas De Marchi

> #include "xe_trace.h"
> #include "xe_ttm_stolen_mgr.h"
> #include "xe_userptr.h"
>-- 
>2.43.7
>

Re: [PATCH -next 2/2] drm/xe: Remove duplicated include in xe_tlb_inval.c

[Lucas De Marchi]

On Mon, Sep 15, 2025 at 04:06:47PM +0800, Yang Li wrote:
>The header files xe_tlb_inval.h is included twice in xe_tlb_inval.c,
>so one inclusion of each can be removed.
>
>Reported-by: Abaci Robot <abaci@linux.alibaba.com>
>Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=24706
>Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>

similar comment as in the previous one. Please use `LANG=C sort -u` and
submit as a single patch.

thanks
Lucas De Marchi