drm: Make the CRTC gamma_set operation optional

[GitHub/LineageOS/android_kernel_samsung_universal7580.git] / drivers / gpu / drm / drm_crtc.c

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 368e3e72a4525bf1748b14bc5af51d8a95059111..6cb47d9f0ca2603de2d3af1f859419d65151ef1c 100644 (file)
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -363,7 +363,7 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup);
  * @funcs: callbacks for the new CRTC
  *
  * LOCKING:
- * Caller must hold mode config lock.
+ * Takes mode_config lock.
  *
  * Inits a new object created as base part of an driver crtc object.
  *
@@ -384,6 +384,8 @@ int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
        if (ret)
                goto out;
 
+       crtc->base.properties = &crtc->properties;
+
        list_add_tail(&crtc->head, &dev->mode_config.crtc_list);
        dev->mode_config.num_crtc++;
 
@@ -1827,7 +1829,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
        struct drm_display_mode *mode = NULL;
        struct drm_mode_set set;
        uint32_t __user *set_connectors_ptr;
-       int ret = 0;
+       int ret;
        int i;
 
        if (!drm_core_check_feature(dev, DRIVER_MODESET))
@@ -2246,7 +2248,7 @@ int drm_mode_addfb2(struct drm_device *dev,
        struct drm_mode_fb_cmd2 *r = data;
        struct drm_mode_config *config = &dev->mode_config;
        struct drm_framebuffer *fb;
-       int ret = 0;
+       int ret;
 
        if (!drm_core_check_feature(dev, DRIVER_MODESET))
                return -EINVAL;
@@ -2401,7 +2403,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
        struct drm_framebuffer *fb;
        unsigned flags;
        int num_clips;
-       int ret = 0;
+       int ret;
 
        if (!drm_core_check_feature(dev, DRIVER_MODESET))
                return -EINVAL;
@@ -2600,7 +2602,7 @@ int drm_mode_attachmode_ioctl(struct drm_device *dev,
        struct drm_display_mode *mode;
        struct drm_mode_object *obj;
        struct drm_mode_modeinfo *umode = &mode_cmd->mode;
-       int ret = 0;
+       int ret;
 
        if (!drm_core_check_feature(dev, DRIVER_MODESET))
                return -EINVAL;
@@ -2654,7 +2656,7 @@ int drm_mode_detachmode_ioctl(struct drm_device *dev,
        struct drm_connector *connector;
        struct drm_display_mode mode;
        struct drm_mode_modeinfo *umode = &mode_cmd->mode;
-       int ret = 0;
+       int ret;
 
        if (!drm_core_check_feature(dev, DRIVER_MODESET))
                return -EINVAL;
@@ -3063,7 +3065,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
                                            struct edid *edid)
 {
        struct drm_device *dev = connector->dev;
-       int ret = 0, size;
+       int ret, size;
 
        if (connector->edid_blob_ptr)
                drm_property_destroy_blob(dev, connector->edid_blob_ptr);
@@ -3141,6 +3143,21 @@ static int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
        return ret;
 }
 
+static int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,
+                                     struct drm_property *property,
+                                     uint64_t value)
+{
+       int ret = -EINVAL;
+       struct drm_crtc *crtc = obj_to_crtc(obj);
+
+       if (crtc->funcs->set_property)
+               ret = crtc->funcs->set_property(crtc, property, value);
+       if (!ret)
+               drm_object_property_set_value(obj, property, value);
+
+       return ret;
+}
+
 int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,
                                      struct drm_file *file_priv)
 {
@@ -3239,6 +3256,9 @@ int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data,
                ret = drm_mode_connector_set_obj_prop(arg_obj, property,
                                                      arg->value);
                break;
+       case DRM_MODE_OBJECT_CRTC:
+               ret = drm_mode_crtc_set_obj_prop(arg_obj, property, arg->value);
+               break;
        }
 
 out:
@@ -3312,6 +3332,11 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev,
        }
        crtc = obj_to_crtc(obj);
 
+       if (crtc->funcs->gamma_set == NULL) {
+               ret = -ENOSYS;
+               goto out;
+       }
+
        /* memcpy into gamma store */
        if (crtc_lut->gamma_size != crtc->gamma_size) {
                ret = -EINVAL;