From: Rob Clark <robdclark@gmail.com>
To: dri-devel@lists.freedesktop.org
Subject: [PATCH 05/16] drm: add signed-range property type
Date: Tue, 18 Mar 2014 17:22:42 -0400 [thread overview]
Message-ID: <1395177773-800-6-git-send-email-robdclark@gmail.com> (raw)
In-Reply-To: <1395177773-800-1-git-send-email-robdclark@gmail.com>
Like range, but values are signed.
Signed-off-by: Rob Clark <robdclark@gmail.com>
---
drivers/gpu/drm/drm_crtc.c | 29 +++++++++++++++++++++++++----
include/drm/drm_crtc.h | 12 ++++++++++++
include/uapi/drm/drm_mode.h | 1 +
3 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 99648d4..6d7138d 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -3296,14 +3296,12 @@ struct drm_property *drm_property_create_bitmask(struct drm_device *dev,
}
EXPORT_SYMBOL(drm_property_create_bitmask);
-struct drm_property *drm_property_create_range(struct drm_device *dev, int flags,
- const char *name,
+static struct drm_property *property_create_range(struct drm_device *dev,
+ int flags, const char *name,
uint64_t min, uint64_t max)
{
struct drm_property *property;
- flags |= DRM_MODE_PROP_RANGE;
-
property = drm_property_create(dev, flags, name, 2);
if (!property)
return NULL;
@@ -3313,8 +3311,25 @@ struct drm_property *drm_property_create_range(struct drm_device *dev, int flags
return property;
}
+
+struct drm_property *drm_property_create_range(struct drm_device *dev, int flags,
+ const char *name,
+ uint64_t min, uint64_t max)
+{
+ return property_create_range(dev, DRM_MODE_PROP_RANGE | flags,
+ name, min, max);
+}
EXPORT_SYMBOL(drm_property_create_range);
+struct drm_property *drm_property_create_signed_range(struct drm_device *dev,
+ int 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));
+}
+EXPORT_SYMBOL(drm_property_create_signed_range);
+
struct drm_property *drm_property_create_object(struct drm_device *dev,
int flags, const char *name, uint32_t type)
{
@@ -3656,6 +3671,12 @@ static bool drm_property_change_is_valid(struct drm_property *property,
if (value < property->values[0] || value > property->values[1])
return false;
return true;
+ } else if (drm_property_type_is(property, DRM_MODE_PROP_SIGNED_RANGE)) {
+ int64_t svalue = U642I64(value);
+ if (svalue < U642I64(property->values[0]) ||
+ svalue > U642I64(property->values[1]))
+ return false;
+ return true;
} else if (drm_property_type_is(property, DRM_MODE_PROP_BITMASK)) {
int i;
uint64_t valid_mask = 0;
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 2ef0976..710b91b 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -66,6 +66,15 @@ struct drm_object_properties {
uint64_t values[DRM_OBJECT_MAX_PROPERTY];
};
+static inline int64_t U642I64(uint64_t val)
+{
+ return (int64_t)*((int64_t *)&val);
+}
+static inline uint64_t I642U64(int64_t val)
+{
+ return (uint64_t)*((uint64_t *)&val);
+}
+
/*
* Note on terminology: here, for brevity and convenience, we refer to connector
* control chips as 'CRTCs'. They can control any type of connector, VGA, LVDS,
@@ -1255,6 +1264,9 @@ struct drm_property *drm_property_create_bitmask(struct drm_device *dev,
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_signed_range(struct drm_device *dev,
+ int 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);
extern void drm_property_destroy(struct drm_device *dev, struct drm_property *property);
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
index 516425d..6421edc 100644
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -264,6 +264,7 @@ struct drm_mode_get_connector {
#define DRM_MODE_PROP_EXTENDED_TYPE 0x0000ffc0
#define DRM_MODE_PROP_TYPE(n) ((n) << 6)
#define DRM_MODE_PROP_OBJECT DRM_MODE_PROP_TYPE(1)
+#define DRM_MODE_PROP_SIGNED_RANGE DRM_MODE_PROP_TYPE(2)
struct drm_mode_property_enum {
__u64 value;
--
1.8.5.3
next prev parent reply other threads:[~2014-03-18 21:23 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-18 21:22 [PATCH 00/16] Atomic/nuclear modeset/pageflip Rob Clark
2014-03-18 21:22 ` [PATCH 01/16] drm: fix typo Rob Clark
2014-03-18 21:22 ` [PATCH 02/16] drm: add atomic fxns Rob Clark
2014-03-18 21:22 ` [PATCH 03/16] drm: convert crtc to ww_mutex Rob Clark
2014-03-18 21:22 ` [PATCH 04/16] drm: add object property type Rob Clark
2014-03-18 21:22 ` Rob Clark [this message]
2014-03-18 21:22 ` [PATCH 06/16] drm: helpers to find mode objects Rob Clark
2014-03-18 21:22 ` [PATCH 07/16] drm: split propvals out and blob property support Rob Clark
2014-03-18 21:22 ` [PATCH 08/16] drm: Allow drm_mode_object_find() to look up an object of any type Rob Clark
2014-03-18 21:22 ` [PATCH 09/16] drm: Refactor object property check code Rob Clark
2014-03-18 21:22 ` [PATCH 10/16] drm: allow FB's in drm_mode_object_find Rob Clark
2014-03-18 21:22 ` [PATCH 11/16] drm: convert plane to properties/state Rob Clark
2014-03-18 21:22 ` [PATCH 12/16] drm: convert crtc " Rob Clark
2014-03-18 21:22 ` [PATCH 13/16] drm: push locking down into restore_fbdev_mode Rob Clark
2014-03-18 21:22 ` [PATCH 14/16] drm: Atomic modeset ioctl Rob Clark
2014-03-18 21:22 ` [PATCH 15/16] drm/msm: add atomic support Rob Clark
2014-03-18 21:22 ` [PATCH 16/16] drm: spiff out FB refcnting traces Rob Clark
2014-03-19 11:07 ` [PATCH 00/16] Atomic/nuclear modeset/pageflip Daniel Vetter
2014-03-19 12:23 ` Rob Clark
2014-03-19 13:39 ` Daniel Vetter
2014-03-20 22:34 ` Greg Hackmann
2014-03-21 0:28 ` Rob Clark
2014-03-26 21:21 ` Greg Hackmann
2014-03-26 10:08 ` Daniel Vetter
2014-03-26 21:33 ` Greg Hackmann
2014-03-26 22:33 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395177773-800-6-git-send-email-robdclark@gmail.com \
--to=robdclark@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox