Skip to content

Commit

Permalink
drm/gma500: drm_connector_property -> drm_object_property
Browse files Browse the repository at this point in the history 
Signed-off-by: Rob Clark <rob@ti.com>
  • Loading branch information
Rob Clark authored and Rob Clark committed Nov 30, 2012
1 parent 7136470 commit a69ac9e
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 39 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/gma500/cdv_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}


Expand Down Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/gma500/cdv_intel_dp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1650,7 +1650,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;

Expand Down
6 changes: 3 additions & 3 deletions drivers/gpu/drm/gma500/cdv_intel_hdmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);

Expand Down
10 changes: 5 additions & 5 deletions drivers/gpu/drm/gma500/cdv_intel_lvds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -479,15 +479,15 @@ 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;

if (curValue == value)
return 0;

if (drm_connector_property_set_value(connector,
if (drm_object_property_set_value(&connector->base,
property,
value))
return -1;
Expand All @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
10 changes: 5 additions & 5 deletions drivers/gpu/drm/gma500/mdfld_dsi_output.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/gma500/mdfld_intel_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/gma500/oaktrail_crtc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,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) {
Expand Down
8 changes: 4 additions & 4 deletions drivers/gpu/drm/gma500/oaktrail_lvds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down
10 changes: 5 additions & 5 deletions drivers/gpu/drm/gma500/psb_intel_lvds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -603,15 +603,15 @@ 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;

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;
Expand All @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
24 changes: 12 additions & 12 deletions drivers/gpu/drm/gma500/psb_intel_sdvo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1694,7 +1694,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;

Expand Down Expand Up @@ -1749,7 +1749,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;
Expand All @@ -1761,7 +1761,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;
Expand All @@ -1773,7 +1773,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;
Expand All @@ -1785,7 +1785,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;
Expand Down Expand Up @@ -2286,7 +2286,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;

Expand All @@ -2302,7 +2302,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", \
Expand Down Expand Up @@ -2339,7 +2339,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);

Expand All @@ -2348,7 +2348,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, "
Expand All @@ -2375,7 +2375,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);

Expand All @@ -2384,7 +2384,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, "
Expand Down Expand Up @@ -2416,7 +2416,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);
Expand Down

0 comments on commit a69ac9e

Please sign in to comment.