From: Rob Clark <robdclark@gmail.com>
To: dri-devel@lists.freedesktop.org
Subject: [RFCv2 05/13] drm: add DRM_MODE_PROP_SIGNED property flag
Date: Mon, 14 Oct 2013 13:26:40 -0400 [thread overview]
Message-ID: <1381771608-15237-6-git-send-email-robdclark@gmail.com> (raw)
In-Reply-To: <1381771608-15237-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 471cf16..bf7a44b 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -3211,11 +3211,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 77c8f11..e042d12 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -64,6 +64,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 15db837..6d4f089 100644
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -241,6 +241,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.3.1
next prev parent reply other threads:[~2013-10-14 17:27 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-14 17:26 [RFCv2 00/13] Atomic/nuclear modeset/pageflip Rob Clark
2013-10-14 17:26 ` [RFCv2 01/13] HACK: disable drm for M68K.. no 8 byte get_user() Rob Clark
2013-10-14 17:26 ` [RFCv2 02/13] drm: add atomic fxns Rob Clark
2013-10-14 17:26 ` [RFCv2 03/13] drm: add object property type Rob Clark
2013-10-14 17:26 ` [RFCv2 04/13] drm: add DRM_MODE_PROP_DYNAMIC property flag Rob Clark
2013-10-14 17:26 ` Rob Clark [this message]
2013-10-14 17:26 ` [RFCv2 06/13] drm: helpers to find mode objects Rob Clark
2013-10-14 17:26 ` [RFCv2 07/13] drm: split propvals out and blob property support Rob Clark
2013-10-14 17:26 ` [RFCv2 08/13] drm: Allow drm_mode_object_find() to look up an object of any type Rob Clark
2013-10-14 17:26 ` [RFCv2 09/13] drm: Refactor object property check code Rob Clark
2013-10-14 17:26 ` [RFCv2 10/13] drm: convert plane to properties/state Rob Clark
2013-10-24 21:48 ` Matt Roper
2013-10-24 23:43 ` Rob Clark
2013-10-14 17:26 ` [RFCv2 11/13] drm: convert crtc " Rob Clark
2013-10-22 22:27 ` Matt Roper
2013-10-23 1:13 ` Rob Clark
2013-10-14 17:26 ` [RFCv2 12/13] drm: Atomic modeset ioctl Rob Clark
2013-10-14 17:26 ` [RFCv2 13/13] drm/msm: add atomic support 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=1381771608-15237-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;
as well as URLs for NNTP newsgroup(s).