Skip to contentSkip to conversation

uapi/drm/i915_drm.h: fix userspace compilation.

PATCH Applied Artem Savkov 4 participants 4 messages Sep 2, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 uapi/drm/i915_drm.h: fix userspace compilation.

Patch "drm/i915: Use expcitly fixed type in compat32 structs" changed the type of param field in drm_i915_getparam from int to s32. This header is exported to userspace and needs to use userspace type __s32 instead.

This fixes userspace compilation errors like the following:
include/drm/i915_drm.h:361:2: error: unknown type name 's32'
s32 param;

---
 include/uapi/drm/i915_drm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/drm/i915_drm.h +1 -1
index dbd16a2..fd5aa47 100644
@@ -358,7 +358,7 @@ typedef struct drm_i915_irq_wait {
 #define I915_PARAM_HAS_RESOURCE_STREAMER 36
 
 typedef struct drm_i915_getparam {
-	s32 param;
+	__s32 param;
 	/*
 	 * WARNING: Using pointers instead of fixed-size u64 means we need to write
 	 * compat32 code. Don't repeat this mistake.
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 18 lines · Artem Savkov

Patch "drm/i915: Use expcitly fixed type in compat32 structs" changed the type of param field in drm_i915_getparam from int to s32. This header is exported to userspace and needs to use userspace type __s32 instead.

This fixes userspace compilation errors like the following:
include/drm/i915_drm.h:361:2: error: unknown type name 's32'
s32 param;

---
 include/uapi/drm/i915_drm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/drm/i915_drm.h +0 -0
index dbd16a2..fd5aa47 100644

include/uapi/drm/i915_drm.h typedef struct drm_i915_irq_wait { · line 361

Quoted 5 lines
include/uapi/drm/i915_drm.h +1 -1
@@ -358,7 +358,7 @@ typedef struct drm_i915_irq_wait {
 #define I915_PARAM_HAS_RESOURCE_STREAMER 36
 
 typedef struct drm_i915_getparam {
-	s32 param;
+	__s32 param;

Hmm. I don't understand why this one in particular got changed to s32 when there are other ioctl structs still using int.

Quoted 10 lines
include/uapi/drm/i915_drm.h +0 -0
 	/*
 	 * WARNING: Using pointers instead of fixed-size u64 means we need to write
 	 * compat32 code. Don't repeat this mistake.
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by
#2 lore raw
Quoted 21 lines · Ville Syrjälä
Quoted 20 lines · Artem Savkov

Patch "drm/i915: Use expcitly fixed type in compat32 structs" changed the type of param field in drm_i915_getparam from int to s32. This header is exported to userspace and needs to use userspace type __s32 instead.

This fixes userspace compilation errors like the following:
include/drm/i915_drm.h:361:2: error: unknown type name 's32'
s32 param;

---
 include/uapi/drm/i915_drm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/drm/i915_drm.h +0 -0
index dbd16a2..fd5aa47 100644
@@ -358,7 +358,7 @@ typedef struct drm_i915_irq_wait {
 #define I915_PARAM_HAS_RESOURCE_STREAMER 36
 
Quoted 6 lines

include/uapi/drm/i915_drm.h typedef struct drm_i915_irq_wait { · line 361

Quoted 3 lines
include/uapi/drm/i915_drm.h +1 -1
 typedef struct drm_i915_getparam {
-	s32 param;
+	__s32 param;

Hmm. I don't understand why this one in particular got changed to s32 when there are other ioctl structs still using int.

Mostly me being incompetent.

it seems to be worth much ...
-Daniel

Quoted 19 lines
Quoted 11 lines
include/uapi/drm/i915_drm.h +0 -0
 	/*
 	 * WARNING: Using pointers instead of fixed-size u64 means we need to write
 	 * compat32 code. Don't repeat this mistake.
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer Applied
#3 lore raw
Quoted 29 lines · Daniel Vetter
Quoted 21 lines · Ville Syrjälä
Quoted 20 lines · Artem Savkov

Patch "drm/i915: Use expcitly fixed type in compat32 structs" changed the type of param field in drm_i915_getparam from int to s32. This header is exported to userspace and needs to use userspace type __s32 instead.

This fixes userspace compilation errors like the following:
include/drm/i915_drm.h:361:2: error: unknown type name 's32'
s32 param;

---
 include/uapi/drm/i915_drm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/drm/i915_drm.h +0 -0
index dbd16a2..fd5aa47 100644
@@ -358,7 +358,7 @@ typedef struct drm_i915_irq_wait {
 #define I915_PARAM_HAS_RESOURCE_STREAMER 36
 
Quoted 6 lines

include/uapi/drm/i915_drm.h typedef struct drm_i915_irq_wait { · line 361

Quoted 3 lines
include/uapi/drm/i915_drm.h +1 -1
 typedef struct drm_i915_getparam {
-	s32 param;
+	__s32 param;

Hmm. I don't understand why this one in particular got changed to s32 when there are other ioctl structs still using int.

Quoted 4 lines

Mostly me being incompetent.

it seems to be worth much ...

Pushed to drm-intel-next-fixes, thanks for the patch and review.

BR,
Jani.

Quoted 30 lines

-Daniel

Quoted 19 lines
Quoted 11 lines
include/uapi/drm/i915_drm.h +0 -0
 	/*
 	 * WARNING: Using pointers instead of fixed-size u64 means we need to write
 	 * compat32 code. Don't repeat this mistake.
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx