drm/i915: drm_connector_property -> drm_object_property

v2: Rebased.

Signed-off-by: Rob Clark <rob@ti.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com> (v1)
[danvet: Pimp commit message a bit.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 37ba35a..3f7f62d 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7607,7 +7607,7 @@ intel_modeset_update_state(struct drm_device *dev, unsigned prepare_pipes)
                                dev->mode_config.dpms_property;
 
                        connector->dpms = DRM_MODE_DPMS_ON;
-                       drm_connector_property_set_value(connector,
+                       drm_object_property_set_value(&connector->base,
                                                         dpms_property,
                                                         DRM_MODE_DPMS_ON);
 

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index a9ba88a..d76258d 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2393,7 +2393,7 @@ intel_dp_set_property(struct drm_connector *connector,
        struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base);
        int ret;
 
-       ret = drm_connector_property_set_value(connector, property, val);
+       ret = drm_object_property_set_value(&connector->base, property, val);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 1dcfd5b..5c279b4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -874,7 +874,7 @@ intel_hdmi_set_property(struct drm_connector *connector,
        struct drm_i915_private *dev_priv = connector->dev->dev_private;
        int ret;
 
-       ret = drm_connector_property_set_value(connector, property, val);
+       ret = drm_object_property_set_value(&connector->base, property, val);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index d831882..506cfbd 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -1016,7 +1016,7 @@ bool intel_lvds_init(struct drm_device *dev)
 
        /* create the scaling mode property */
        drm_mode_create_scaling_mode_property(dev);
-       drm_connector_attach_property(&intel_connector->base,
+       drm_object_attach_property(&connector->base,
                                      dev->mode_config.scaling_mode_property,
                                      DRM_MODE_SCALE_ASPECT);
        intel_connector->panel.fitting_mode = DRM_MODE_SCALE_ASPECT;

diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
index d49985f..b00f1c8 100644 (file)
--- a/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@ -97,7 +97,7 @@ intel_attach_force_audio_property(struct drm_connector *connector)
 
                dev_priv->force_audio_property = prop;
        }
-       drm_connector_attach_property(connector, prop, 0);
+       drm_object_attach_property(&connector->base, prop, 0);
 }
 
 static const struct drm_prop_enum_list broadcast_rgb_names[] = {
@@ -124,5 +124,5 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector)
                dev_priv->broadcast_rgb_property = prop;
        }
 
-       drm_connector_attach_property(connector, prop, 0);
+       drm_object_attach_property(&connector->base, prop, 0);
 }

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 7ad7e4e..d85ebb0 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1864,7 +1864,7 @@ intel_sdvo_set_property(struct drm_connector *connector,
        uint8_t cmd;
        int ret;
 
-       ret = drm_connector_property_set_value(connector, property, val);
+       ret = drm_object_property_set_value(&connector->base, property, val);
        if (ret)
                return ret;
 
@@ -1919,7 +1919,7 @@ intel_sdvo_set_property(struct drm_connector *connector,
        } else if (IS_TV_OR_LVDS(intel_sdvo_connector)) {
                temp_value = val;
                if (intel_sdvo_connector->left == property) {
-                       drm_connector_property_set_value(connector,
+                       drm_object_property_set_value(&connector->base,
                                                         intel_sdvo_connector->right, val);
                        if (intel_sdvo_connector->left_margin == temp_value)
                                return 0;
@@ -1931,7 +1931,7 @@ intel_sdvo_set_property(struct drm_connector *connector,
                        cmd = SDVO_CMD_SET_OVERSCAN_H;
                        goto set_value;
                } else if (intel_sdvo_connector->right == property) {
-                       drm_connector_property_set_value(connector,
+                       drm_object_property_set_value(&connector->base,
                                                         intel_sdvo_connector->left, val);
                        if (intel_sdvo_connector->right_margin == temp_value)
                                return 0;
@@ -1943,7 +1943,7 @@ intel_sdvo_set_property(struct drm_connector *connector,
                        cmd = SDVO_CMD_SET_OVERSCAN_H;
                        goto set_value;
                } else if (intel_sdvo_connector->top == property) {
-                       drm_connector_property_set_value(connector,
+                       drm_object_property_set_value(&connector->base,
                                                         intel_sdvo_connector->bottom, val);
                        if (intel_sdvo_connector->top_margin == temp_value)
                                return 0;
@@ -1955,7 +1955,7 @@ intel_sdvo_set_property(struct drm_connector *connector,
                        cmd = SDVO_CMD_SET_OVERSCAN_V;
                        goto set_value;
                } else if (intel_sdvo_connector->bottom == property) {
-                       drm_connector_property_set_value(connector,
+                       drm_object_property_set_value(&connector->base,
                                                         intel_sdvo_connector->top, val);
                        if (intel_sdvo_connector->bottom_margin == temp_value)
                                return 0;
@@ -2465,7 +2465,7 @@ static bool intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo,
                                i, tv_format_names[intel_sdvo_connector->tv_format_supported[i]]);
 
        intel_sdvo->tv_format_index = intel_sdvo_connector->tv_format_supported[0];
-       drm_connector_attach_property(&intel_sdvo_connector->base.base,
+       drm_object_attach_property(&intel_sdvo_connector->base.base.base,
                                      intel_sdvo_connector->tv_format, 0);
        return true;
 
@@ -2481,7 +2481,7 @@ static bool intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo,
                intel_sdvo_connector->name = \
                        drm_property_create_range(dev, 0, #name, 0, data_value[0]); \
                if (!intel_sdvo_connector->name) return false; \
-               drm_connector_attach_property(connector, \
+               drm_object_attach_property(&connector->base, \
                                              intel_sdvo_connector->name, \
                                              intel_sdvo_connector->cur_##name); \
                DRM_DEBUG_KMS(#name ": max %d, default %d, current %d\n", \
@@ -2518,7 +2518,7 @@ intel_sdvo_create_enhance_property_tv(struct intel_sdvo *intel_sdvo,
                if (!intel_sdvo_connector->left)
                        return false;
 
-               drm_connector_attach_property(connector,
+               drm_object_attach_property(&connector->base,
                                              intel_sdvo_connector->left,
                                              intel_sdvo_connector->left_margin);
 
@@ -2527,7 +2527,7 @@ intel_sdvo_create_enhance_property_tv(struct intel_sdvo *intel_sdvo,
                if (!intel_sdvo_connector->right)
                        return false;
 
-               drm_connector_attach_property(connector,
+               drm_object_attach_property(&connector->base,
                                              intel_sdvo_connector->right,
                                              intel_sdvo_connector->right_margin);
                DRM_DEBUG_KMS("h_overscan: max %d, "
@@ -2555,7 +2555,7 @@ intel_sdvo_create_enhance_property_tv(struct intel_sdvo *intel_sdvo,
                if (!intel_sdvo_connector->top)
                        return false;
 
-               drm_connector_attach_property(connector,
+               drm_object_attach_property(&connector->base,
                                              intel_sdvo_connector->top,
                                              intel_sdvo_connector->top_margin);
 
@@ -2565,7 +2565,7 @@ intel_sdvo_create_enhance_property_tv(struct intel_sdvo *intel_sdvo,
                if (!intel_sdvo_connector->bottom)
                        return false;
 
-               drm_connector_attach_property(connector,
+               drm_object_attach_property(&connector->base,
                                              intel_sdvo_connector->bottom,
                                              intel_sdvo_connector->bottom_margin);
                DRM_DEBUG_KMS("v_overscan: max %d, "
@@ -2597,7 +2597,7 @@ intel_sdvo_create_enhance_property_tv(struct intel_sdvo *intel_sdvo,
                if (!intel_sdvo_connector->dot_crawl)
                        return false;
 
-               drm_connector_attach_property(connector,
+               drm_object_attach_property(&connector->base,
                                              intel_sdvo_connector->dot_crawl,
                                              intel_sdvo_connector->cur_dot_crawl);
                DRM_DEBUG_KMS("dot crawl: current %d\n", response);

diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 86d5c20..ea93520 100644 (file)
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1289,7 +1289,7 @@ static void intel_tv_find_better_format(struct drm_connector *connector)
        }
 
        intel_tv->tv_format = tv_mode->name;
-       drm_connector_property_set_value(connector,
+       drm_object_property_set_value(&connector->base,
                connector->dev->mode_config.tv_mode_property, i);
 }
 
@@ -1443,7 +1443,7 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop
        int ret = 0;
        bool changed = false;
 
-       ret = drm_connector_property_set_value(connector, property, val);
+       ret = drm_object_property_set_value(&connector->base, property, val);
        if (ret < 0)
                goto out;
 
@@ -1655,18 +1655,18 @@ intel_tv_init(struct drm_device *dev)
                                      ARRAY_SIZE(tv_modes),
                                      tv_format_names);
 
-       drm_connector_attach_property(connector, dev->mode_config.tv_mode_property,
+       drm_object_attach_property(&connector->base, dev->mode_config.tv_mode_property,
                                   initial_mode);
-       drm_connector_attach_property(connector,
+       drm_object_attach_property(&connector->base,
                                   dev->mode_config.tv_left_margin_property,
                                   intel_tv->margin[TV_MARGIN_LEFT]);
-       drm_connector_attach_property(connector,
+       drm_object_attach_property(&connector->base,
                                   dev->mode_config.tv_top_margin_property,
                                   intel_tv->margin[TV_MARGIN_TOP]);
-       drm_connector_attach_property(connector,
+       drm_object_attach_property(&connector->base,
                                   dev->mode_config.tv_right_margin_property,
                                   intel_tv->margin[TV_MARGIN_RIGHT]);
-       drm_connector_attach_property(connector,
+       drm_object_attach_property(&connector->base,
                                   dev->mode_config.tv_bottom_margin_property,
                                   intel_tv->margin[TV_MARGIN_BOTTOM]);
        drm_sysfs_connector_add(connector);