aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_connector.c
diff options
context:
space:
mode:
authorRob Clark <rob@ti.com>2012-10-11 21:42:04 -0400
committerRob Clark <robdclark@gmail.com>2012-11-30 11:30:48 -0500
commit2db83827dc7679c1f4925bb116e1f7deb13192e2 (patch)
tree57fdb7defe858a58250c6d269571839da1d3a529 /drivers/gpu/drm/nouveau/nouveau_connector.c
parent6de6d8463002b490b1cdc62f4d29c45430f2da85 (diff)
drm/nouveau: drm_connector_property -> drm_object_property
Signed-off-by: Rob Clark <rob@ti.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_connector.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_connector.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 98d7e9238f6d..29a913460fed 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -220,7 +220,7 @@ nouveau_connector_set_encoder(struct drm_connector *connector,
220 } 220 }
221 221
222 if (nv_connector->type == DCB_CONNECTOR_DVI_I) { 222 if (nv_connector->type == DCB_CONNECTOR_DVI_I) {
223 drm_connector_property_set_value(connector, 223 drm_object_property_set_value(&connector->base,
224 dev->mode_config.dvi_i_subconnector_property, 224 dev->mode_config.dvi_i_subconnector_property,
225 nv_encoder->dcb->type == DCB_OUTPUT_TMDS ? 225 nv_encoder->dcb->type == DCB_OUTPUT_TMDS ?
226 DRM_MODE_SUBCONNECTOR_DVID : 226 DRM_MODE_SUBCONNECTOR_DVID :
@@ -1040,7 +1040,7 @@ nouveau_connector_create(struct drm_device *dev, int index)
1040 1040
1041 /* Init DVI-I specific properties */ 1041 /* Init DVI-I specific properties */
1042 if (nv_connector->type == DCB_CONNECTOR_DVI_I) 1042 if (nv_connector->type == DCB_CONNECTOR_DVI_I)
1043 drm_connector_attach_property(connector, dev->mode_config.dvi_i_subconnector_property, 0); 1043 drm_object_attach_property(&connector->base, dev->mode_config.dvi_i_subconnector_property, 0);
1044 1044
1045 /* Add overscan compensation options to digital outputs */ 1045 /* Add overscan compensation options to digital outputs */
1046 if (disp->underscan_property && 1046 if (disp->underscan_property &&
@@ -1048,31 +1048,31 @@ nouveau_connector_create(struct drm_device *dev, int index)
1048 type == DRM_MODE_CONNECTOR_DVII || 1048 type == DRM_MODE_CONNECTOR_DVII ||
1049 type == DRM_MODE_CONNECTOR_HDMIA || 1049 type == DRM_MODE_CONNECTOR_HDMIA ||
1050 type == DRM_MODE_CONNECTOR_DisplayPort)) { 1050 type == DRM_MODE_CONNECTOR_DisplayPort)) {
1051 drm_connector_attach_property(connector, 1051 drm_object_attach_property(&connector->base,
1052 disp->underscan_property, 1052 disp->underscan_property,
1053 UNDERSCAN_OFF); 1053 UNDERSCAN_OFF);
1054 drm_connector_attach_property(connector, 1054 drm_object_attach_property(&connector->base,
1055 disp->underscan_hborder_property, 1055 disp->underscan_hborder_property,
1056 0); 1056 0);
1057 drm_connector_attach_property(connector, 1057 drm_object_attach_property(&connector->base,
1058 disp->underscan_vborder_property, 1058 disp->underscan_vborder_property,
1059 0); 1059 0);
1060 } 1060 }
1061 1061
1062 /* Add hue and saturation options */ 1062 /* Add hue and saturation options */
1063 if (disp->vibrant_hue_property) 1063 if (disp->vibrant_hue_property)
1064 drm_connector_attach_property(connector, 1064 drm_object_attach_property(&connector->base,
1065 disp->vibrant_hue_property, 1065 disp->vibrant_hue_property,
1066 90); 1066 90);
1067 if (disp->color_vibrance_property) 1067 if (disp->color_vibrance_property)
1068 drm_connector_attach_property(connector, 1068 drm_object_attach_property(&connector->base,
1069 disp->color_vibrance_property, 1069 disp->color_vibrance_property,
1070 150); 1070 150);
1071 1071
1072 switch (nv_connector->type) { 1072 switch (nv_connector->type) {
1073 case DCB_CONNECTOR_VGA: 1073 case DCB_CONNECTOR_VGA:
1074 if (nv_device(drm->device)->card_type >= NV_50) { 1074 if (nv_device(drm->device)->card_type >= NV_50) {
1075 drm_connector_attach_property(connector, 1075 drm_object_attach_property(&connector->base,
1076 dev->mode_config.scaling_mode_property, 1076 dev->mode_config.scaling_mode_property,
1077 nv_connector->scaling_mode); 1077 nv_connector->scaling_mode);
1078 } 1078 }
@@ -1085,18 +1085,18 @@ nouveau_connector_create(struct drm_device *dev, int index)
1085 default: 1085 default:
1086 nv_connector->scaling_mode = DRM_MODE_SCALE_FULLSCREEN; 1086 nv_connector->scaling_mode = DRM_MODE_SCALE_FULLSCREEN;
1087 1087
1088 drm_connector_attach_property(connector, 1088 drm_object_attach_property(&connector->base,
1089 dev->mode_config.scaling_mode_property, 1089 dev->mode_config.scaling_mode_property,
1090 nv_connector->scaling_mode); 1090 nv_connector->scaling_mode);
1091 if (disp->dithering_mode) { 1091 if (disp->dithering_mode) {
1092 nv_connector->dithering_mode = DITHERING_MODE_AUTO; 1092 nv_connector->dithering_mode = DITHERING_MODE_AUTO;
1093 drm_connector_attach_property(connector, 1093 drm_object_attach_property(&connector->base,
1094 disp->dithering_mode, 1094 disp->dithering_mode,
1095 nv_connector->dithering_mode); 1095 nv_connector->dithering_mode);
1096 } 1096 }
1097 if (disp->dithering_depth) { 1097 if (disp->dithering_depth) {
1098 nv_connector->dithering_depth = DITHERING_DEPTH_AUTO; 1098 nv_connector->dithering_depth = DITHERING_DEPTH_AUTO;
1099 drm_connector_attach_property(connector, 1099 drm_object_attach_property(&connector->base,
1100 disp->dithering_depth, 1100 disp->dithering_depth,
1101 nv_connector->dithering_depth); 1101 nv_connector->dithering_depth);
1102 } 1102 }