Skip to content

Commit 87d8ecf

Browse files
jnikularodrigovivi
authored andcommitted
drm/xe: replace #include <drm/xe_drm.h> with <uapi/drm/xe_drm.h>
include/drm/xe_drm.h does not exist. Prefer the explicit uapi include. Signed-off-by: Jani Nikula <[email protected]> Reviewed-by: Rodrigo Vivi <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent a7f6570 commit 87d8ecf

20 files changed

+20
-20
lines changed

drivers/gpu/drm/xe/display/xe_display.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include <drm/drm_drv.h>
1212
#include <drm/drm_managed.h>
13-
#include <drm/xe_drm.h>
13+
#include <uapi/drm/xe_drm.h>
1414

1515
#include "soc/intel_dram.h"
1616
#include "i915_drv.h" /* FIXME: HAS_DISPLAY() depends on this */

drivers/gpu/drm/xe/tests/xe_dma_buf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © 2022 Intel Corporation
44
*/
55

6-
#include <drm/xe_drm.h>
6+
#include <uapi/drm/xe_drm.h>
77

88
#include <kunit/test.h>
99
#include <kunit/visibility.h>

drivers/gpu/drm/xe/xe_bo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <drm/ttm/ttm_device.h>
1414
#include <drm/ttm/ttm_placement.h>
1515
#include <drm/ttm/ttm_tt.h>
16-
#include <drm/xe_drm.h>
16+
#include <uapi/drm/xe_drm.h>
1717

1818
#include "xe_device.h"
1919
#include "xe_dma_buf.h"

drivers/gpu/drm/xe/xe_device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <drm/drm_ioctl.h>
1616
#include <drm/drm_managed.h>
1717
#include <drm/drm_print.h>
18-
#include <drm/xe_drm.h>
18+
#include <uapi/drm/xe_drm.h>
1919

2020
#include "display/xe_display.h"
2121
#include "instructions/xe_gpu_commands.h"

drivers/gpu/drm/xe/xe_drm_client.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "xe_drm_client.h"
66

77
#include <drm/drm_print.h>
8-
#include <drm/xe_drm.h>
8+
#include <uapi/drm/xe_drm.h>
99
#include <linux/kernel.h>
1010
#include <linux/slab.h>
1111
#include <linux/types.h>

drivers/gpu/drm/xe/xe_exec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <drm/drm_device.h>
99
#include <drm/drm_exec.h>
1010
#include <drm/drm_file.h>
11-
#include <drm/xe_drm.h>
11+
#include <uapi/drm/xe_drm.h>
1212
#include <linux/delay.h>
1313

1414
#include "xe_bo.h"

drivers/gpu/drm/xe/xe_exec_queue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <drm/drm_device.h>
1111
#include <drm/drm_file.h>
12-
#include <drm/xe_drm.h>
12+
#include <uapi/drm/xe_drm.h>
1313

1414
#include "xe_device.h"
1515
#include "xe_gt.h"

drivers/gpu/drm/xe/xe_gt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <linux/minmax.h>
99

1010
#include <drm/drm_managed.h>
11-
#include <drm/xe_drm.h>
11+
#include <uapi/drm/xe_drm.h>
1212

1313
#include <generated/xe_wa_oob.h>
1414

drivers/gpu/drm/xe/xe_hw_engine.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <linux/nospec.h>
99

1010
#include <drm/drm_managed.h>
11-
#include <drm/xe_drm.h>
11+
#include <uapi/drm/xe_drm.h>
1212

1313
#include "regs/xe_engine_regs.h"
1414
#include "regs/xe_gt_regs.h"

drivers/gpu/drm/xe/xe_migrate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include <drm/drm_managed.h>
1212
#include <drm/ttm/ttm_tt.h>
13-
#include <drm/xe_drm.h>
13+
#include <uapi/drm/xe_drm.h>
1414

1515
#include <generated/xe_wa_oob.h>
1616

0 commit comments

Comments
 (0)