[PATCH i-g-t 3/3] lib/intel_compute: Fix compiler warnings on x86-32

Ville Syrjala ville.syrjala at linux.intel.com
Fri Sep 27 16:33:07 UTC 2024


From: Ville Syrjälä <ville.syrjala at linux.intel.com>

x86-32 gcc is not happy:
../lib/intel_compute.c: In function ‘xehp_compute_exec_compute’:
../lib/intel_compute.c:862:48: warning: right shift count >= width of type [-Wshift-count-overflow]
  862 |         addr_bo_buffer_batch[b++] = ADDR_BATCH >> 32;
      |                                                ^~

Just use ULL for all the address constants.

Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
 lib/intel_compute.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/intel_compute.c b/lib/intel_compute.c
index 1cc39f645c2e..3ab9ace7932c 100644
--- a/lib/intel_compute.c
+++ b/lib/intel_compute.c
@@ -27,20 +27,20 @@
 #define SIZE_BATCH			0x1000
 #define SIZE_BUFFER_INPUT		MAX(sizeof(float) * SIZE_DATA, 0x1000)
 #define SIZE_BUFFER_OUTPUT		MAX(sizeof(float) * SIZE_DATA, 0x1000)
-#define ADDR_BATCH			0x100000UL
-#define ADDR_INPUT			0x200000UL
-#define ADDR_OUTPUT			0x300000UL
-#define ADDR_SURFACE_STATE_BASE		0x400000UL
-#define ADDR_DYNAMIC_STATE_BASE		0x500000UL
+#define ADDR_BATCH			0x100000ULL
+#define ADDR_INPUT			0x200000ULL
+#define ADDR_OUTPUT			0x300000ULL
+#define ADDR_SURFACE_STATE_BASE		0x400000ULL
+#define ADDR_DYNAMIC_STATE_BASE		0x500000ULL
 #define ADDR_INDIRECT_OBJECT_BASE	0x100000000
 #define OFFSET_INDIRECT_DATA_START	0xFFFD0000
 #define OFFSET_KERNEL			0xFFFE0000
 
-#define ADDR_GENERAL_STATE_BASE		0x80000000UL
-#define ADDR_INSTRUCTION_STATE_BASE	0x90000000UL
+#define ADDR_GENERAL_STATE_BASE		0x80000000ULL
+#define ADDR_INSTRUCTION_STATE_BASE	0x90000000ULL
 #define OFFSET_BINDING_TABLE		0x1000
 
-#define XE2_ADDR_STATE_CONTEXT_DATA_BASE	0x900000UL
+#define XE2_ADDR_STATE_CONTEXT_DATA_BASE	0x900000ULL
 #define OFFSET_STATE_SIP			0xFFFF0000
 
 /*
-- 
2.45.2



More information about the igt-dev mailing list