diff mbox

[11/11] drm: Set property to return invalid for unsupported arguments for bitmask property

Message ID 1391195447-8744-12-git-send-email-sagar.a.kamble@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

sagar.a.kamble@intel.com Jan. 31, 2014, 7:10 p.m. UTC
From: Sagar Kamble <sagar.a.kamble@intel.com>

DRM will not propagate the set_property call for bitmask drm
properties if they are not supported by underlying driver.

Signed-off-by: Sagar Kamble <sagar.a.kamble@intel.com>
Tested-by: Sagar Kamble <sagar.a.kamble@intel.com>
---
 drivers/gpu/drm/drm_crtc.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
diff mbox

Patch

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 4f5e408..4c92741 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -3420,6 +3420,8 @@  int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data,
 	struct drm_mode_object *arg_obj;
 	struct drm_mode_object *prop_obj;
 	struct drm_property *property;
+	struct drm_property_enum *prop_enum;
+	bool supported_val = false;
 	int ret = -EINVAL;
 	int i;
 
@@ -3451,6 +3453,22 @@  int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data,
 	}
 	property = obj_to_property(prop_obj);
 
+	if (property->flags | DRM_MODE_PROP_BITMASK) {
+		if (!list_empty(&property->enum_blob_list)) {
+			list_for_each_entry(prop_enum,
+					&property->enum_blob_list, head) {
+				if (BIT(prop_enum->value) == arg->value) {
+					supported_val = true;
+					break;
+				}
+			}
+		}
+		if (!supported_val) {
+			ret = -EINVAL;
+			goto out;
+		}
+	}
+
 	if (!drm_property_change_is_valid(property, arg->value))
 		goto out;