drm: Make property flags u32
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 6 Mar 2018 16:48:48 +0000 (18:48 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 7 Mar 2018 16:25:43 +0000 (18:25 +0200)
The property flags are part of the uabi and we have 32 bits for them.
Pass them around as u32 internally as well, instead of a signed int.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180306164849.2862-5-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/drm_property.c
include/drm/drm_property.h

index 019d1abb94ca0b965d079edea2c09d3baa083de0..027a50e55e965b3439e9ca46ad7bfe0b96342014 100644 (file)
@@ -72,8 +72,9 @@ static bool drm_property_type_valid(struct drm_property *property)
  * Returns:
  * A pointer to the newly created property on success, NULL on failure.
  */
-struct drm_property *drm_property_create(struct drm_device *dev, int flags,
-                                        const char *name, int num_values)
+struct drm_property *drm_property_create(struct drm_device *dev,
+                                        u32 flags, const char *name,
+                                        int num_values)
 {
        struct drm_property *property = NULL;
        int ret;
@@ -136,10 +137,10 @@ EXPORT_SYMBOL(drm_property_create);
  * Returns:
  * A pointer to the newly created property on success, NULL on failure.
  */
-struct drm_property *drm_property_create_enum(struct drm_device *dev, int flags,
-                                        const char *name,
-                                        const struct drm_prop_enum_list *props,
-                                        int num_values)
+struct drm_property *drm_property_create_enum(struct drm_device *dev,
+                                             u32 flags, const char *name,
+                                             const struct drm_prop_enum_list *props,
+                                             int num_values)
 {
        struct drm_property *property;
        int i, ret;
@@ -185,10 +186,10 @@ EXPORT_SYMBOL(drm_property_create_enum);
  * A pointer to the newly created property on success, NULL on failure.
  */
 struct drm_property *drm_property_create_bitmask(struct drm_device *dev,
-                                        int flags, const char *name,
-                                        const struct drm_prop_enum_list *props,
-                                        int num_props,
-                                        uint64_t supported_bits)
+                                                u32 flags, const char *name,
+                                                const struct drm_prop_enum_list *props,
+                                                int num_props,
+                                                uint64_t supported_bits)
 {
        struct drm_property *property;
        int i, ret, index = 0;
@@ -222,8 +223,8 @@ struct drm_property *drm_property_create_bitmask(struct drm_device *dev,
 EXPORT_SYMBOL(drm_property_create_bitmask);
 
 static struct drm_property *property_create_range(struct drm_device *dev,
-                                        int flags, const char *name,
-                                        uint64_t min, uint64_t max)
+                                                 u32 flags, const char *name,
+                                                 uint64_t min, uint64_t max)
 {
        struct drm_property *property;
 
@@ -256,9 +257,9 @@ static struct drm_property *property_create_range(struct drm_device *dev,
  * Returns:
  * A pointer to the newly created property on success, NULL on failure.
  */
-struct drm_property *drm_property_create_range(struct drm_device *dev, int flags,
-                                        const char *name,
-                                        uint64_t min, uint64_t max)
+struct drm_property *drm_property_create_range(struct drm_device *dev,
+                                              u32 flags, const char *name,
+                                              uint64_t min, uint64_t max)
 {
        return property_create_range(dev, DRM_MODE_PROP_RANGE | flags,
                        name, min, max);
@@ -285,8 +286,8 @@ EXPORT_SYMBOL(drm_property_create_range);
  * A pointer to the newly created property on success, NULL on failure.
  */
 struct drm_property *drm_property_create_signed_range(struct drm_device *dev,
-                                        int flags, const char *name,
-                                        int64_t min, int64_t max)
+                                                     u32 flags, const char *name,
+                                                     int64_t min, int64_t max)
 {
        return property_create_range(dev, DRM_MODE_PROP_SIGNED_RANGE | flags,
                        name, I642U64(min), I642U64(max));
@@ -312,7 +313,7 @@ EXPORT_SYMBOL(drm_property_create_signed_range);
  * A pointer to the newly created property on success, NULL on failure.
  */
 struct drm_property *drm_property_create_object(struct drm_device *dev,
-                                               int flags, const char *name,
+                                               u32 flags, const char *name,
                                                uint32_t type)
 {
        struct drm_property *property;
@@ -348,8 +349,8 @@ EXPORT_SYMBOL(drm_property_create_object);
  * Returns:
  * A pointer to the newly created property on success, NULL on failure.
  */
-struct drm_property *drm_property_create_bool(struct drm_device *dev, int flags,
-                                             const char *name)
+struct drm_property *drm_property_create_bool(struct drm_device *dev,
+                                             u32 flags, const char *name)
 {
        return drm_property_create_range(dev, flags, name, 0, 1);
 }
index 8a522b4bed40dd4767286b1df3d1240ea91770fb..937757a8a5687a6453d4c36cbb208119c2ce0dad 100644 (file)
@@ -237,27 +237,29 @@ static inline bool drm_property_type_is(struct drm_property *property,
        return property->flags & type;
 }
 
-struct drm_property *drm_property_create(struct drm_device *dev, int flags,
-                                        const char *name, int num_values);
-struct drm_property *drm_property_create_enum(struct drm_device *dev, int flags,
-                                             const char *name,
+struct drm_property *drm_property_create(struct drm_device *dev,
+                                        u32 flags, const char *name,
+                                        int num_values);
+struct drm_property *drm_property_create_enum(struct drm_device *dev,
+                                             u32 flags, const char *name,
                                              const struct drm_prop_enum_list *props,
                                              int num_values);
 struct drm_property *drm_property_create_bitmask(struct drm_device *dev,
-                                                int flags, const char *name,
+                                                u32 flags, const char *name,
                                                 const struct drm_prop_enum_list *props,
                                                 int num_props,
                                                 uint64_t supported_bits);
-struct drm_property *drm_property_create_range(struct drm_device *dev, int flags,
-                                              const char *name,
+struct drm_property *drm_property_create_range(struct drm_device *dev,
+                                              u32 flags, const char *name,
                                               uint64_t min, uint64_t max);
 struct drm_property *drm_property_create_signed_range(struct drm_device *dev,
-                                                     int flags, const char *name,
+                                                     u32 flags, const char *name,
                                                      int64_t min, int64_t max);
 struct drm_property *drm_property_create_object(struct drm_device *dev,
-                                               int flags, const char *name, uint32_t type);
-struct drm_property *drm_property_create_bool(struct drm_device *dev, int flags,
-                                             const char *name);
+                                               u32 flags, const char *name,
+                                               uint32_t type);
+struct drm_property *drm_property_create_bool(struct drm_device *dev,
+                                             u32 flags, const char *name);
 int drm_property_add_enum(struct drm_property *property, int index,
                          uint64_t value, const char *name);
 void drm_property_destroy(struct drm_device *dev, struct drm_property *property);