From: Paulo Zanoni <przanoni@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH 1/5] drm: add drm_property_change_is_valid
Date: Tue, 20 Mar 2012 11:48:28 -0300 [thread overview]
Message-ID: <1332254912-4352-1-git-send-email-przanoni@gmail.com> (raw)
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
Move code from drm_mode_connector_property_set_ioctl to a new
function, so we can reuse this code when we add crtc properties.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
drivers/gpu/drm/drm_crtc.c | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 6fdaf6f..1cadc11 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -2910,6 +2910,26 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
}
EXPORT_SYMBOL(drm_mode_connector_update_edid_property);
+static int drm_property_change_is_valid(struct drm_property *property,
+ __u64 value)
+{
+ if (property->flags & DRM_MODE_PROP_IMMUTABLE)
+ return 0;
+ if (property->flags & DRM_MODE_PROP_RANGE) {
+ if (value < property->values[0])
+ return 0;
+ if (value > property->values[1])
+ return 0;
+ return 1;
+ } else {
+ int i;
+ for (i = 0; i < property->num_values; i++)
+ if (property->values[i] == value)
+ return 1;
+ return 0;
+ }
+}
+
int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
void *data, struct drm_file *file_priv)
{
@@ -2946,28 +2966,9 @@ int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
}
property = obj_to_property(obj);
- if (property->flags & DRM_MODE_PROP_IMMUTABLE)
+ if (!drm_property_change_is_valid(property, out_resp->value))
goto out;
- if (property->flags & DRM_MODE_PROP_RANGE) {
- if (out_resp->value < property->values[0])
- goto out;
-
- if (out_resp->value > property->values[1])
- goto out;
- } else {
- int found = 0;
- for (i = 0; i < property->num_values; i++) {
- if (property->values[i] == out_resp->value) {
- found = 1;
- break;
- }
- }
- if (!found) {
- goto out;
- }
- }
-
/* Do DPMS ourselves */
if (property == connector->dev->mode_config.dpms_property) {
if (connector->funcs->dpms)
--
1.7.9.1
next reply other threads:[~2012-03-20 14:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-20 14:48 Paulo Zanoni [this message]
2012-03-20 14:48 ` [PATCH 2/5] drm: WARN() when drm_connector_attach_property fails Paulo Zanoni
2012-03-20 14:48 ` [PATCH 3/5] drm: add CRTC properties Paulo Zanoni
2012-03-20 15:00 ` Rob Clark
2012-03-20 15:09 ` Alex Deucher
2012-03-20 15:48 ` Daniel Vetter
2012-03-20 14:48 ` [PATCH 4/5] drm/i915: add 'rotation' CRTC property Paulo Zanoni
2012-03-20 16:48 ` Marcus Lorentzon
2012-03-20 18:49 ` Ville Syrjälä
2012-03-20 14:48 ` [PATCH 5/5] drm/i915: add overscan compensation CRTC properties Paulo Zanoni
2012-03-20 15:00 ` Alex Deucher
2012-03-20 15:37 ` [PATCH 1/5] drm: add drm_property_change_is_valid Ville Syrjälä
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=1332254912-4352-1-git-send-email-przanoni@gmail.com \
--to=przanoni@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=paulo.r.zanoni@intel.com \
/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.