On Tue, Mar 06, 2018 at 06:48:48PM +0200, Ville Syrjala wrote:
From: Ville Syrjälä ville.syrjala@linux.intel.com
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
u32 vs uint32_t (in struct drm_property) ftw, but who cares.
Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch
drivers/gpu/drm/drm_property.c | 41 +++++++++++++++++++++-------------------- include/drm/drm_property.h | 24 +++++++++++++----------- 2 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/drm_property.c b/drivers/gpu/drm/drm_property.c index 019d1abb94ca..027a50e55e96 100644 --- a/drivers/gpu/drm/drm_property.c +++ b/drivers/gpu/drm/drm_property.c @@ -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); } diff --git a/include/drm/drm_property.h b/include/drm/drm_property.h index 8a522b4bed40..937757a8a568 100644 --- a/include/drm/drm_property.h +++ b/include/drm/drm_property.h @@ -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); -- 2.16.1
Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx