[PATCH 1/9] drm/i915: drm_connector_property -> drm_object_property
Jani Nikula
jani.nikula at linux.intel.com
Sun Oct 14 23:59:01 PDT 2012
On Fri, 12 Oct 2012, Rob Clark <rob.clark at linaro.org> wrote:
> From: Rob Clark <rob at ti.com>
Nitpick: no commit message, and subject fails to mention
drm_connector_attach_property -> drm_object_attach_property. Regardless,
for this patch,
Reviewed-by: Jani Nikula <jani.nikula at intel.com>
> Signed-off-by: Rob Clark <rob at ti.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 2 +-
> drivers/gpu/drm/i915/intel_dp.c | 2 +-
> drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
> drivers/gpu/drm/i915/intel_lvds.c | 2 +-
> drivers/gpu/drm/i915/intel_modes.c | 4 ++--
> drivers/gpu/drm/i915/intel_sdvo.c | 24 ++++++++++++------------
> drivers/gpu/drm/i915/intel_tv.c | 14 +++++++-------
> 7 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 4716c83..06d4efa 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6840,7 +6840,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 1474f84..af0122a 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -2280,7 +2280,7 @@ intel_dp_set_property(struct drm_connector *connector,
> struct intel_dp *intel_dp = intel_attached_dp(connector);
> 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 08f2b63..ff9e568 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -863,7 +863,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 40d72bd..4d5b8a5 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -990,7 +990,7 @@ bool intel_lvds_init(struct drm_device *dev)
> * the initial panel fitting mode will be FULL_SCREEN.
> */
>
> - drm_connector_attach_property(&intel_connector->base,
> + drm_object_attach_property(&connector->base,
> dev->mode_config.scaling_mode_property,
> DRM_MODE_SCALE_ASPECT);
> intel_lvds->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 4bc1c0f..c140bc2 100644
> --- a/drivers/gpu/drm/i915/intel_modes.c
> +++ b/drivers/gpu/drm/i915/intel_modes.c
> @@ -94,7 +94,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[] = {
> @@ -121,5 +121,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 39c3198..f8b94ac 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -1799,7 +1799,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;
>
> @@ -1854,7 +1854,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;
> @@ -1866,7 +1866,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;
> @@ -1878,7 +1878,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;
> @@ -1890,7 +1890,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;
> @@ -2395,7 +2395,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;
>
> @@ -2411,7 +2411,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", \
> @@ -2448,7 +2448,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);
>
> @@ -2457,7 +2457,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, "
> @@ -2485,7 +2485,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);
>
> @@ -2495,7 +2495,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, "
> @@ -2527,7 +2527,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 d2c5c8f..ba88044 100644
> --- a/drivers/gpu/drm/i915/intel_tv.c
> +++ b/drivers/gpu/drm/i915/intel_tv.c
> @@ -1293,7 +1293,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);
> }
>
> @@ -1447,7 +1447,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;
>
> @@ -1659,18 +1659,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);
> --
> 1.7.9.5
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
More information about the dri-devel
mailing list