UPSTREAM: drm: create struct drm_object_properties and use it

For now, only connectors have it. In the future, all objects that need
properties should use it. Since the structure is referenced inside
struct drm_mode_object, we will be able to deal with object properties
without knowing the real type of the object.

Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: Rob Clark <rob.clark@linaro.org>
Tested-by: Rob Clark <rob.clark@linaro.org>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit 7e3bdf4a6dca9eb153cc20d69d717308a68bec00)

BUG=chrome-os-partner:17074
TEST=Use hardware cursor with kernel v3.8 and v3.4 and no flicker on screen.

Change-Id: Ic125db59d6c7a4d11671f5f3529a7bf409367e87
Signed-off-by: Prathyush K <prathyush.k@samsung.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/40511
Tested-by: Prathyush Kalashwaram <prathyush@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Commit-Queue: Stéphane Marchesin <marcheu@chromium.org>

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 69858ad..f21c14f 100644 (file)
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -481,6 +481,7 @@ int drm_connector_init(struct drm_device *dev,
        if (ret)
                goto out;
 
+       connector->base.properties = &connector->properties;
        connector->dev = dev;
        connector->funcs = funcs;
        connector->connector_type = connector_type;
@@ -1473,8 +1474,8 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
        }
        connector = obj_to_connector(obj);
 
-       for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
-               if (connector->property_ids[i] != 0) {
+       for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++) {
+               if (connector->properties.ids[i] != 0) {
                        props_count++;
                }
        }
@@ -1530,15 +1531,15 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
                copied = 0;
                prop_ptr = (uint32_t __user *)(unsigned long)(out_resp->props_ptr);
                prop_values = (uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr);
-               for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
-                       if (connector->property_ids[i] != 0) {
-                               if (put_user(connector->property_ids[i],
+               for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++) {
+                       if (connector->properties.ids[i] != 0) {
+                               if (put_user(connector->properties.ids[i],
                                             prop_ptr + copied)) {
                                        ret = -EFAULT;
                                        goto out;
                                }
 
-                               if (put_user(connector->property_values[i],
+                               if (put_user(connector->properties.values[i],
                                             prop_values + copied)) {
                                        ret = -EFAULT;
                                        goto out;
@@ -2835,16 +2836,16 @@ void drm_connector_attach_property(struct drm_connector *connector,
 {
        int i;
 
-       for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
-               if (connector->property_ids[i] == 0) {
-                       connector->property_ids[i] = property->base.id;
-                       connector->property_values[i] = init_val;
+       for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++) {
+               if (connector->properties.ids[i] == 0) {
+                       connector->properties.ids[i] = property->base.id;
+                       connector->properties.values[i] = init_val;
                        return;
                }
        }
 
        WARN(1, "Failed to attach connector property. Please increase "
-               "DRM_CONNECTOR_MAX_PROPERTY by 1 for each time you see this "
+               "DRM_OBJECT_MAX_PROPERTY by 1 for each time you see this "
                "message\n");
 }
 EXPORT_SYMBOL(drm_connector_attach_property);
@@ -2854,14 +2855,14 @@ int drm_connector_property_set_value(struct drm_connector *connector,
 {
        int i;
 
-       for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
-               if (connector->property_ids[i] == property->base.id) {
-                       connector->property_values[i] = value;
+       for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++) {
+               if (connector->properties.ids[i] == property->base.id) {
+                       connector->properties.values[i] = value;
                        break;
                }
        }
 
-       if (i == DRM_CONNECTOR_MAX_PROPERTY)
+       if (i == DRM_OBJECT_MAX_PROPERTY)
                return -EINVAL;
        return 0;
 }
@@ -2872,14 +2873,14 @@ int drm_connector_property_get_value(struct drm_connector *connector,
 {
        int i;
 
-       for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
-               if (connector->property_ids[i] == property->base.id) {
-                       *val = connector->property_values[i];
+       for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++) {
+               if (connector->properties.ids[i] == property->base.id) {
+                       *val = connector->properties.values[i];
                        break;
                }
        }
 
-       if (i == DRM_CONNECTOR_MAX_PROPERTY)
+       if (i == DRM_OBJECT_MAX_PROPERTY)
                return -EINVAL;
        return 0;
 }
@@ -3124,12 +3125,12 @@ int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
        }
        connector = obj_to_connector(obj);
 
-       for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
-               if (connector->property_ids[i] == out_resp->prop_id)
+       for (i = 0; i < DRM_OBJECT_MAX_PROPERTY; i++) {
+               if (connector->properties.ids[i] == out_resp->prop_id)
                        break;
        }
 
-       if (i == DRM_CONNECTOR_MAX_PROPERTY) {
+       if (i == DRM_OBJECT_MAX_PROPERTY) {
                goto out;
        }
 

diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 04b16c5..2df5db6 100644 (file)
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -36,6 +36,7 @@
 struct drm_device;
 struct drm_mode_set;
 struct drm_framebuffer;
+struct drm_object_properties;
 
 
 #define DRM_MODE_OBJECT_CRTC 0xcccccccc
@@ -51,6 +52,13 @@ struct drm_framebuffer;
 struct drm_mode_object {
        uint32_t id;
        uint32_t type;
+       struct drm_object_properties *properties;
+};
+
+#define DRM_OBJECT_MAX_PROPERTY 16
+struct drm_object_properties {
+       uint32_t ids[DRM_OBJECT_MAX_PROPERTY];
+       uint64_t values[DRM_OBJECT_MAX_PROPERTY];
 };
 
 /*
@@ -453,7 +461,6 @@ struct drm_encoder_funcs {
 };
 
 #define DRM_CONNECTOR_MAX_UMODES 16
-#define DRM_CONNECTOR_MAX_PROPERTY 16
 #define DRM_CONNECTOR_LEN 32
 #define DRM_CONNECTOR_MAX_ENCODER 3
 
@@ -522,8 +529,7 @@ enum drm_connector_force {
  * @funcs: connector control functions
  * @user_modes: user added mode list
  * @edid_blob_ptr: DRM property containing EDID if present
- * @property_ids: property tracking for this connector
- * @property_values: value pointers or data for properties
+ * @properties: property tracking for this connector
  * @polled: a %DRM_CONNECTOR_POLL_<foo> value for core driven polling
  * @dpms: current dpms state
  * @helper_private: mid-layer private data
@@ -568,8 +574,7 @@ struct drm_connector {
 
        struct list_head user_modes;
        struct drm_property_blob *edid_blob_ptr;
-       u32 property_ids[DRM_CONNECTOR_MAX_PROPERTY];
-       uint64_t property_values[DRM_CONNECTOR_MAX_PROPERTY];
+       struct drm_object_properties properties;
 
        uint8_t polled; /* DRM_CONNECTOR_POLL_* */