From: Rob Clark <robdclark@gmail.com>
To: dri-devel@lists.freedesktop.org
Subject: [RFCv3 05/14] drm: add DRM_MODE_PROP_SIGNED property flag
Date: Wed, 20 Nov 2013 15:48:04 -0500 [thread overview]
Message-ID: <1384980493-25499-6-git-send-email-robdclark@gmail.com> (raw)
In-Reply-To: <1384980493-25499-1-git-send-email-robdclark@gmail.com>
Flag for range property types indicating that the value is a signed
integer rather than unsigned. For range properties, the signed flag
will trigger use of signed integer comparisions, to handle negative
values properly.
---
drivers/gpu/drm/drm_crtc.c | 15 +++++++++++----
include/drm/drm_crtc.h | 9 +++++++++
include/uapi/drm/drm_mode.h | 2 ++
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 4d33816..61ce72d 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -3263,11 +3263,18 @@ EXPORT_SYMBOL(drm_mode_connector_update_edid_property);
static bool drm_property_change_is_valid(struct drm_property *property,
uint64_t value)
{
- if (property->flags & DRM_MODE_PROP_IMMUTABLE)
+ if (property->flags & DRM_MODE_PROP_IMMUTABLE) {
return false;
- if (property->flags & DRM_MODE_PROP_RANGE) {
- if (value < property->values[0] || value > property->values[1])
- return false;
+ } else if (property->flags & DRM_MODE_PROP_RANGE) {
+ if (property->flags & DRM_MODE_PROP_SIGNED) {
+ int64_t svalue = U642I64(value);
+ if (svalue < U642I64(property->values[0]) ||
+ svalue > U642I64(property->values[1]))
+ return false;
+ } else {
+ if (value < property->values[0] || value > property->values[1])
+ return false;
+ }
return true;
} else if (property->flags & DRM_MODE_PROP_BITMASK) {
int i;
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 4141074..a9b9977 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -65,6 +65,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,
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
index 536897a..9fed70e 100644
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -260,6 +260,8 @@ struct drm_mode_get_connector {
* be changed dynamically, assuming the pixel format does not change.
*/
#define DRM_MODE_PROP_DYNAMIC (1<<24)
+/* Indicates that numeric property values are signed rather than unsigned: */
+#define DRM_MODE_PROP_SIGNED (1<<25)
struct drm_mode_property_enum {
__u64 value;
--
1.8.4.2
next prev parent reply other threads:[~2013-11-20 20:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-20 20:47 [RFCv3 00/14] Atomic/nuclear modeset/pageflip Rob Clark
2013-11-20 20:48 ` [RFCv3 01/14] drm: add atomic fxns Rob Clark
2013-11-20 20:48 ` [RFCv3 02/14] drm: convert crtc to ww_mutex Rob Clark
2013-11-21 14:11 ` Maarten Lankhorst
2013-11-21 15:12 ` Rob Clark
2013-11-20 20:48 ` [RFCv3 03/14] drm: add object property type Rob Clark
2013-11-20 20:48 ` [RFCv3 04/14] drm: add DRM_MODE_PROP_DYNAMIC property flag Rob Clark
2013-11-20 20:48 ` Rob Clark [this message]
2013-11-20 20:48 ` [RFCv3 06/14] drm: helpers to find mode objects Rob Clark
2013-11-20 20:48 ` [RFCv3 07/14] drm: split propvals out and blob property support Rob Clark
2013-11-20 20:48 ` [RFCv3 08/14] drm: Allow drm_mode_object_find() to look up an object of any type Rob Clark
2013-11-20 20:48 ` [RFCv3 09/14] drm: Refactor object property check code Rob Clark
2013-11-20 20:48 ` [RFCv3 10/14] drm: convert plane to properties/state Rob Clark
2013-11-20 20:48 ` [RFCv3 11/14] drm: convert crtc " Rob Clark
2013-11-21 14:25 ` Maarten Lankhorst
2013-11-20 20:48 ` [RFCv3 12/14] drm: Atomic modeset ioctl Rob Clark
2013-11-22 8:35 ` Inki Dae
2013-11-22 12:34 ` Rob Clark
2013-11-20 20:48 ` [RFCv3 13/14] drm/msm: add atomic support Rob Clark
2013-11-20 20:48 ` [RFCv3 14/14] HACK: drm: allow FB's in drm_mode_object_find Rob Clark
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=1384980493-25499-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.