* [PATCH 1/9] drm/i915: drm_connector_property -> drm_object_property
2012-10-12 2:05 [PATCH 0/9] cleanup: remove legacy connector property functions Rob Clark
@ 2012-10-12 2:05 ` Rob Clark
2012-10-15 6:59 ` Jani Nikula
2012-11-21 21:13 ` Daniel Vetter
2012-10-12 2:05 ` [PATCH 2/9] drm/gma500: " Rob Clark
` (8 subsequent siblings)
9 siblings, 2 replies; 15+ messages in thread
From: Rob Clark @ 2012-10-12 2:05 UTC (permalink / raw)
To: dri-devel
Cc: patches, daniel.vetter, laurent.pinchart, alexander.deucher,
Rob Clark, alan, bskeggs
From: Rob Clark <rob@ti.com>
Signed-off-by: Rob Clark <rob@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
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 1/9] drm/i915: drm_connector_property -> drm_object_property
2012-10-12 2:05 ` [PATCH 1/9] drm/i915: drm_connector_property -> drm_object_property Rob Clark
@ 2012-10-15 6:59 ` Jani Nikula
2012-11-21 16:42 ` Daniel Vetter
2012-11-21 21:13 ` Daniel Vetter
1 sibling, 1 reply; 15+ messages in thread
From: Jani Nikula @ 2012-10-15 6:59 UTC (permalink / raw)
To: Rob Clark, dri-devel
Cc: patches, daniel.vetter, bskeggs, laurent.pinchart,
alexander.deucher, Rob Clark, alan
On Fri, 12 Oct 2012, Rob Clark <rob.clark@linaro.org> wrote:
> From: Rob Clark <rob@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@intel.com>
> Signed-off-by: Rob Clark <rob@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@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 1/9] drm/i915: drm_connector_property -> drm_object_property
2012-10-15 6:59 ` Jani Nikula
@ 2012-11-21 16:42 ` Daniel Vetter
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Vetter @ 2012-11-21 16:42 UTC (permalink / raw)
To: Jani Nikula
Cc: patches, daniel.vetter, dri-devel, Rob Clark, bskeggs,
laurent.pinchart, alexander.deucher, Rob Clark, alan
On Mon, Oct 15, 2012 at 09:59:01AM +0300, Jani Nikula wrote:
> On Fri, 12 Oct 2012, Rob Clark <rob.clark@linaro.org> wrote:
> > From: Rob Clark <rob@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@intel.com>
I've tried to apply this to the latest drm-intel-next-queued and it
conflicted. We don't have anything in-flight atm which would conflict with
this, so can I bother you for a rebase?
Thanks, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/9] drm/i915: drm_connector_property -> drm_object_property
2012-10-12 2:05 ` [PATCH 1/9] drm/i915: drm_connector_property -> drm_object_property Rob Clark
2012-10-15 6:59 ` Jani Nikula
@ 2012-11-21 21:13 ` Daniel Vetter
1 sibling, 0 replies; 15+ messages in thread
From: Daniel Vetter @ 2012-11-21 21:13 UTC (permalink / raw)
To: Rob Clark
Cc: patches, daniel.vetter, dri-devel, laurent.pinchart,
alexander.deucher, Rob Clark, alan, bskeggs
On Thu, Oct 11, 2012 at 09:05:54PM -0500, Rob Clark wrote:
> From: Rob Clark <rob@ti.com>
>
> Signed-off-by: Rob Clark <rob@ti.com>
I've just merged the rebase version of this, thanks.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 2/9] drm/gma500: drm_connector_property -> drm_object_property
2012-10-12 2:05 [PATCH 0/9] cleanup: remove legacy connector property functions Rob Clark
2012-10-12 2:05 ` [PATCH 1/9] drm/i915: drm_connector_property -> drm_object_property Rob Clark
@ 2012-10-12 2:05 ` Rob Clark
2012-10-12 2:05 ` [PATCH 3/9] drm/nouveau: " Rob Clark
` (7 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Rob Clark @ 2012-10-12 2:05 UTC (permalink / raw)
To: dri-devel
Cc: patches, daniel.vetter, laurent.pinchart, alexander.deucher,
Rob Clark, alan, bskeggs
From: Rob Clark <rob@ti.com>
Signed-off-by: Rob Clark <rob@ti.com>
---
drivers/gpu/drm/gma500/cdv_device.c | 4 ++--
drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 6 +++---
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 10 +++++-----
drivers/gpu/drm/gma500/mdfld_dsi_output.c | 10 +++++-----
drivers/gpu/drm/gma500/mdfld_intel_display.c | 2 +-
drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 +-
drivers/gpu/drm/gma500/oaktrail_lvds.c | 8 ++++----
drivers/gpu/drm/gma500/psb_intel_lvds.c | 10 +++++-----
drivers/gpu/drm/gma500/psb_intel_sdvo.c | 24 ++++++++++++------------
10 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
index bfc2f39..4f11834 100644
--- a/drivers/gpu/drm/gma500/cdv_device.c
+++ b/drivers/gpu/drm/gma500/cdv_device.c
@@ -523,7 +523,7 @@ void cdv_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);
}
@@ -553,7 +553,7 @@ void cdv_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);
}
/* Cedarview */
diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index c9abc06..fb4f1d9 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -1651,7 +1651,7 @@ cdv_intel_dp_set_property(struct drm_connector *connector,
struct cdv_intel_dp *intel_dp = encoder->dev_priv;
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/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
index 7272a46..e223b50 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
@@ -185,14 +185,14 @@ static int cdv_hdmi_set_property(struct drm_connector *connector,
return -1;
}
- if (drm_connector_property_get_value(connector,
+ if (drm_object_property_get_value(&connector->base,
property, &curValue))
return -1;
if (curValue == value)
return 0;
- if (drm_connector_property_set_value(connector,
+ if (drm_object_property_set_value(&connector->base,
property, value))
return -1;
@@ -341,7 +341,7 @@ void cdv_hdmi_init(struct drm_device *dev,
connector->interlace_allowed = false;
connector->doublescan_allowed = false;
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev->mode_config.scaling_mode_property,
DRM_MODE_SCALE_FULLSCREEN);
diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
index b362dd3..d81dbc3 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
@@ -479,7 +479,7 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector,
return -1;
}
- if (drm_connector_property_get_value(connector,
+ if (drm_object_property_get_value(&connector->base,
property,
&curValue))
return -1;
@@ -487,7 +487,7 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector,
if (curValue == value)
return 0;
- if (drm_connector_property_set_value(connector,
+ if (drm_object_property_set_value(&connector->base,
property,
value))
return -1;
@@ -502,7 +502,7 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector,
return -1;
}
} else if (!strcmp(property->name, "backlight") && encoder) {
- if (drm_connector_property_set_value(connector,
+ if (drm_object_property_set_value(&connector->base,
property,
value))
return -1;
@@ -671,10 +671,10 @@ void cdv_intel_lvds_init(struct drm_device *dev,
connector->doublescan_allowed = false;
/*Attach connector properties*/
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev->mode_config.scaling_mode_property,
DRM_MODE_SCALE_FULLSCREEN);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev_priv->backlight_property,
BRIGHTNESS_MAX_LEVEL);
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
index 32dba2a..c51025c 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_output.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
@@ -265,13 +265,13 @@ static int mdfld_dsi_connector_set_property(struct drm_connector *connector,
goto set_prop_error;
}
- if (drm_connector_property_get_value(connector, property, &val))
+ if (drm_object_property_get_value(&connector->base, property, &val))
goto set_prop_error;
if (val == value)
goto set_prop_done;
- if (drm_connector_property_set_value(connector,
+ if (drm_object_property_set_value(&connector->base,
property, value))
goto set_prop_error;
@@ -296,7 +296,7 @@ static int mdfld_dsi_connector_set_property(struct drm_connector *connector,
}
}
} else if (!strcmp(property->name, "backlight") && encoder) {
- if (drm_connector_property_set_value(connector, property,
+ if (drm_object_property_set_value(&connector->base, property,
value))
goto set_prop_error;
else
@@ -572,10 +572,10 @@ void mdfld_dsi_output_init(struct drm_device *dev,
connector->doublescan_allowed = false;
/*attach properties*/
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev->mode_config.scaling_mode_property,
DRM_MODE_SCALE_FULLSCREEN);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev_priv->backlight_property,
MDFLD_DSI_BRIGHTNESS_MAX_LEVEL);
diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c
index dec6a9a..74485dc 100644
--- a/drivers/gpu/drm/gma500/mdfld_intel_display.c
+++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c
@@ -820,7 +820,7 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
REG_WRITE(map->pos, 0);
if (psb_intel_encoder)
- drm_connector_property_get_value(connector,
+ drm_object_property_get_value(&connector->base,
dev->mode_config.scaling_mode_property, &scalingType);
if (scalingType == DRM_MODE_SCALE_NO_SCALE) {
diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c
index cdafd2a..7293016 100644
--- a/drivers/gpu/drm/gma500/oaktrail_crtc.c
+++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c
@@ -343,7 +343,7 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,
(mode->crtc_vdisplay - 1));
if (psb_intel_encoder)
- drm_connector_property_get_value(connector,
+ drm_object_property_get_value(&connector->base,
dev->mode_config.scaling_mode_property, &scalingType);
if (scalingType == DRM_MODE_SCALE_NO_SCALE) {
diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c
index 558c77f..325013a 100644
--- a/drivers/gpu/drm/gma500/oaktrail_lvds.c
+++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c
@@ -133,8 +133,8 @@ static void oaktrail_lvds_mode_set(struct drm_encoder *encoder,
return;
}
- drm_connector_property_get_value(
- connector,
+ drm_object_property_get_value(
+ &connector->base,
dev->mode_config.scaling_mode_property,
&v);
@@ -363,10 +363,10 @@ void oaktrail_lvds_init(struct drm_device *dev,
connector->interlace_allowed = false;
connector->doublescan_allowed = false;
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev->mode_config.scaling_mode_property,
DRM_MODE_SCALE_FULLSCREEN);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev_priv->backlight_property,
BRIGHTNESS_MAX_LEVEL);
diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c
index 2a4c3a9..9fa5fa2 100644
--- a/drivers/gpu/drm/gma500/psb_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c
@@ -603,7 +603,7 @@ int psb_intel_lvds_set_property(struct drm_connector *connector,
goto set_prop_error;
}
- if (drm_connector_property_get_value(connector,
+ if (drm_object_property_get_value(&connector->base,
property,
&curval))
goto set_prop_error;
@@ -611,7 +611,7 @@ int psb_intel_lvds_set_property(struct drm_connector *connector,
if (curval == value)
goto set_prop_done;
- if (drm_connector_property_set_value(connector,
+ if (drm_object_property_set_value(&connector->base,
property,
value))
goto set_prop_error;
@@ -626,7 +626,7 @@ int psb_intel_lvds_set_property(struct drm_connector *connector,
goto set_prop_error;
}
} else if (!strcmp(property->name, "backlight")) {
- if (drm_connector_property_set_value(connector,
+ if (drm_object_property_set_value(&connector->base,
property,
value))
goto set_prop_error;
@@ -746,10 +746,10 @@ void psb_intel_lvds_init(struct drm_device *dev,
connector->doublescan_allowed = false;
/*Attach connector properties*/
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev->mode_config.scaling_mode_property,
DRM_MODE_SCALE_FULLSCREEN);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev_priv->backlight_property,
BRIGHTNESS_MAX_LEVEL);
diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index d35f93b..27d963f 100644
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -1695,7 +1695,7 @@ psb_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;
@@ -1750,7 +1750,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,
} else if (IS_TV_OR_LVDS(psb_intel_sdvo_connector)) {
temp_value = val;
if (psb_intel_sdvo_connector->left == property) {
- drm_connector_property_set_value(connector,
+ drm_object_property_set_value(&connector->base,
psb_intel_sdvo_connector->right, val);
if (psb_intel_sdvo_connector->left_margin == temp_value)
return 0;
@@ -1762,7 +1762,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,
cmd = SDVO_CMD_SET_OVERSCAN_H;
goto set_value;
} else if (psb_intel_sdvo_connector->right == property) {
- drm_connector_property_set_value(connector,
+ drm_object_property_set_value(&connector->base,
psb_intel_sdvo_connector->left, val);
if (psb_intel_sdvo_connector->right_margin == temp_value)
return 0;
@@ -1774,7 +1774,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,
cmd = SDVO_CMD_SET_OVERSCAN_H;
goto set_value;
} else if (psb_intel_sdvo_connector->top == property) {
- drm_connector_property_set_value(connector,
+ drm_object_property_set_value(&connector->base,
psb_intel_sdvo_connector->bottom, val);
if (psb_intel_sdvo_connector->top_margin == temp_value)
return 0;
@@ -1786,7 +1786,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,
cmd = SDVO_CMD_SET_OVERSCAN_V;
goto set_value;
} else if (psb_intel_sdvo_connector->bottom == property) {
- drm_connector_property_set_value(connector,
+ drm_object_property_set_value(&connector->base,
psb_intel_sdvo_connector->top, val);
if (psb_intel_sdvo_connector->bottom_margin == temp_value)
return 0;
@@ -2287,7 +2287,7 @@ static bool psb_intel_sdvo_tv_create_property(struct psb_intel_sdvo *psb_intel_s
i, tv_format_names[psb_intel_sdvo_connector->tv_format_supported[i]]);
psb_intel_sdvo->tv_format_index = psb_intel_sdvo_connector->tv_format_supported[0];
- drm_connector_attach_property(&psb_intel_sdvo_connector->base.base,
+ drm_object_attach_property(&psb_intel_sdvo_connector->base.base.base,
psb_intel_sdvo_connector->tv_format, 0);
return true;
@@ -2303,7 +2303,7 @@ static bool psb_intel_sdvo_tv_create_property(struct psb_intel_sdvo *psb_intel_s
psb_intel_sdvo_connector->name = \
drm_property_create_range(dev, 0, #name, 0, data_value[0]); \
if (!psb_intel_sdvo_connector->name) return false; \
- drm_connector_attach_property(connector, \
+ drm_object_attach_property(&connector->base, \
psb_intel_sdvo_connector->name, \
psb_intel_sdvo_connector->cur_##name); \
DRM_DEBUG_KMS(#name ": max %d, default %d, current %d\n", \
@@ -2340,7 +2340,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
if (!psb_intel_sdvo_connector->left)
return false;
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
psb_intel_sdvo_connector->left,
psb_intel_sdvo_connector->left_margin);
@@ -2349,7 +2349,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
if (!psb_intel_sdvo_connector->right)
return false;
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
psb_intel_sdvo_connector->right,
psb_intel_sdvo_connector->right_margin);
DRM_DEBUG_KMS("h_overscan: max %d, "
@@ -2376,7 +2376,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
if (!psb_intel_sdvo_connector->top)
return false;
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
psb_intel_sdvo_connector->top,
psb_intel_sdvo_connector->top_margin);
@@ -2385,7 +2385,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
if (!psb_intel_sdvo_connector->bottom)
return false;
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
psb_intel_sdvo_connector->bottom,
psb_intel_sdvo_connector->bottom_margin);
DRM_DEBUG_KMS("v_overscan: max %d, "
@@ -2417,7 +2417,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
if (!psb_intel_sdvo_connector->dot_crawl)
return false;
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
psb_intel_sdvo_connector->dot_crawl,
psb_intel_sdvo_connector->cur_dot_crawl);
DRM_DEBUG_KMS("dot crawl: current %d\n", response);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 3/9] drm/nouveau: drm_connector_property -> drm_object_property
2012-10-12 2:05 [PATCH 0/9] cleanup: remove legacy connector property functions Rob Clark
2012-10-12 2:05 ` [PATCH 1/9] drm/i915: drm_connector_property -> drm_object_property Rob Clark
2012-10-12 2:05 ` [PATCH 2/9] drm/gma500: " Rob Clark
@ 2012-10-12 2:05 ` Rob Clark
2012-10-12 2:05 ` [PATCH 4/9] drm/radeon: " Rob Clark
` (6 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Rob Clark @ 2012-10-12 2:05 UTC (permalink / raw)
To: dri-devel
Cc: patches, daniel.vetter, laurent.pinchart, alexander.deucher,
Rob Clark, alan, bskeggs
From: Rob Clark <rob@ti.com>
Signed-off-by: Rob Clark <rob@ti.com>
---
drivers/gpu/drm/nouveau/nouveau_connector.c | 22 +++++++++++-----------
drivers/gpu/drm/nouveau/nv17_tv.c | 16 ++++++++--------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 7b11edb..0fda539 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -201,7 +201,7 @@ nouveau_connector_set_encoder(struct drm_connector *connector,
}
if (nv_connector->type == DCB_CONNECTOR_DVI_I) {
- drm_connector_property_set_value(connector,
+ drm_object_property_set_value(&connector->base,
dev->mode_config.dvi_i_subconnector_property,
nv_encoder->dcb->type == OUTPUT_TMDS ?
DRM_MODE_SUBCONNECTOR_DVID :
@@ -1020,7 +1020,7 @@ nouveau_connector_create(struct drm_device *dev, int index)
/* Init DVI-I specific properties */
if (nv_connector->type == DCB_CONNECTOR_DVI_I)
- drm_connector_attach_property(connector, dev->mode_config.dvi_i_subconnector_property, 0);
+ drm_object_attach_property(&connector->base, dev->mode_config.dvi_i_subconnector_property, 0);
/* Add overscan compensation options to digital outputs */
if (disp->underscan_property &&
@@ -1028,31 +1028,31 @@ nouveau_connector_create(struct drm_device *dev, int index)
type == DRM_MODE_CONNECTOR_DVII ||
type == DRM_MODE_CONNECTOR_HDMIA ||
type == DRM_MODE_CONNECTOR_DisplayPort)) {
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
disp->underscan_property,
UNDERSCAN_OFF);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
disp->underscan_hborder_property,
0);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
disp->underscan_vborder_property,
0);
}
/* Add hue and saturation options */
if (disp->vibrant_hue_property)
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
disp->vibrant_hue_property,
90);
if (disp->color_vibrance_property)
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
disp->color_vibrance_property,
150);
switch (nv_connector->type) {
case DCB_CONNECTOR_VGA:
if (dev_priv->card_type >= NV_50) {
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev->mode_config.scaling_mode_property,
nv_connector->scaling_mode);
}
@@ -1065,18 +1065,18 @@ nouveau_connector_create(struct drm_device *dev, int index)
default:
nv_connector->scaling_mode = DRM_MODE_SCALE_FULLSCREEN;
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev->mode_config.scaling_mode_property,
nv_connector->scaling_mode);
if (disp->dithering_mode) {
nv_connector->dithering_mode = DITHERING_MODE_AUTO;
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
disp->dithering_mode,
nv_connector->dithering_mode);
}
if (disp->dithering_depth) {
nv_connector->dithering_depth = DITHERING_DEPTH_AUTO;
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
disp->dithering_depth,
nv_connector->dithering_depth);
}
diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
index 67be5db..0804c90 100644
--- a/drivers/gpu/drm/nouveau/nv17_tv.c
+++ b/drivers/gpu/drm/nouveau/nv17_tv.c
@@ -178,7 +178,7 @@ nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector)
break;
}
- drm_connector_property_set_value(connector,
+ drm_object_property_set_value(&connector->base,
conf->tv_subconnector_property,
tv_enc->subconnector);
@@ -652,25 +652,25 @@ static int nv17_tv_create_resources(struct drm_encoder *encoder,
drm_mode_create_tv_properties(dev, num_tv_norms, nv17_tv_norm_names);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
conf->tv_select_subconnector_property,
tv_enc->select_subconnector);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
conf->tv_subconnector_property,
tv_enc->subconnector);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
conf->tv_mode_property,
tv_enc->tv_norm);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
conf->tv_flicker_reduction_property,
tv_enc->flicker);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
conf->tv_saturation_property,
tv_enc->saturation);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
conf->tv_hue_property,
tv_enc->hue);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
conf->tv_overscan_property,
tv_enc->overscan);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 4/9] drm/radeon: drm_connector_property -> drm_object_property
2012-10-12 2:05 [PATCH 0/9] cleanup: remove legacy connector property functions Rob Clark
` (2 preceding siblings ...)
2012-10-12 2:05 ` [PATCH 3/9] drm/nouveau: " Rob Clark
@ 2012-10-12 2:05 ` Rob Clark
2012-10-12 2:05 ` [PATCH 5/9] drm/shmob: " Rob Clark
` (5 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Rob Clark @ 2012-10-12 2:05 UTC (permalink / raw)
To: dri-devel
Cc: patches, daniel.vetter, laurent.pinchart, alexander.deucher,
Rob Clark, alan, bskeggs
From: Rob Clark <rob@ti.com>
Signed-off-by: Rob Clark <rob@ti.com>
---
drivers/gpu/drm/radeon/radeon_connectors.c | 62 ++++++++++++++--------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 895e628..ef251ec 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -1589,7 +1589,7 @@ radeon_add_atom_connector(struct drm_device *dev,
connector->interlace_allowed = true;
connector->doublescan_allowed = true;
radeon_connector->dac_load_detect = true;
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.load_detect_property,
1);
break;
@@ -1598,13 +1598,13 @@ radeon_add_atom_connector(struct drm_device *dev,
case DRM_MODE_CONNECTOR_HDMIA:
case DRM_MODE_CONNECTOR_HDMIB:
case DRM_MODE_CONNECTOR_DisplayPort:
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.underscan_property,
UNDERSCAN_OFF);
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.underscan_hborder_property,
0);
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.underscan_vborder_property,
0);
subpixel_order = SubPixelHorizontalRGB;
@@ -1615,14 +1615,14 @@ radeon_add_atom_connector(struct drm_device *dev,
connector->doublescan_allowed = false;
if (connector_type == DRM_MODE_CONNECTOR_DVII) {
radeon_connector->dac_load_detect = true;
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.load_detect_property,
1);
}
break;
case DRM_MODE_CONNECTOR_LVDS:
case DRM_MODE_CONNECTOR_eDP:
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
dev->mode_config.scaling_mode_property,
DRM_MODE_SCALE_FULLSCREEN);
subpixel_order = SubPixelHorizontalRGB;
@@ -1641,7 +1641,7 @@ radeon_add_atom_connector(struct drm_device *dev,
DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
}
radeon_connector->dac_load_detect = true;
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.load_detect_property,
1);
/* no HPD on analog connectors */
@@ -1659,7 +1659,7 @@ radeon_add_atom_connector(struct drm_device *dev,
DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
}
radeon_connector->dac_load_detect = true;
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.load_detect_property,
1);
/* no HPD on analog connectors */
@@ -1682,23 +1682,23 @@ radeon_add_atom_connector(struct drm_device *dev,
DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
}
subpixel_order = SubPixelHorizontalRGB;
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.coherent_mode_property,
1);
if (ASIC_IS_AVIVO(rdev)) {
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.underscan_property,
UNDERSCAN_OFF);
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.underscan_hborder_property,
0);
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.underscan_vborder_property,
0);
}
if (connector_type == DRM_MODE_CONNECTOR_DVII) {
radeon_connector->dac_load_detect = true;
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.load_detect_property,
1);
}
@@ -1722,17 +1722,17 @@ radeon_add_atom_connector(struct drm_device *dev,
if (!radeon_connector->ddc_bus)
DRM_ERROR("HDMI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
}
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.coherent_mode_property,
1);
if (ASIC_IS_AVIVO(rdev)) {
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.underscan_property,
UNDERSCAN_OFF);
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.underscan_hborder_property,
0);
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.underscan_vborder_property,
0);
}
@@ -1761,17 +1761,17 @@ radeon_add_atom_connector(struct drm_device *dev,
DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
}
subpixel_order = SubPixelHorizontalRGB;
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.coherent_mode_property,
1);
if (ASIC_IS_AVIVO(rdev)) {
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.underscan_property,
UNDERSCAN_OFF);
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.underscan_hborder_property,
0);
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.underscan_vborder_property,
0);
}
@@ -1796,7 +1796,7 @@ radeon_add_atom_connector(struct drm_device *dev,
if (!radeon_connector->ddc_bus)
DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
}
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
dev->mode_config.scaling_mode_property,
DRM_MODE_SCALE_FULLSCREEN);
subpixel_order = SubPixelHorizontalRGB;
@@ -1809,10 +1809,10 @@ radeon_add_atom_connector(struct drm_device *dev,
drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);
drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);
radeon_connector->dac_load_detect = true;
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.load_detect_property,
1);
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.tv_std_property,
radeon_atombios_get_tv_info(rdev));
/* no HPD on analog connectors */
@@ -1833,7 +1833,7 @@ radeon_add_atom_connector(struct drm_device *dev,
if (!radeon_connector->ddc_bus)
DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
}
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
dev->mode_config.scaling_mode_property,
DRM_MODE_SCALE_FULLSCREEN);
subpixel_order = SubPixelHorizontalRGB;
@@ -1912,7 +1912,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
}
radeon_connector->dac_load_detect = true;
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.load_detect_property,
1);
/* no HPD on analog connectors */
@@ -1930,7 +1930,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
}
radeon_connector->dac_load_detect = true;
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.load_detect_property,
1);
/* no HPD on analog connectors */
@@ -1949,7 +1949,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
}
if (connector_type == DRM_MODE_CONNECTOR_DVII) {
radeon_connector->dac_load_detect = true;
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.load_detect_property,
1);
}
@@ -1973,10 +1973,10 @@ radeon_add_legacy_connector(struct drm_device *dev,
*/
if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480)
radeon_connector->dac_load_detect = false;
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.load_detect_property,
radeon_connector->dac_load_detect);
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.tv_std_property,
radeon_combios_get_tv_info(rdev));
/* no HPD on analog connectors */
@@ -1992,7 +1992,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
if (!radeon_connector->ddc_bus)
DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
}
- drm_connector_attach_property(&radeon_connector->base,
+ drm_object_attach_property(&radeon_connector->base.base,
dev->mode_config.scaling_mode_property,
DRM_MODE_SCALE_FULLSCREEN);
subpixel_order = SubPixelHorizontalRGB;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 5/9] drm/shmob: drm_connector_property -> drm_object_property
2012-10-12 2:05 [PATCH 0/9] cleanup: remove legacy connector property functions Rob Clark
` (3 preceding siblings ...)
2012-10-12 2:05 ` [PATCH 4/9] drm/radeon: " Rob Clark
@ 2012-10-12 2:05 ` Rob Clark
2012-10-12 2:05 ` [PATCH 6/9] drm/udl: " Rob Clark
` (4 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Rob Clark @ 2012-10-12 2:05 UTC (permalink / raw)
To: dri-devel
Cc: patches, daniel.vetter, laurent.pinchart, alexander.deucher,
Rob Clark, alan, bskeggs
From: Rob Clark <rob@ti.com>
Signed-off-by: Rob Clark <rob@ti.com>
---
drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
index 3ecb702..698b0cd 100644
--- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
@@ -737,7 +737,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,
connector->encoder = encoder;
drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
- drm_connector_property_set_value(connector,
+ drm_object_property_set_value(&connector->base,
sdev->ddev->mode_config.dpms_property, DRM_MODE_DPMS_OFF);
return 0;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 6/9] drm/udl: drm_connector_property -> drm_object_property
2012-10-12 2:05 [PATCH 0/9] cleanup: remove legacy connector property functions Rob Clark
` (4 preceding siblings ...)
2012-10-12 2:05 ` [PATCH 5/9] drm/shmob: " Rob Clark
@ 2012-10-12 2:05 ` Rob Clark
2012-10-12 2:06 ` [PATCH 7/9] drm/vmwgfx: " Rob Clark
` (3 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Rob Clark @ 2012-10-12 2:05 UTC (permalink / raw)
To: dri-devel
Cc: patches, daniel.vetter, laurent.pinchart, alexander.deucher,
Rob Clark, alan, bskeggs
From: Rob Clark <rob@ti.com>
Signed-off-by: Rob Clark <rob@ti.com>
---
drivers/gpu/drm/udl/udl_connector.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index d568aa4..4faf39c 100644
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -138,7 +138,7 @@ int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder)
drm_sysfs_connector_add(connector);
drm_mode_connector_attach_encoder(connector, encoder);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev->mode_config.dirty_info_property,
1);
return 0;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 7/9] drm/vmwgfx: drm_connector_property -> drm_object_property
2012-10-12 2:05 [PATCH 0/9] cleanup: remove legacy connector property functions Rob Clark
` (5 preceding siblings ...)
2012-10-12 2:05 ` [PATCH 6/9] drm/udl: " Rob Clark
@ 2012-10-12 2:06 ` Rob Clark
2012-10-12 2:06 ` [PATCH 8/9] drm/i2c: " Rob Clark
` (2 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Rob Clark @ 2012-10-12 2:06 UTC (permalink / raw)
To: dri-devel
Cc: patches, daniel.vetter, laurent.pinchart, alexander.deucher,
Rob Clark, alan, bskeggs
From: Rob Clark <rob@ti.com>
Signed-off-by: Rob Clark <rob@ti.com>
---
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index 070fb23..79f7e8e 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -373,7 +373,7 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
drm_mode_crtc_set_gamma_size(crtc, 256);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev->mode_config.dirty_info_property,
1);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 6deaf2f..25d602f 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -468,7 +468,7 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
drm_mode_crtc_set_gamma_size(crtc, 256);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev->mode_config.dirty_info_property,
1);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 8/9] drm/i2c: drm_connector_property -> drm_object_property
2012-10-12 2:05 [PATCH 0/9] cleanup: remove legacy connector property functions Rob Clark
` (6 preceding siblings ...)
2012-10-12 2:06 ` [PATCH 7/9] drm/vmwgfx: " Rob Clark
@ 2012-10-12 2:06 ` Rob Clark
2012-10-12 2:06 ` [PATCH 9/9] drm: remove legacy drm_connector_property fxns Rob Clark
2012-10-17 10:52 ` [PATCH 0/9] cleanup: remove legacy connector property functions Laurent Pinchart
9 siblings, 0 replies; 15+ messages in thread
From: Rob Clark @ 2012-10-12 2:06 UTC (permalink / raw)
To: dri-devel
Cc: patches, daniel.vetter, laurent.pinchart, alexander.deucher,
Rob Clark, alan, bskeggs
From: Rob Clark <rob@ti.com>
Signed-off-by: Rob Clark <rob@ti.com>
---
drivers/gpu/drm/i2c/ch7006_drv.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
index 599099f..b865d07 100644
--- a/drivers/gpu/drm/i2c/ch7006_drv.c
+++ b/drivers/gpu/drm/i2c/ch7006_drv.c
@@ -214,7 +214,7 @@ static enum drm_connector_status ch7006_encoder_detect(struct drm_encoder *encod
else
priv->subconnector = DRM_MODE_SUBCONNECTOR_Unknown;
- drm_connector_property_set_value(connector,
+ drm_object_property_set_value(&connector->base,
encoder->dev->mode_config.tv_subconnector_property,
priv->subconnector);
@@ -254,23 +254,23 @@ static int ch7006_encoder_create_resources(struct drm_encoder *encoder,
priv->scale_property = drm_property_create_range(dev, 0, "scale", 0, 2);
- drm_connector_attach_property(connector, conf->tv_select_subconnector_property,
+ drm_object_attach_property(&connector->base, conf->tv_select_subconnector_property,
priv->select_subconnector);
- drm_connector_attach_property(connector, conf->tv_subconnector_property,
+ drm_object_attach_property(&connector->base, conf->tv_subconnector_property,
priv->subconnector);
- drm_connector_attach_property(connector, conf->tv_left_margin_property,
+ drm_object_attach_property(&connector->base, conf->tv_left_margin_property,
priv->hmargin);
- drm_connector_attach_property(connector, conf->tv_bottom_margin_property,
+ drm_object_attach_property(&connector->base, conf->tv_bottom_margin_property,
priv->vmargin);
- drm_connector_attach_property(connector, conf->tv_mode_property,
+ drm_object_attach_property(&connector->base, conf->tv_mode_property,
priv->norm);
- drm_connector_attach_property(connector, conf->tv_brightness_property,
+ drm_object_attach_property(&connector->base, conf->tv_brightness_property,
priv->brightness);
- drm_connector_attach_property(connector, conf->tv_contrast_property,
+ drm_object_attach_property(&connector->base, conf->tv_contrast_property,
priv->contrast);
- drm_connector_attach_property(connector, conf->tv_flicker_reduction_property,
+ drm_object_attach_property(&connector->base, conf->tv_flicker_reduction_property,
priv->flicker);
- drm_connector_attach_property(connector, priv->scale_property,
+ drm_object_attach_property(&connector->base, priv->scale_property,
priv->scale);
return 0;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 9/9] drm: remove legacy drm_connector_property fxns
2012-10-12 2:05 [PATCH 0/9] cleanup: remove legacy connector property functions Rob Clark
` (7 preceding siblings ...)
2012-10-12 2:06 ` [PATCH 8/9] drm/i2c: " Rob Clark
@ 2012-10-12 2:06 ` Rob Clark
2012-10-15 7:04 ` Jani Nikula
2012-10-17 10:52 ` [PATCH 0/9] cleanup: remove legacy connector property functions Laurent Pinchart
9 siblings, 1 reply; 15+ messages in thread
From: Rob Clark @ 2012-10-12 2:06 UTC (permalink / raw)
To: dri-devel
Cc: patches, daniel.vetter, laurent.pinchart, alexander.deucher,
Rob Clark, alan, bskeggs
From: Rob Clark <rob@ti.com>
Replace references to and remove the connector property fxns, which
have been superseded with the more general object property fxns:
+ drm_connector_attach_property -> drm_object_attach_property
+ drm_connector_property_set_value -> drm_object_property_set_value
+ drm_connector_property_get_value -> drm_object_property_get_value
Signed-off-by: Rob Clark <rob@ti.com>
---
drivers/gpu/drm/drm_crtc.c | 31 +++++--------------------------
drivers/gpu/drm/drm_fb_helper.c | 2 +-
drivers/gpu/drm/drm_sysfs.c | 6 +++---
include/drm/drm_crtc.h | 8 --------
4 files changed, 9 insertions(+), 38 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 9c346a5..cee96f4 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -561,11 +561,11 @@ int drm_connector_init(struct drm_device *dev,
dev->mode_config.num_connector++;
if (connector_type != DRM_MODE_CONNECTOR_VIRTUAL)
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev->mode_config.edid_property,
0);
- drm_connector_attach_property(connector,
+ drm_object_attach_property(&connector->base,
dev->mode_config.dpms_property, 0);
out:
@@ -2917,27 +2917,6 @@ void drm_property_destroy(struct drm_device *dev, struct drm_property *property)
}
EXPORT_SYMBOL(drm_property_destroy);
-void drm_connector_attach_property(struct drm_connector *connector,
- struct drm_property *property, uint64_t init_val)
-{
- drm_object_attach_property(&connector->base, property, init_val);
-}
-EXPORT_SYMBOL(drm_connector_attach_property);
-
-int drm_connector_property_set_value(struct drm_connector *connector,
- struct drm_property *property, uint64_t value)
-{
- return drm_object_property_set_value(&connector->base, property, value);
-}
-EXPORT_SYMBOL(drm_connector_property_set_value);
-
-int drm_connector_property_get_value(struct drm_connector *connector,
- struct drm_property *property, uint64_t *val)
-{
- return drm_object_property_get_value(&connector->base, property, val);
-}
-EXPORT_SYMBOL(drm_connector_property_get_value);
-
void drm_object_attach_property(struct drm_mode_object *obj,
struct drm_property *property,
uint64_t init_val)
@@ -3174,7 +3153,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
/* Delete edid, when there is none. */
if (!edid) {
connector->edid_blob_ptr = NULL;
- ret = drm_connector_property_set_value(connector, dev->mode_config.edid_property, 0);
+ ret = drm_object_property_set_value(&connector->base, dev->mode_config.edid_property, 0);
return ret;
}
@@ -3182,7 +3161,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
connector->edid_blob_ptr = drm_property_create_blob(connector->dev,
size, edid);
- ret = drm_connector_property_set_value(connector,
+ ret = drm_object_property_set_value(&connector->base,
dev->mode_config.edid_property,
connector->edid_blob_ptr->base.id);
@@ -3246,7 +3225,7 @@ static int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
/* store the property value if successful */
if (!ret)
- drm_connector_property_set_value(connector, property, value);
+ drm_object_property_set_value(&connector->base, property, value);
return ret;
}
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index b5d05f5..712b3e88 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -331,7 +331,7 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode)
for (j = 0; j < fb_helper->connector_count; j++) {
connector = fb_helper->connector_info[j]->connector;
connector->funcs->dpms(connector, dpms_mode);
- drm_connector_property_set_value(connector,
+ drm_object_property_set_value(&connector->base,
dev->mode_config.dpms_property, dpms_mode);
}
}
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 45ac8d6..1990b5d 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -182,7 +182,7 @@ static ssize_t dpms_show(struct device *device,
uint64_t dpms_status;
int ret;
- ret = drm_connector_property_get_value(connector,
+ ret = drm_object_property_get_value(&connector->base,
dev->mode_config.dpms_property,
&dpms_status);
if (ret)
@@ -277,7 +277,7 @@ static ssize_t subconnector_show(struct device *device,
return 0;
}
- ret = drm_connector_property_get_value(connector, prop, &subconnector);
+ ret = drm_object_property_get_value(&connector->base, prop, &subconnector);
if (ret)
return 0;
@@ -318,7 +318,7 @@ static ssize_t select_subconnector_show(struct device *device,
return 0;
}
- ret = drm_connector_property_get_value(connector, prop, &subconnector);
+ ret = drm_object_property_get_value(&connector->base, prop, &subconnector);
if (ret)
return 0;
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 0f532d4..a45cdc2 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -917,12 +917,6 @@ extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
extern void drm_mode_connector_list_update(struct drm_connector *connector);
extern int drm_mode_connector_update_edid_property(struct drm_connector *connector,
struct edid *edid);
-extern int drm_connector_property_set_value(struct drm_connector *connector,
- struct drm_property *property,
- uint64_t value);
-extern int drm_connector_property_get_value(struct drm_connector *connector,
- struct drm_property *property,
- uint64_t *value);
extern int drm_object_property_set_value(struct drm_mode_object *obj,
struct drm_property *property,
uint64_t val);
@@ -937,8 +931,6 @@ extern void drm_framebuffer_reference(struct drm_framebuffer *fb);
extern void drm_framebuffer_remove(struct drm_framebuffer *fb);
extern void drm_framebuffer_cleanup(struct drm_framebuffer *fb);
-extern void drm_connector_attach_property(struct drm_connector *connector,
- struct drm_property *property, uint64_t init_val);
extern void drm_object_attach_property(struct drm_mode_object *obj,
struct drm_property *property,
uint64_t init_val);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 9/9] drm: remove legacy drm_connector_property fxns
2012-10-12 2:06 ` [PATCH 9/9] drm: remove legacy drm_connector_property fxns Rob Clark
@ 2012-10-15 7:04 ` Jani Nikula
0 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2012-10-15 7:04 UTC (permalink / raw)
To: Rob Clark, dri-devel
Cc: patches, daniel.vetter, bskeggs, laurent.pinchart,
alexander.deucher, Rob Clark, alan
On Fri, 12 Oct 2012, Rob Clark <rob.clark@linaro.org> wrote:
> From: Rob Clark <rob@ti.com>
>
> Replace references to and remove the connector property fxns, which
> have been superseded with the more general object property fxns:
"fxns"? meh.
For this patch,
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
>
> + drm_connector_attach_property -> drm_object_attach_property
> + drm_connector_property_set_value -> drm_object_property_set_value
> + drm_connector_property_get_value -> drm_object_property_get_value
>
> Signed-off-by: Rob Clark <rob@ti.com>
> ---
> drivers/gpu/drm/drm_crtc.c | 31 +++++--------------------------
> drivers/gpu/drm/drm_fb_helper.c | 2 +-
> drivers/gpu/drm/drm_sysfs.c | 6 +++---
> include/drm/drm_crtc.h | 8 --------
> 4 files changed, 9 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index 9c346a5..cee96f4 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -561,11 +561,11 @@ int drm_connector_init(struct drm_device *dev,
> dev->mode_config.num_connector++;
>
> if (connector_type != DRM_MODE_CONNECTOR_VIRTUAL)
> - drm_connector_attach_property(connector,
> + drm_object_attach_property(&connector->base,
> dev->mode_config.edid_property,
> 0);
>
> - drm_connector_attach_property(connector,
> + drm_object_attach_property(&connector->base,
> dev->mode_config.dpms_property, 0);
>
> out:
> @@ -2917,27 +2917,6 @@ void drm_property_destroy(struct drm_device *dev, struct drm_property *property)
> }
> EXPORT_SYMBOL(drm_property_destroy);
>
> -void drm_connector_attach_property(struct drm_connector *connector,
> - struct drm_property *property, uint64_t init_val)
> -{
> - drm_object_attach_property(&connector->base, property, init_val);
> -}
> -EXPORT_SYMBOL(drm_connector_attach_property);
> -
> -int drm_connector_property_set_value(struct drm_connector *connector,
> - struct drm_property *property, uint64_t value)
> -{
> - return drm_object_property_set_value(&connector->base, property, value);
> -}
> -EXPORT_SYMBOL(drm_connector_property_set_value);
> -
> -int drm_connector_property_get_value(struct drm_connector *connector,
> - struct drm_property *property, uint64_t *val)
> -{
> - return drm_object_property_get_value(&connector->base, property, val);
> -}
> -EXPORT_SYMBOL(drm_connector_property_get_value);
> -
> void drm_object_attach_property(struct drm_mode_object *obj,
> struct drm_property *property,
> uint64_t init_val)
> @@ -3174,7 +3153,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
> /* Delete edid, when there is none. */
> if (!edid) {
> connector->edid_blob_ptr = NULL;
> - ret = drm_connector_property_set_value(connector, dev->mode_config.edid_property, 0);
> + ret = drm_object_property_set_value(&connector->base, dev->mode_config.edid_property, 0);
> return ret;
> }
>
> @@ -3182,7 +3161,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
> connector->edid_blob_ptr = drm_property_create_blob(connector->dev,
> size, edid);
>
> - ret = drm_connector_property_set_value(connector,
> + ret = drm_object_property_set_value(&connector->base,
> dev->mode_config.edid_property,
> connector->edid_blob_ptr->base.id);
>
> @@ -3246,7 +3225,7 @@ static int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
>
> /* store the property value if successful */
> if (!ret)
> - drm_connector_property_set_value(connector, property, value);
> + drm_object_property_set_value(&connector->base, property, value);
> return ret;
> }
>
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index b5d05f5..712b3e88 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -331,7 +331,7 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode)
> for (j = 0; j < fb_helper->connector_count; j++) {
> connector = fb_helper->connector_info[j]->connector;
> connector->funcs->dpms(connector, dpms_mode);
> - drm_connector_property_set_value(connector,
> + drm_object_property_set_value(&connector->base,
> dev->mode_config.dpms_property, dpms_mode);
> }
> }
> diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
> index 45ac8d6..1990b5d 100644
> --- a/drivers/gpu/drm/drm_sysfs.c
> +++ b/drivers/gpu/drm/drm_sysfs.c
> @@ -182,7 +182,7 @@ static ssize_t dpms_show(struct device *device,
> uint64_t dpms_status;
> int ret;
>
> - ret = drm_connector_property_get_value(connector,
> + ret = drm_object_property_get_value(&connector->base,
> dev->mode_config.dpms_property,
> &dpms_status);
> if (ret)
> @@ -277,7 +277,7 @@ static ssize_t subconnector_show(struct device *device,
> return 0;
> }
>
> - ret = drm_connector_property_get_value(connector, prop, &subconnector);
> + ret = drm_object_property_get_value(&connector->base, prop, &subconnector);
> if (ret)
> return 0;
>
> @@ -318,7 +318,7 @@ static ssize_t select_subconnector_show(struct device *device,
> return 0;
> }
>
> - ret = drm_connector_property_get_value(connector, prop, &subconnector);
> + ret = drm_object_property_get_value(&connector->base, prop, &subconnector);
> if (ret)
> return 0;
>
> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> index 0f532d4..a45cdc2 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
> @@ -917,12 +917,6 @@ extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
> extern void drm_mode_connector_list_update(struct drm_connector *connector);
> extern int drm_mode_connector_update_edid_property(struct drm_connector *connector,
> struct edid *edid);
> -extern int drm_connector_property_set_value(struct drm_connector *connector,
> - struct drm_property *property,
> - uint64_t value);
> -extern int drm_connector_property_get_value(struct drm_connector *connector,
> - struct drm_property *property,
> - uint64_t *value);
> extern int drm_object_property_set_value(struct drm_mode_object *obj,
> struct drm_property *property,
> uint64_t val);
> @@ -937,8 +931,6 @@ extern void drm_framebuffer_reference(struct drm_framebuffer *fb);
> extern void drm_framebuffer_remove(struct drm_framebuffer *fb);
> extern void drm_framebuffer_cleanup(struct drm_framebuffer *fb);
>
> -extern void drm_connector_attach_property(struct drm_connector *connector,
> - struct drm_property *property, uint64_t init_val);
> extern void drm_object_attach_property(struct drm_mode_object *obj,
> struct drm_property *property,
> uint64_t init_val);
> --
> 1.7.9.5
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/9] cleanup: remove legacy connector property functions
2012-10-12 2:05 [PATCH 0/9] cleanup: remove legacy connector property functions Rob Clark
` (8 preceding siblings ...)
2012-10-12 2:06 ` [PATCH 9/9] drm: remove legacy drm_connector_property fxns Rob Clark
@ 2012-10-17 10:52 ` Laurent Pinchart
9 siblings, 0 replies; 15+ messages in thread
From: Laurent Pinchart @ 2012-10-17 10:52 UTC (permalink / raw)
To: Rob Clark
Cc: patches, daniel.vetter, dri-devel, bskeggs, alexander.deucher,
Rob Clark, alan
Hi Rob,
Thanks for the patches. They look good to me, except for the empty commit
messages and the odd alignment. For instance, I would have replaced
- drm_connector_property_set_value(connector,
+ drm_object_property_set_value(&connector->base,
dpms_property,
DRM_MODE_DPMS_ON);
with
- drm_connector_property_set_value(connector,
- dpms_property,
- DRM_MODE_DPMS_ON);
+ drm_object_property_set_value(&connector->base,
+ dpms_property,
+ DRM_MODE_DPMS_ON);
Feel free to ignore the alignment issue if you wish.
Other than that,
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
and
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
for the shmob patch.
On Thursday 11 October 2012 21:05:53 Rob Clark wrote:
> From: Rob Clark <rob@ti.com>
>
> It was suggested by Laurent Pinchart to clean up the legacy connector
> property functions, as they are no longer needed. This patchset
> replaces references to and remove the connector property fxns, which
> have been superseded with the more general object property fxns:
>
> + drm_connector_attach_property -> drm_object_attach_property
> + drm_connector_property_set_value -> drm_object_property_set_value
> + drm_connector_property_get_value -> drm_object_property_get_value
>
> Rob Clark (9):
> drm/i915: drm_connector_property -> drm_object_property
> drm/gma500: drm_connector_property -> drm_object_property
> drm/nouveau: drm_connector_property -> drm_object_property
> drm/radeon: drm_connector_property -> drm_object_property
> drm/shmob: drm_connector_property -> drm_object_property
> drm/udl: drm_connector_property -> drm_object_property
> drm/vmwgfx: drm_connector_property -> drm_object_property
> drm/i2c: drm_connector_property -> drm_object_property
> drm: remove legacy drm_connector_property fxns
>
> drivers/gpu/drm/drm_crtc.c | 31 +++----------
> drivers/gpu/drm/drm_fb_helper.c | 2 +-
> drivers/gpu/drm/drm_sysfs.c | 6 +--
> drivers/gpu/drm/gma500/cdv_device.c | 4 +-
> drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
> drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 6 +--
> drivers/gpu/drm/gma500/cdv_intel_lvds.c | 10 ++---
> drivers/gpu/drm/gma500/mdfld_dsi_output.c | 10 ++---
> drivers/gpu/drm/gma500/mdfld_intel_display.c | 2 +-
> drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 +-
> drivers/gpu/drm/gma500/oaktrail_lvds.c | 8 ++--
> drivers/gpu/drm/gma500/psb_intel_lvds.c | 10 ++---
> drivers/gpu/drm/gma500/psb_intel_sdvo.c | 24 +++++-----
> drivers/gpu/drm/i2c/ch7006_drv.c | 20 ++++-----
> 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 +++---
> drivers/gpu/drm/nouveau/nouveau_connector.c | 22 ++++-----
> drivers/gpu/drm/nouveau/nv17_tv.c | 16 +++----
> drivers/gpu/drm/radeon/radeon_connectors.c | 62 +++++++++++------------
> drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +-
> drivers/gpu/drm/udl/udl_connector.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +-
> include/drm/drm_crtc.h | 8 ----
> 29 files changed, 137 insertions(+), 166 deletions(-)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 15+ messages in thread