aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-12-05 23:08:09 -0500
committerDave Airlie <airlied@redhat.com>2012-12-05 23:08:09 -0500
commit8de9e417757fb9f130f55a38f4ee7027b60de1c7 (patch)
treec701a9e568ebead069a7f967e38e69b0dd7a731b
parent00f09afd1740c3b2a1434bf48a124b316aab19f2 (diff)
parent584955632841c069678833f3320b4f6d21a8215e (diff)
Merge branch 'connector-to-object-prop' of git://github.com/robclark/kernel-omap4 into drm-next
* 'connector-to-object-prop' of git://github.com/robclark/kernel-omap4: drm: remove legacy drm_connector_property fxns drm/nouveau: drm_connector_property -> drm_object_property drm/i915: One more drm_connector_property -> drm_object_property drm/i2c: drm_connector_property -> drm_object_property drm/vmwgfx: drm_connector_property -> drm_object_property drm/udl: drm_connector_property -> drm_object_property drm/shmob: drm_connector_property -> drm_object_property drm/radeon: drm_connector_property -> drm_object_property drm/gma500: drm_connector_property -> drm_object_property
Diffstat
-rw-r--r--drivers/gpu/drm/drm_crtc.c31
-rw-r--r--drivers/gpu/drm/drm_fb_helper.c2
-rw-r--r--drivers/gpu/drm/drm_sysfs.c6
-rw-r--r--drivers/gpu/drm/gma500/cdv_device.c4
-rw-r--r--drivers/gpu/drm/gma500/cdv_intel_dp.c2
-rw-r--r--drivers/gpu/drm/gma500/cdv_intel_hdmi.c6
-rw-r--r--drivers/gpu/drm/gma500/cdv_intel_lvds.c10
-rw-r--r--drivers/gpu/drm/gma500/mdfld_dsi_output.c10
-rw-r--r--drivers/gpu/drm/gma500/mdfld_intel_display.c2
-rw-r--r--drivers/gpu/drm/gma500/oaktrail_crtc.c2
-rw-r--r--drivers/gpu/drm/gma500/oaktrail_lvds.c8
-rw-r--r--drivers/gpu/drm/gma500/psb_intel_lvds.c10
-rw-r--r--drivers/gpu/drm/gma500/psb_intel_sdvo.c24
-rw-r--r--drivers/gpu/drm/i2c/ch7006_drv.c20
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c4
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_connector.c22
-rw-r--r--drivers/gpu/drm/nouveau/nv17_tv.c16
-rw-r--r--drivers/gpu/drm/radeon/radeon_connectors.c62
-rw-r--r--drivers/gpu/drm/shmobile/shmob_drm_crtc.c2
-rw-r--r--drivers/gpu/drm/udl/udl_connector.c2
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c2
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c2
-rw-r--r--include/drm/drm_crtc.h8
23 files changed, 114 insertions, 143 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index d6d007275947..f2d667b8bee2 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -559,11 +559,11 @@ int drm_connector_init(struct drm_device *dev,
559 dev->mode_config.num_connector++; 559 dev->mode_config.num_connector++;
560 560
561 if (connector_type != DRM_MODE_CONNECTOR_VIRTUAL) 561 if (connector_type != DRM_MODE_CONNECTOR_VIRTUAL)
562 drm_connector_attach_property(connector, 562 drm_object_attach_property(&connector->base,
563 dev->mode_config.edid_property, 563 dev->mode_config.edid_property,
564 0); 564 0);
565 565
566 drm_connector_attach_property(connector, 566 drm_object_attach_property(&connector->base,
567 dev->mode_config.dpms_property, 0); 567 dev->mode_config.dpms_property, 0);
568 568
569 out: 569 out:
@@ -2928,27 +2928,6 @@ void drm_property_destroy(struct drm_device *dev, struct drm_property *property)
2928} 2928}
2929EXPORT_SYMBOL(drm_property_destroy); 2929EXPORT_SYMBOL(drm_property_destroy);
2930 2930
2931void drm_connector_attach_property(struct drm_connector *connector,
2932 struct drm_property *property, uint64_t init_val)
2933{
2934 drm_object_attach_property(&connector->base, property, init_val);
2935}
2936EXPORT_SYMBOL(drm_connector_attach_property);
2937
2938int drm_connector_property_set_value(struct drm_connector *connector,
2939 struct drm_property *property, uint64_t value)
2940{
2941 return drm_object_property_set_value(&connector->base, property, value);
2942}
2943EXPORT_SYMBOL(drm_connector_property_set_value);
2944
2945int drm_connector_property_get_value(struct drm_connector *connector,
2946 struct drm_property *property, uint64_t *val)
2947{
2948 return drm_object_property_get_value(&connector->base, property, val);
2949}
2950EXPORT_SYMBOL(drm_connector_property_get_value);
2951
2952void drm_object_attach_property(struct drm_mode_object *obj, 2931void drm_object_attach_property(struct drm_mode_object *obj,
2953 struct drm_property *property, 2932 struct drm_property *property,
2954 uint64_t init_val) 2933 uint64_t init_val)
@@ -3185,7 +3164,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
3185 /* Delete edid, when there is none. */ 3164 /* Delete edid, when there is none. */
3186 if (!edid) { 3165 if (!edid) {
3187 connector->edid_blob_ptr = NULL; 3166 connector->edid_blob_ptr = NULL;
3188 ret = drm_connector_property_set_value(connector, dev->mode_config.edid_property, 0); 3167 ret = drm_object_property_set_value(&connector->base, dev->mode_config.edid_property, 0);
3189 return ret; 3168 return ret;
3190 } 3169 }
3191 3170
@@ -3195,7 +3174,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
3195 if (!connector->edid_blob_ptr) 3174 if (!connector->edid_blob_ptr)
3196 return -EINVAL; 3175 return -EINVAL;
3197 3176
3198 ret = drm_connector_property_set_value(connector, 3177 ret = drm_object_property_set_value(&connector->base,
3199 dev->mode_config.edid_property, 3178 dev->mode_config.edid_property,
3200 connector->edid_blob_ptr->base.id); 3179 connector->edid_blob_ptr->base.id);
3201 3180
@@ -3262,7 +3241,7 @@ static int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
3262 3241
3263 /* store the property value if successful */ 3242 /* store the property value if successful */
3264 if (!ret) 3243 if (!ret)
3265 drm_connector_property_set_value(connector, property, value); 3244 drm_object_property_set_value(&connector->base, property, value);
3266 return ret; 3245 return ret;
3267} 3246}
3268 3247
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 05e623a5d095..954d175bd7fa 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -348,7 +348,7 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode)
348 for (j = 0; j < fb_helper->connector_count; j++) { 348 for (j = 0; j < fb_helper->connector_count; j++) {
349 connector = fb_helper->connector_info[j]->connector; 349 connector = fb_helper->connector_info[j]->connector;
350 connector->funcs->dpms(connector, dpms_mode); 350 connector->funcs->dpms(connector, dpms_mode);
351 drm_connector_property_set_value(connector, 351 drm_object_property_set_value(&connector->base,
352 dev->mode_config.dpms_property, dpms_mode); 352 dev->mode_config.dpms_property, dpms_mode);
353 } 353 }
354 } 354 }
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 05cd8fe062af..02296653a058 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,
182 uint64_t dpms_status; 182 uint64_t dpms_status;
183 int ret; 183 int ret;
184 184
185 ret = drm_connector_property_get_value(connector, 185 ret = drm_object_property_get_value(&connector->base,
186 dev->mode_config.dpms_property, 186 dev->mode_config.dpms_property,
187 &dpms_status); 187 &dpms_status);
188 if (ret) 188 if (ret)
@@ -277,7 +277,7 @@ static ssize_t subconnector_show(struct device *device,
277 return 0; 277 return 0;
278 } 278 }
279 279
280 ret = drm_connector_property_get_value(connector, prop, &subconnector); 280 ret = drm_object_property_get_value(&connector->base, prop, &subconnector);
281 if (ret) 281 if (ret)
282 return 0; 282 return 0;
283 283
@@ -318,7 +318,7 @@ static ssize_t select_subconnector_show(struct device *device,
318 return 0; 318 return 0;
319 } 319 }
320 320
321 ret = drm_connector_property_get_value(connector, prop, &subconnector); 321 ret = drm_object_property_get_value(&connector->base, prop, &subconnector);
322 if (ret) 322 if (ret)
323 return 0; 323 return 0;
324 324
diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
index 1ceca3d13b65..23e14e93991f 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)
523 523
524 dev_priv->force_audio_property = prop; 524 dev_priv->force_audio_property = prop;
525 } 525 }
526 drm_connector_attach_property(connector, prop, 0); 526 drm_object_attach_property(&connector->base, prop, 0);
527} 527}
528 528
529 529
@@ -553,7 +553,7 @@ void cdv_intel_attach_broadcast_rgb_property(struct drm_connector *connector)
553 dev_priv->broadcast_rgb_property = prop; 553 dev_priv->broadcast_rgb_property = prop;
554 } 554 }
555 555
556 drm_connector_attach_property(connector, prop, 0); 556 drm_object_attach_property(&connector->base, prop, 0);
557} 557}
558 558
559/* Cedarview */ 559/* Cedarview */
diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index e3a3978cf320..51044cc55cf2 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -1650,7 +1650,7 @@ cdv_intel_dp_set_property(struct drm_connector *connector,
1650 struct cdv_intel_dp *intel_dp = encoder->dev_priv; 1650 struct cdv_intel_dp *intel_dp = encoder->dev_priv;
1651 int ret; 1651 int ret;
1652 1652
1653 ret = drm_connector_property_set_value(connector, property, val); 1653 ret = drm_object_property_set_value(&connector->base, property, val);
1654 if (ret) 1654 if (ret)
1655 return ret; 1655 return ret;
1656 1656
diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
index 7272a461edfe..e223b500022e 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,
185 return -1; 185 return -1;
186 } 186 }
187 187
188 if (drm_connector_property_get_value(connector, 188 if (drm_object_property_get_value(&connector->base,
189 property, &curValue)) 189 property, &curValue))
190 return -1; 190 return -1;
191 191
192 if (curValue == value) 192 if (curValue == value)
193 return 0; 193 return 0;
194 194
195 if (drm_connector_property_set_value(connector, 195 if (drm_object_property_set_value(&connector->base,
196 property, value)) 196 property, value))
197 return -1; 197 return -1;
198 198
@@ -341,7 +341,7 @@ void cdv_hdmi_init(struct drm_device *dev,
341 connector->interlace_allowed = false; 341 connector->interlace_allowed = false;
342 connector->doublescan_allowed = false; 342 connector->doublescan_allowed = false;
343 343
344 drm_connector_attach_property(connector, 344 drm_object_attach_property(&connector->base,
345 dev->mode_config.scaling_mode_property, 345 dev->mode_config.scaling_mode_property,
346 DRM_MODE_SCALE_FULLSCREEN); 346 DRM_MODE_SCALE_FULLSCREEN);
347 347
diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
index b362dd39bf5a..d81dbc3368f0 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,
479 return -1; 479 return -1;
480 } 480 }
481 481
482 if (drm_connector_property_get_value(connector, 482 if (drm_object_property_get_value(&connector->base,
483 property, 483 property,
484 &curValue)) 484 &curValue))
485 return -1; 485 return -1;
@@ -487,7 +487,7 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector,
487 if (curValue == value) 487 if (curValue == value)
488 return 0; 488 return 0;
489 489
490 if (drm_connector_property_set_value(connector, 490 if (drm_object_property_set_value(&connector->base,
491 property, 491 property,
492 value)) 492 value))
493 return -1; 493 return -1;
@@ -502,7 +502,7 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector,
502 return -1; 502 return -1;
503 } 503 }
504 } else if (!strcmp(property->name, "backlight") && encoder) { 504 } else if (!strcmp(property->name, "backlight") && encoder) {
505 if (drm_connector_property_set_value(connector, 505 if (drm_object_property_set_value(&connector->base,
506 property, 506 property,
507 value)) 507 value))
508 return -1; 508 return -1;
@@ -671,10 +671,10 @@ void cdv_intel_lvds_init(struct drm_device *dev,
671 connector->doublescan_allowed = false; 671 connector->doublescan_allowed = false;
672 672
673 /*Attach connector properties*/ 673 /*Attach connector properties*/
674 drm_connector_attach_property(connector, 674 drm_object_attach_property(&connector->base,
675 dev->mode_config.scaling_mode_property, 675 dev->mode_config.scaling_mode_property,
676 DRM_MODE_SCALE_FULLSCREEN); 676 DRM_MODE_SCALE_FULLSCREEN);
677 drm_connector_attach_property(connector, 677 drm_object_attach_property(&connector->base,
678 dev_priv->backlight_property, 678 dev_priv->backlight_property,
679 BRIGHTNESS_MAX_LEVEL); 679 BRIGHTNESS_MAX_LEVEL);
680 680
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
index 637dd84785e2..2d4ab48f07a2 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,
265 goto set_prop_error; 265 goto set_prop_error;
266 } 266 }
267 267
268 if (drm_connector_property_get_value(connector, property, &val)) 268 if (drm_object_property_get_value(&connector->base, property, &val))
269 goto set_prop_error; 269 goto set_prop_error;
270 270
271 if (val == value) 271 if (val == value)
272 goto set_prop_done; 272 goto set_prop_done;
273 273
274 if (drm_connector_property_set_value(connector, 274 if (drm_object_property_set_value(&connector->base,
275 property, value)) 275 property, value))
276 goto set_prop_error; 276 goto set_prop_error;
277 277
@@ -296,7 +296,7 @@ static int mdfld_dsi_connector_set_property(struct drm_connector *connector,
296 } 296 }
297 } 297 }
298 } else if (!strcmp(property->name, "backlight") && encoder) { 298 } else if (!strcmp(property->name, "backlight") && encoder) {
299 if (drm_connector_property_set_value(connector, property, 299 if (drm_object_property_set_value(&connector->base, property,
300 value)) 300 value))
301 goto set_prop_error; 301 goto set_prop_error;
302 else 302 else
@@ -572,10 +572,10 @@ void mdfld_dsi_output_init(struct drm_device *dev,
572 connector->doublescan_allowed = false; 572 connector->doublescan_allowed = false;
573 573
574 /*attach properties*/ 574 /*attach properties*/
575 drm_connector_attach_property(connector, 575 drm_object_attach_property(&connector->base,
576 dev->mode_config.scaling_mode_property, 576 dev->mode_config.scaling_mode_property,
577 DRM_MODE_SCALE_FULLSCREEN); 577 DRM_MODE_SCALE_FULLSCREEN);
578 drm_connector_attach_property(connector, 578 drm_object_attach_property(&connector->base,
579 dev_priv->backlight_property, 579 dev_priv->backlight_property,
580 MDFLD_DSI_BRIGHTNESS_MAX_LEVEL); 580 MDFLD_DSI_BRIGHTNESS_MAX_LEVEL);
581 581
diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c
index dec6a9aea3c6..74485dc43945 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,
820 REG_WRITE(map->pos, 0); 820 REG_WRITE(map->pos, 0);
821 821
822 if (psb_intel_encoder) 822 if (psb_intel_encoder)
823 drm_connector_property_get_value(connector, 823 drm_object_property_get_value(&connector->base,
824 dev->mode_config.scaling_mode_property, &scalingType); 824 dev->mode_config.scaling_mode_property, &scalingType);
825 825
826 if (scalingType == DRM_MODE_SCALE_NO_SCALE) { 826 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 4ec2962f7635..3071526bc3c1 100644
--- a/drivers/gpu/drm/gma500/oaktrail_crtc.c
+++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c
@@ -351,7 +351,7 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,
351 (mode->crtc_vdisplay - 1)); 351 (mode->crtc_vdisplay - 1));
352 352
353 if (psb_intel_encoder) 353 if (psb_intel_encoder)
354 drm_connector_property_get_value(connector, 354 drm_object_property_get_value(&connector->base,
355 dev->mode_config.scaling_mode_property, &scalingType); 355 dev->mode_config.scaling_mode_property, &scalingType);
356 356
357 if (scalingType == DRM_MODE_SCALE_NO_SCALE) { 357 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 558c77fb55ec..325013a9c48c 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,
133 return; 133 return;
134 } 134 }
135 135
136 drm_connector_property_get_value( 136 drm_object_property_get_value(
137 connector, 137 &connector->base,
138 dev->mode_config.scaling_mode_property, 138 dev->mode_config.scaling_mode_property,
139 &v); 139 &v);
140 140
@@ -363,10 +363,10 @@ void oaktrail_lvds_init(struct drm_device *dev,
363 connector->interlace_allowed = false; 363 connector->interlace_allowed = false;
364 connector->doublescan_allowed = false; 364 connector->doublescan_allowed = false;
365 365
366 drm_connector_attach_property(connector, 366 drm_object_attach_property(&connector->base,
367 dev->mode_config.scaling_mode_property, 367 dev->mode_config.scaling_mode_property,
368 DRM_MODE_SCALE_FULLSCREEN); 368 DRM_MODE_SCALE_FULLSCREEN);
369 drm_connector_attach_property(connector, 369 drm_object_attach_property(&connector->base,
370 dev_priv->backlight_property, 370 dev_priv->backlight_property,
371 BRIGHTNESS_MAX_LEVEL); 371 BRIGHTNESS_MAX_LEVEL);
372 372
diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c
index 2a4c3a9e33e3..9fa5fa2e6192 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,
603 goto set_prop_error; 603 goto set_prop_error;
604 } 604 }
605 605
606 if (drm_connector_property_get_value(connector, 606 if (drm_object_property_get_value(&connector->base,
607 property, 607 property,
608 &curval)) 608 &curval))
609 goto set_prop_error; 609 goto set_prop_error;
@@ -611,7 +611,7 @@ int psb_intel_lvds_set_property(struct drm_connector *connector,
611 if (curval == value) 611 if (curval == value)
612 goto set_prop_done; 612 goto set_prop_done;
613 613
614 if (drm_connector_property_set_value(connector, 614 if (drm_object_property_set_value(&connector->base,
615 property, 615 property,
616 value)) 616 value))
617 goto set_prop_error; 617 goto set_prop_error;
@@ -626,7 +626,7 @@ int psb_intel_lvds_set_property(struct drm_connector *connector,
626 goto set_prop_error; 626 goto set_prop_error;
627 } 627 }
628 } else if (!strcmp(property->name, "backlight")) { 628 } else if (!strcmp(property->name, "backlight")) {
629 if (drm_connector_property_set_value(connector, 629 if (drm_object_property_set_value(&connector->base,
630 property, 630 property,
631 value)) 631 value))
632 goto set_prop_error; 632 goto set_prop_error;
@@ -746,10 +746,10 @@ void psb_intel_lvds_init(struct drm_device *dev,
746 connector->doublescan_allowed = false; 746 connector->doublescan_allowed = false;
747 747
748 /*Attach connector properties*/ 748 /*Attach connector properties*/
749 drm_connector_attach_property(connector, 749 drm_object_attach_property(&connector->base,
750 dev->mode_config.scaling_mode_property, 750 dev->mode_config.scaling_mode_property,
751 DRM_MODE_SCALE_FULLSCREEN); 751 DRM_MODE_SCALE_FULLSCREEN);
752 drm_connector_attach_property(connector, 752 drm_object_attach_property(&connector->base,
753 dev_priv->backlight_property, 753 dev_priv->backlight_property,
754 BRIGHTNESS_MAX_LEVEL); 754 BRIGHTNESS_MAX_LEVEL);
755 755
diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index fc9292705dbf..a4cc777ab7a6 100644
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -1694,7 +1694,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,
1694 uint8_t cmd; 1694 uint8_t cmd;
1695 int ret; 1695 int ret;
1696 1696
1697 ret = drm_connector_property_set_value(connector, property, val); 1697 ret = drm_object_property_set_value(&connector->base, property, val);
1698 if (ret) 1698 if (ret)
1699 return ret; 1699 return ret;
1700 1700
@@ -1749,7 +1749,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,
1749 } else if (IS_TV_OR_LVDS(psb_intel_sdvo_connector)) { 1749 } else if (IS_TV_OR_LVDS(psb_intel_sdvo_connector)) {
1750 temp_value = val; 1750 temp_value = val;
1751 if (psb_intel_sdvo_connector->left == property) { 1751 if (psb_intel_sdvo_connector->left == property) {
1752 drm_connector_property_set_value(connector, 1752 drm_object_property_set_value(&connector->base,
1753 psb_intel_sdvo_connector->right, val); 1753 psb_intel_sdvo_connector->right, val);
1754 if (psb_intel_sdvo_connector->left_margin == temp_value) 1754 if (psb_intel_sdvo_connector->left_margin == temp_value)
1755 return 0; 1755 return 0;
@@ -1761,7 +1761,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,
1761 cmd = SDVO_CMD_SET_OVERSCAN_H; 1761 cmd = SDVO_CMD_SET_OVERSCAN_H;
1762 goto set_value; 1762 goto set_value;
1763 } else if (psb_intel_sdvo_connector->right == property) { 1763 } else if (psb_intel_sdvo_connector->right == property) {
1764 drm_connector_property_set_value(connector, 1764 drm_object_property_set_value(&connector->base,
1765 psb_intel_sdvo_connector->left, val); 1765 psb_intel_sdvo_connector->left, val);
1766 if (psb_intel_sdvo_connector->right_margin == temp_value) 1766 if (psb_intel_sdvo_connector->right_margin == temp_value)
1767 return 0; 1767 return 0;
@@ -1773,7 +1773,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,
1773 cmd = SDVO_CMD_SET_OVERSCAN_H; 1773 cmd = SDVO_CMD_SET_OVERSCAN_H;
1774 goto set_value; 1774 goto set_value;
1775 } else if (psb_intel_sdvo_connector->top == property) { 1775 } else if (psb_intel_sdvo_connector->top == property) {
1776 drm_connector_property_set_value(connector, 1776 drm_object_property_set_value(&connector->base,
1777 psb_intel_sdvo_connector->bottom, val); 1777 psb_intel_sdvo_connector->bottom, val);
1778 if (psb_intel_sdvo_connector->top_margin == temp_value) 1778 if (psb_intel_sdvo_connector->top_margin == temp_value)
1779 return 0; 1779 return 0;
@@ -1785,7 +1785,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector,
1785 cmd = SDVO_CMD_SET_OVERSCAN_V; 1785 cmd = SDVO_CMD_SET_OVERSCAN_V;
1786 goto set_value; 1786 goto set_value;
1787 } else if (psb_intel_sdvo_connector->bottom == property) { 1787 } else if (psb_intel_sdvo_connector->bottom == property) {
1788 drm_connector_property_set_value(connector, 1788 drm_object_property_set_value(&connector->base,
1789 psb_intel_sdvo_connector->top, val); 1789 psb_intel_sdvo_connector->top, val);
1790 if (psb_intel_sdvo_connector->bottom_margin == temp_value) 1790 if (psb_intel_sdvo_connector->bottom_margin == temp_value)
1791 return 0; 1791 return 0;
@@ -2286,7 +2286,7 @@ static bool psb_intel_sdvo_tv_create_property(struct psb_intel_sdvo *psb_intel_s
2286 i, tv_format_names[psb_intel_sdvo_connector->tv_format_supported[i]]); 2286 i, tv_format_names[psb_intel_sdvo_connector->tv_format_supported[i]]);
2287 2287
2288 psb_intel_sdvo->tv_format_index = psb_intel_sdvo_connector->tv_format_supported[0]; 2288 psb_intel_sdvo->tv_format_index = psb_intel_sdvo_connector->tv_format_supported[0];
2289 drm_connector_attach_property(&psb_intel_sdvo_connector->base.base, 2289 drm_object_attach_property(&psb_intel_sdvo_connector->base.base.base,
2290 psb_intel_sdvo_connector->tv_format, 0); 2290 psb_intel_sdvo_connector->tv_format, 0);
2291 return true; 2291 return true;
2292 2292
@@ -2302,7 +2302,7 @@ static bool psb_intel_sdvo_tv_create_property(struct psb_intel_sdvo *psb_intel_s
2302 psb_intel_sdvo_connector->name = \ 2302 psb_intel_sdvo_connector->name = \
2303 drm_property_create_range(dev, 0, #name, 0, data_value[0]); \ 2303 drm_property_create_range(dev, 0, #name, 0, data_value[0]); \
2304 if (!psb_intel_sdvo_connector->name) return false; \ 2304 if (!psb_intel_sdvo_connector->name) return false; \
2305 drm_connector_attach_property(connector, \ 2305 drm_object_attach_property(&connector->base, \
2306 psb_intel_sdvo_connector->name, \ 2306 psb_intel_sdvo_connector->name, \
2307 psb_intel_sdvo_connector->cur_##name); \ 2307 psb_intel_sdvo_connector->cur_##name); \
2308 DRM_DEBUG_KMS(#name ": max %d, default %d, current %d\n", \ 2308 DRM_DEBUG_KMS(#name ": max %d, default %d, current %d\n", \
@@ -2339,7 +2339,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
2339 if (!psb_intel_sdvo_connector->left) 2339 if (!psb_intel_sdvo_connector->left)
2340 return false; 2340 return false;
2341 2341
2342 drm_connector_attach_property(connector, 2342 drm_object_attach_property(&connector->base,
2343 psb_intel_sdvo_connector->left, 2343 psb_intel_sdvo_connector->left,
2344 psb_intel_sdvo_connector->left_margin); 2344 psb_intel_sdvo_connector->left_margin);
2345 2345
@@ -2348,7 +2348,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
2348 if (!psb_intel_sdvo_connector->right) 2348 if (!psb_intel_sdvo_connector->right)
2349 return false; 2349 return false;
2350 2350
2351 drm_connector_attach_property(connector, 2351 drm_object_attach_property(&connector->base,
2352 psb_intel_sdvo_connector->right, 2352 psb_intel_sdvo_connector->right,
2353 psb_intel_sdvo_connector->right_margin); 2353 psb_intel_sdvo_connector->right_margin);
2354 DRM_DEBUG_KMS("h_overscan: max %d, " 2354 DRM_DEBUG_KMS("h_overscan: max %d, "
@@ -2375,7 +2375,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
2375 if (!psb_intel_sdvo_connector->top) 2375 if (!psb_intel_sdvo_connector->top)
2376 return false; 2376 return false;
2377 2377
2378 drm_connector_attach_property(connector, 2378 drm_object_attach_property(&connector->base,
2379 psb_intel_sdvo_connector->top, 2379 psb_intel_sdvo_connector->top,
2380 psb_intel_sdvo_connector->top_margin); 2380 psb_intel_sdvo_connector->top_margin);
2381 2381
@@ -2384,7 +2384,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
2384 if (!psb_intel_sdvo_connector->bottom) 2384 if (!psb_intel_sdvo_connector->bottom)
2385 return false; 2385 return false;
2386 2386
2387 drm_connector_attach_property(connector, 2387 drm_object_attach_property(&connector->base,
2388 psb_intel_sdvo_connector->bottom, 2388 psb_intel_sdvo_connector->bottom,
2389 psb_intel_sdvo_connector->bottom_margin); 2389 psb_intel_sdvo_connector->bottom_margin);
2390 DRM_DEBUG_KMS("v_overscan: max %d, " 2390 DRM_DEBUG_KMS("v_overscan: max %d, "
@@ -2416,7 +2416,7 @@ psb_intel_sdvo_create_enhance_property_tv(struct psb_intel_sdvo *psb_intel_sdvo,
2416 if (!psb_intel_sdvo_connector->dot_crawl) 2416 if (!psb_intel_sdvo_connector->dot_crawl)
2417 return false; 2417 return false;
2418 2418
2419 drm_connector_attach_property(connector, 2419 drm_object_attach_property(&connector->base,
2420 psb_intel_sdvo_connector->dot_crawl, 2420 psb_intel_sdvo_connector->dot_crawl,
2421 psb_intel_sdvo_connector->cur_dot_crawl); 2421 psb_intel_sdvo_connector->cur_dot_crawl);
2422 DRM_DEBUG_KMS("dot crawl: current %d\n", response); 2422 DRM_DEBUG_KMS("dot crawl: current %d\n", response);
diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
index 599099fe76e3..b865d0728e28 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
214 else 214 else
215 priv->subconnector = DRM_MODE_SUBCONNECTOR_Unknown; 215 priv->subconnector = DRM_MODE_SUBCONNECTOR_Unknown;
216 216
217 drm_connector_property_set_value(connector, 217 drm_object_property_set_value(&connector->base,
218 encoder->dev->mode_config.tv_subconnector_property, 218 encoder->dev->mode_config.tv_subconnector_property,
219 priv->subconnector); 219 priv->subconnector);
220 220
@@ -254,23 +254,23 @@ static int ch7006_encoder_create_resources(struct drm_encoder *encoder,
254 254
255 priv->scale_property = drm_property_create_range(dev, 0, "scale", 0, 2); 255 priv->scale_property = drm_property_create_range(dev, 0, "scale", 0, 2);
256 256
257 drm_connector_attach_property(connector, conf->tv_select_subconnector_property, 257 drm_object_attach_property(&connector->base, conf->tv_select_subconnector_property,
258 priv->select_subconnector); 258 priv->select_subconnector);
259 drm_connector_attach_property(connector, conf->tv_subconnector_property, 259 drm_object_attach_property(&connector->base, conf->tv_subconnector_property,
260 priv->subconnector); 260 priv->subconnector);
261 drm_connector_attach_property(connector, conf->tv_left_margin_property, 261 drm_object_attach_property(&connector->base, conf->tv_left_margin_property,
262 priv->hmargin); 262 priv->hmargin);
263 drm_connector_attach_property(connector, conf->tv_bottom_margin_property, 263 drm_object_attach_property(&connector->base, conf->tv_bottom_margin_property,
264 priv->vmargin); 264 priv->vmargin);
265 drm_connector_attach_property(connector, conf->tv_mode_property, 265 drm_object_attach_property(&connector->base, conf->tv_mode_property,
266 priv->norm); 266 priv->norm);
267 drm_connector_attach_property(connector, conf->tv_brightness_property, 267 drm_object_attach_property(&connector->base, conf->tv_brightness_property,
268 priv->brightness); 268 priv->brightness);
269 drm_connector_attach_property(connector, conf->tv_contrast_property, 269 drm_object_attach_property(&connector->base, conf->tv_contrast_property,
270 priv->contrast); 270 priv->contrast);
271 drm_connector_attach_property(connector, conf->tv_flicker_reduction_property, 271 drm_object_attach_property(&connector->base, conf->tv_flicker_reduction_property,
272 priv->flicker); 272 priv->flicker);
273 drm_connector_attach_property(connector, priv->scale_property, 273 drm_object_attach_property(&connector->base, priv->scale_property,
274 priv->scale); 274 priv->scale);
275 275
276 return 0; 276 return 0;
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index d76258dcb8f8..1b63d55318a0 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2569,8 +2569,8 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect
2569 2569
2570 if (is_edp(intel_dp)) { 2570 if (is_edp(intel_dp)) {
2571 drm_mode_create_scaling_mode_property(connector->dev); 2571 drm_mode_create_scaling_mode_property(connector->dev);
2572 drm_connector_attach_property( 2572 drm_object_attach_property(
2573 connector, 2573 &connector->base,
2574 connector->dev->mode_config.scaling_mode_property, 2574 connector->dev->mode_config.scaling_mode_property,
2575 DRM_MODE_SCALE_ASPECT); 2575 DRM_MODE_SCALE_ASPECT);
2576 intel_connector->panel.fitting_mode = DRM_MODE_SCALE_ASPECT; 2576 intel_connector->panel.fitting_mode = DRM_MODE_SCALE_ASPECT;
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 }
diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
index 897b63621e2d..2ca276ada507 100644
--- a/drivers/gpu/drm/nouveau/nv17_tv.c
+++ b/drivers/gpu/drm/nouveau/nv17_tv.c
@@ -195,7 +195,7 @@ nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector)
195 break; 195 break;
196 } 196 }
197 197
198 drm_connector_property_set_value(connector, 198 drm_object_property_set_value(&connector->base,
199 conf->tv_subconnector_property, 199 conf->tv_subconnector_property,
200 tv_enc->subconnector); 200 tv_enc->subconnector);
201 201
@@ -672,25 +672,25 @@ static int nv17_tv_create_resources(struct drm_encoder *encoder,
672 672
673 drm_mode_create_tv_properties(dev, num_tv_norms, nv17_tv_norm_names); 673 drm_mode_create_tv_properties(dev, num_tv_norms, nv17_tv_norm_names);
674 674
675 drm_connector_attach_property(connector, 675 drm_object_attach_property(&connector->base,
676 conf->tv_select_subconnector_property, 676 conf->tv_select_subconnector_property,
677 tv_enc->select_subconnector); 677 tv_enc->select_subconnector);
678 drm_connector_attach_property(connector, 678 drm_object_attach_property(&connector->base,
679 conf->tv_subconnector_property, 679 conf->tv_subconnector_property,
680 tv_enc->subconnector); 680 tv_enc->subconnector);
681 drm_connector_attach_property(connector, 681 drm_object_attach_property(&connector->base,
682 conf->tv_mode_property, 682 conf->tv_mode_property,
683 tv_enc->tv_norm); 683 tv_enc->tv_norm);
684 drm_connector_attach_property(connector, 684 drm_object_attach_property(&connector->base,
685 conf->tv_flicker_reduction_property, 685 conf->tv_flicker_reduction_property,
686 tv_enc->flicker); 686 tv_enc->flicker);
687 drm_connector_attach_property(connector, 687 drm_object_attach_property(&connector->base,
688 conf->tv_saturation_property, 688 conf->tv_saturation_property,
689 tv_enc->saturation); 689 tv_enc->saturation);
690 drm_connector_attach_property(connector, 690 drm_object_attach_property(&connector->base,
691 conf->tv_hue_property, 691 conf->tv_hue_property,
692 tv_enc->hue); 692 tv_enc->hue);
693 drm_connector_attach_property(connector, 693 drm_object_attach_property(&connector->base,
694 conf->tv_overscan_property, 694 conf->tv_overscan_property,
695 tv_enc->overscan); 695 tv_enc->overscan);
696 696
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index b884c362a8c2..47bf162ab9c6 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -1599,7 +1599,7 @@ radeon_add_atom_connector(struct drm_device *dev,
1599 connector->interlace_allowed = true; 1599 connector->interlace_allowed = true;
1600 connector->doublescan_allowed = true; 1600 connector->doublescan_allowed = true;
1601 radeon_connector->dac_load_detect = true; 1601 radeon_connector->dac_load_detect = true;
1602 drm_connector_attach_property(&radeon_connector->base, 1602 drm_object_attach_property(&radeon_connector->base.base,
1603 rdev->mode_info.load_detect_property, 1603 rdev->mode_info.load_detect_property,
1604 1); 1604 1);
1605 break; 1605 break;
@@ -1608,13 +1608,13 @@ radeon_add_atom_connector(struct drm_device *dev,
1608 case DRM_MODE_CONNECTOR_HDMIA: 1608 case DRM_MODE_CONNECTOR_HDMIA:
1609 case DRM_MODE_CONNECTOR_HDMIB: 1609 case DRM_MODE_CONNECTOR_HDMIB:
1610 case DRM_MODE_CONNECTOR_DisplayPort: 1610 case DRM_MODE_CONNECTOR_DisplayPort:
1611 drm_connector_attach_property(&radeon_connector->base, 1611 drm_object_attach_property(&radeon_connector->base.base,
1612 rdev->mode_info.underscan_property, 1612 rdev->mode_info.underscan_property,
1613 UNDERSCAN_OFF); 1613 UNDERSCAN_OFF);
1614 drm_connector_attach_property(&radeon_connector->base, 1614 drm_object_attach_property(&radeon_connector->base.base,
1615 rdev->mode_info.underscan_hborder_property, 1615 rdev->mode_info.underscan_hborder_property,
1616 0); 1616 0);
1617 drm_connector_attach_property(&radeon_connector->base, 1617 drm_object_attach_property(&radeon_connector->base.base,
1618 rdev->mode_info.underscan_vborder_property, 1618 rdev->mode_info.underscan_vborder_property,
1619 0); 1619 0);
1620 subpixel_order = SubPixelHorizontalRGB; 1620 subpixel_order = SubPixelHorizontalRGB;
@@ -1625,14 +1625,14 @@ radeon_add_atom_connector(struct drm_device *dev,
1625 connector->doublescan_allowed = false; 1625 connector->doublescan_allowed = false;
1626 if (connector_type == DRM_MODE_CONNECTOR_DVII) { 1626 if (connector_type == DRM_MODE_CONNECTOR_DVII) {
1627 radeon_connector->dac_load_detect = true; 1627 radeon_connector->dac_load_detect = true;
1628 drm_connector_attach_property(&radeon_connector->base, 1628 drm_object_attach_property(&radeon_connector->base.base,
1629 rdev->mode_info.load_detect_property, 1629 rdev->mode_info.load_detect_property,
1630 1); 1630 1);
1631 } 1631 }
1632 break; 1632 break;
1633 case DRM_MODE_CONNECTOR_LVDS: 1633 case DRM_MODE_CONNECTOR_LVDS:
1634 case DRM_MODE_CONNECTOR_eDP: 1634 case DRM_MODE_CONNECTOR_eDP:
1635 drm_connector_attach_property(&radeon_connector->base, 1635 drm_object_attach_property(&radeon_connector->base.base,
1636 dev->mode_config.scaling_mode_property, 1636 dev->mode_config.scaling_mode_property,
1637 DRM_MODE_SCALE_FULLSCREEN); 1637 DRM_MODE_SCALE_FULLSCREEN);
1638 subpixel_order = SubPixelHorizontalRGB; 1638 subpixel_order = SubPixelHorizontalRGB;
@@ -1651,7 +1651,7 @@ radeon_add_atom_connector(struct drm_device *dev,
1651 DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1651 DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1652 } 1652 }
1653 radeon_connector->dac_load_detect = true; 1653 radeon_connector->dac_load_detect = true;
1654 drm_connector_attach_property(&radeon_connector->base, 1654 drm_object_attach_property(&radeon_connector->base.base,
1655 rdev->mode_info.load_detect_property, 1655 rdev->mode_info.load_detect_property,
1656 1); 1656 1);
1657 /* no HPD on analog connectors */ 1657 /* no HPD on analog connectors */
@@ -1669,7 +1669,7 @@ radeon_add_atom_connector(struct drm_device *dev,
1669 DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1669 DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1670 } 1670 }
1671 radeon_connector->dac_load_detect = true; 1671 radeon_connector->dac_load_detect = true;
1672 drm_connector_attach_property(&radeon_connector->base, 1672 drm_object_attach_property(&radeon_connector->base.base,
1673 rdev->mode_info.load_detect_property, 1673 rdev->mode_info.load_detect_property,
1674 1); 1674 1);
1675 /* no HPD on analog connectors */ 1675 /* no HPD on analog connectors */
@@ -1692,23 +1692,23 @@ radeon_add_atom_connector(struct drm_device *dev,
1692 DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1692 DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1693 } 1693 }
1694 subpixel_order = SubPixelHorizontalRGB; 1694 subpixel_order = SubPixelHorizontalRGB;
1695 drm_connector_attach_property(&radeon_connector->base, 1695 drm_object_attach_property(&radeon_connector->base.base,
1696 rdev->mode_info.coherent_mode_property, 1696 rdev->mode_info.coherent_mode_property,
1697 1); 1697 1);
1698 if (ASIC_IS_AVIVO(rdev)) { 1698 if (ASIC_IS_AVIVO(rdev)) {
1699 drm_connector_attach_property(&radeon_connector->base, 1699 drm_object_attach_property(&radeon_connector->base.base,
1700 rdev->mode_info.underscan_property, 1700 rdev->mode_info.underscan_property,
1701 UNDERSCAN_OFF); 1701 UNDERSCAN_OFF);
1702 drm_connector_attach_property(&radeon_connector->base, 1702 drm_object_attach_property(&radeon_connector->base.base,
1703 rdev->mode_info.underscan_hborder_property, 1703 rdev->mode_info.underscan_hborder_property,
1704 0); 1704 0);
1705 drm_connector_attach_property(&radeon_connector->base, 1705 drm_object_attach_property(&radeon_connector->base.base,
1706 rdev->mode_info.underscan_vborder_property, 1706 rdev->mode_info.underscan_vborder_property,
1707 0); 1707 0);
1708 } 1708 }
1709 if (connector_type == DRM_MODE_CONNECTOR_DVII) { 1709 if (connector_type == DRM_MODE_CONNECTOR_DVII) {
1710 radeon_connector->dac_load_detect = true; 1710 radeon_connector->dac_load_detect = true;
1711 drm_connector_attach_property(&radeon_connector->base, 1711 drm_object_attach_property(&radeon_connector->base.base,
1712 rdev->mode_info.load_detect_property, 1712 rdev->mode_info.load_detect_property,
1713 1); 1713 1);
1714 } 1714 }
@@ -1732,17 +1732,17 @@ radeon_add_atom_connector(struct drm_device *dev,
1732 if (!radeon_connector->ddc_bus) 1732 if (!radeon_connector->ddc_bus)
1733 DRM_ERROR("HDMI: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1733 DRM_ERROR("HDMI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1734 } 1734 }
1735 drm_connector_attach_property(&radeon_connector->base, 1735 drm_object_attach_property(&radeon_connector->base.base,
1736 rdev->mode_info.coherent_mode_property, 1736 rdev->mode_info.coherent_mode_property,
1737 1); 1737 1);
1738 if (ASIC_IS_AVIVO(rdev)) { 1738 if (ASIC_IS_AVIVO(rdev)) {
1739 drm_connector_attach_property(&radeon_connector->base, 1739 drm_object_attach_property(&radeon_connector->base.base,
1740 rdev->mode_info.underscan_property, 1740 rdev->mode_info.underscan_property,
1741 UNDERSCAN_OFF); 1741 UNDERSCAN_OFF);
1742 drm_connector_attach_property(&radeon_connector->base, 1742 drm_object_attach_property(&radeon_connector->base.base,
1743 rdev->mode_info.underscan_hborder_property, 1743 rdev->mode_info.underscan_hborder_property,
1744 0); 1744 0);
1745 drm_connector_attach_property(&radeon_connector->base, 1745 drm_object_attach_property(&radeon_connector->base.base,
1746 rdev->mode_info.underscan_vborder_property, 1746 rdev->mode_info.underscan_vborder_property,
1747 0); 1747 0);
1748 } 1748 }
@@ -1771,17 +1771,17 @@ radeon_add_atom_connector(struct drm_device *dev,
1771 DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1771 DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1772 } 1772 }
1773 subpixel_order = SubPixelHorizontalRGB; 1773 subpixel_order = SubPixelHorizontalRGB;
1774 drm_connector_attach_property(&radeon_connector->base, 1774 drm_object_attach_property(&radeon_connector->base.base,
1775 rdev->mode_info.coherent_mode_property, 1775 rdev->mode_info.coherent_mode_property,
1776 1); 1776 1);
1777 if (ASIC_IS_AVIVO(rdev)) { 1777 if (ASIC_IS_AVIVO(rdev)) {
1778 drm_connector_attach_property(&radeon_connector->base, 1778 drm_object_attach_property(&radeon_connector->base.base,
1779 rdev->mode_info.underscan_property, 1779 rdev->mode_info.underscan_property,
1780 UNDERSCAN_OFF); 1780 UNDERSCAN_OFF);
1781 drm_connector_attach_property(&radeon_connector->base, 1781 drm_object_attach_property(&radeon_connector->base.base,
1782 rdev->mode_info.underscan_hborder_property, 1782 rdev->mode_info.underscan_hborder_property,
1783 0); 1783 0);
1784 drm_connector_attach_property(&radeon_connector->base, 1784 drm_object_attach_property(&radeon_connector->base.base,
1785 rdev->mode_info.underscan_vborder_property, 1785 rdev->mode_info.underscan_vborder_property,
1786 0); 1786 0);
1787 } 1787 }
@@ -1806,7 +1806,7 @@ radeon_add_atom_connector(struct drm_device *dev,
1806 if (!radeon_connector->ddc_bus) 1806 if (!radeon_connector->ddc_bus)
1807 DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1807 DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1808 } 1808 }
1809 drm_connector_attach_property(&radeon_connector->base, 1809 drm_object_attach_property(&radeon_connector->base.base,
1810 dev->mode_config.scaling_mode_property, 1810 dev->mode_config.scaling_mode_property,
1811 DRM_MODE_SCALE_FULLSCREEN); 1811 DRM_MODE_SCALE_FULLSCREEN);
1812 subpixel_order = SubPixelHorizontalRGB; 1812 subpixel_order = SubPixelHorizontalRGB;
@@ -1819,10 +1819,10 @@ radeon_add_atom_connector(struct drm_device *dev,
1819 drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type); 1819 drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);
1820 drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs); 1820 drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);
1821 radeon_connector->dac_load_detect = true; 1821 radeon_connector->dac_load_detect = true;
1822 drm_connector_attach_property(&radeon_connector->base, 1822 drm_object_attach_property(&radeon_connector->base.base,
1823 rdev->mode_info.load_detect_property, 1823 rdev->mode_info.load_detect_property,
1824 1); 1824 1);
1825 drm_connector_attach_property(&radeon_connector->base, 1825 drm_object_attach_property(&radeon_connector->base.base,
1826 rdev->mode_info.tv_std_property, 1826 rdev->mode_info.tv_std_property,
1827 radeon_atombios_get_tv_info(rdev)); 1827 radeon_atombios_get_tv_info(rdev));
1828 /* no HPD on analog connectors */ 1828 /* no HPD on analog connectors */
@@ -1843,7 +1843,7 @@ radeon_add_atom_connector(struct drm_device *dev,
1843 if (!radeon_connector->ddc_bus) 1843 if (!radeon_connector->ddc_bus)
1844 DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1844 DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1845 } 1845 }
1846 drm_connector_attach_property(&radeon_connector->base, 1846 drm_object_attach_property(&radeon_connector->base.base,
1847 dev->mode_config.scaling_mode_property, 1847 dev->mode_config.scaling_mode_property,
1848 DRM_MODE_SCALE_FULLSCREEN); 1848 DRM_MODE_SCALE_FULLSCREEN);
1849 subpixel_order = SubPixelHorizontalRGB; 1849 subpixel_order = SubPixelHorizontalRGB;
@@ -1922,7 +1922,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
1922 DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1922 DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1923 } 1923 }
1924 radeon_connector->dac_load_detect = true; 1924 radeon_connector->dac_load_detect = true;
1925 drm_connector_attach_property(&radeon_connector->base, 1925 drm_object_attach_property(&radeon_connector->base.base,
1926 rdev->mode_info.load_detect_property, 1926 rdev->mode_info.load_detect_property,
1927 1); 1927 1);
1928 /* no HPD on analog connectors */ 1928 /* no HPD on analog connectors */
@@ -1940,7 +1940,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
1940 DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1940 DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1941 } 1941 }
1942 radeon_connector->dac_load_detect = true; 1942 radeon_connector->dac_load_detect = true;
1943 drm_connector_attach_property(&radeon_connector->base, 1943 drm_object_attach_property(&radeon_connector->base.base,
1944 rdev->mode_info.load_detect_property, 1944 rdev->mode_info.load_detect_property,
1945 1); 1945 1);
1946 /* no HPD on analog connectors */ 1946 /* no HPD on analog connectors */
@@ -1959,7 +1959,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
1959 } 1959 }
1960 if (connector_type == DRM_MODE_CONNECTOR_DVII) { 1960 if (connector_type == DRM_MODE_CONNECTOR_DVII) {
1961 radeon_connector->dac_load_detect = true; 1961 radeon_connector->dac_load_detect = true;
1962 drm_connector_attach_property(&radeon_connector->base, 1962 drm_object_attach_property(&radeon_connector->base.base,
1963 rdev->mode_info.load_detect_property, 1963 rdev->mode_info.load_detect_property,
1964 1); 1964 1);
1965 } 1965 }
@@ -1983,10 +1983,10 @@ radeon_add_legacy_connector(struct drm_device *dev,
1983 */ 1983 */
1984 if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480) 1984 if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480)
1985 radeon_connector->dac_load_detect = false; 1985 radeon_connector->dac_load_detect = false;
1986 drm_connector_attach_property(&radeon_connector->base, 1986 drm_object_attach_property(&radeon_connector->base.base,
1987 rdev->mode_info.load_detect_property, 1987 rdev->mode_info.load_detect_property,
1988 radeon_connector->dac_load_detect); 1988 radeon_connector->dac_load_detect);
1989 drm_connector_attach_property(&radeon_connector->base, 1989 drm_object_attach_property(&radeon_connector->base.base,
1990 rdev->mode_info.tv_std_property, 1990 rdev->mode_info.tv_std_property,
1991 radeon_combios_get_tv_info(rdev)); 1991 radeon_combios_get_tv_info(rdev));
1992 /* no HPD on analog connectors */ 1992 /* no HPD on analog connectors */
@@ -2002,7 +2002,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
2002 if (!radeon_connector->ddc_bus) 2002 if (!radeon_connector->ddc_bus)
2003 DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 2003 DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
2004 } 2004 }
2005 drm_connector_attach_property(&radeon_connector->base, 2005 drm_object_attach_property(&radeon_connector->base.base,
2006 dev->mode_config.scaling_mode_property, 2006 dev->mode_config.scaling_mode_property,
2007 DRM_MODE_SCALE_FULLSCREEN); 2007 DRM_MODE_SCALE_FULLSCREEN);
2008 subpixel_order = SubPixelHorizontalRGB; 2008 subpixel_order = SubPixelHorizontalRGB;
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
index 0e7a9306bd0c..d917a411ca85 100644
--- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
@@ -748,7 +748,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,
748 connector->encoder = encoder; 748 connector->encoder = encoder;
749 749
750 drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); 750 drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
751 drm_connector_property_set_value(connector, 751 drm_object_property_set_value(&connector->base,
752 sdev->ddev->mode_config.dpms_property, DRM_MODE_DPMS_OFF); 752 sdev->ddev->mode_config.dpms_property, DRM_MODE_DPMS_OFF);
753 753
754 return 0; 754 return 0;
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index 25b93de19c66..512f44add89f 100644
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -140,7 +140,7 @@ int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder)
140 drm_sysfs_connector_add(connector); 140 drm_sysfs_connector_add(connector);
141 drm_mode_connector_attach_encoder(connector, encoder); 141 drm_mode_connector_attach_encoder(connector, encoder);
142 142
143 drm_connector_attach_property(connector, 143 drm_object_attach_property(&connector->base,
144 dev->mode_config.dirty_info_property, 144 dev->mode_config.dirty_info_property,
145 1); 145 1);
146 return 0; 146 return 0;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index 070fb239c5af..79f7e8e60529 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)
373 373
374 drm_mode_crtc_set_gamma_size(crtc, 256); 374 drm_mode_crtc_set_gamma_size(crtc, 256);
375 375
376 drm_connector_attach_property(connector, 376 drm_object_attach_property(&connector->base,
377 dev->mode_config.dirty_info_property, 377 dev->mode_config.dirty_info_property,
378 1); 378 1);
379 379
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 60f12855362b..26387c3d5a21 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)
468 468
469 drm_mode_crtc_set_gamma_size(crtc, 256); 469 drm_mode_crtc_set_gamma_size(crtc, 256);
470 470
471 drm_connector_attach_property(connector, 471 drm_object_attach_property(&connector->base,
472 dev->mode_config.dirty_info_property, 472 dev->mode_config.dirty_info_property,
473 1); 473 1);
474 474
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index c0635b7f8696..ee9b0b59237f 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -920,12 +920,6 @@ extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
920extern void drm_mode_connector_list_update(struct drm_connector *connector); 920extern void drm_mode_connector_list_update(struct drm_connector *connector);
921extern int drm_mode_connector_update_edid_property(struct drm_connector *connector, 921extern int drm_mode_connector_update_edid_property(struct drm_connector *connector,
922 struct edid *edid); 922 struct edid *edid);
923extern int drm_connector_property_set_value(struct drm_connector *connector,
924 struct drm_property *property,
925 uint64_t value);
926extern int drm_connector_property_get_value(struct drm_connector *connector,
927 struct drm_property *property,
928 uint64_t *value);
929extern int drm_object_property_set_value(struct drm_mode_object *obj, 923extern int drm_object_property_set_value(struct drm_mode_object *obj,
930 struct drm_property *property, 924 struct drm_property *property,
931 uint64_t val); 925 uint64_t val);
@@ -947,8 +941,6 @@ extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
947extern void drm_crtc_probe_connector_modes(struct drm_device *dev, int maxX, int maxY); 941extern void drm_crtc_probe_connector_modes(struct drm_device *dev, int maxX, int maxY);
948extern bool drm_crtc_in_use(struct drm_crtc *crtc); 942extern bool drm_crtc_in_use(struct drm_crtc *crtc);
949 943
950extern void drm_connector_attach_property(struct drm_connector *connector,
951 struct drm_property *property, uint64_t init_val);
952extern void drm_object_attach_property(struct drm_mode_object *obj, 944extern void drm_object_attach_property(struct drm_mode_object *obj,
953 struct drm_property *property, 945 struct drm_property *property,
954 uint64_t init_val); 946 uint64_t init_val);
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-16 06:08:08 -0400