Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26a34815 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Dave Airlie
Browse files

drm: add drm_property_change_is_valid 



Move code from drm_mode_connector_property_set_ioctl to a new
function, so we can reuse this code when we add crtc properties.

Reviewed-by: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: default avatarRob Clark <rob.clark@linaro.org>
Tested-by: default avatarRob Clark <rob.clark@linaro.org>
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 4ab2c7f1

drivers/gpu/drm/drm_crtc.c

+19 −20
Original line number Diff line number Diff line
@@ -3074,6 +3074,24 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector, 
}

EXPORT_SYMBOL(drm_mode_connector_update_edid_property);



static bool drm_property_change_is_valid(struct drm_property *property,

					 __u64 value)

{

	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;

		return true;

	} else {

		int i;

		for (i = 0; i < property->num_values; i++)

			if (property->values[i] == value)

				return true;

		return false;

	}

}



int drm_mode_connector_property_set_ioctl(struct drm_device *dev,

				       void *data, struct drm_file *file_priv)

{
@@ -3110,27 +3128,8 @@ int drm_mode_connector_property_set_ioctl(struct drm_device *dev, 
	}

	property = obj_to_property(obj);



	if (property->flags & DRM_MODE_PROP_IMMUTABLE)

		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) {

	if (!drm_property_change_is_valid(property, out_resp->value))

		goto out;

		}

	}



	/* Do DPMS ourselves */

	if (property == connector->dev->mode_config.dpms_property) {