Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 662595df9fcba6e8d6f9ac905c960425cca38697

Authored by Rob Clark
Committed by Daniel Vetter
1 parent 45a066eba4
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

drm/i915: drm_connector_property -> drm_object_property 

v2: Rebased.

Signed-off-by: Rob Clark <rob@ti.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com> (v1)
[danvet: Pimp commit message a bit.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Showing 7 changed files with 25 additions and 25 deletions Side-by-side Diff

drivers/gpu/drm/i915/intel_display.c
Diff comments   View file @ 662595d
... ... @@ -7607,7 +7607,7 @@
7607 7607 dev->mode_config.dpms_property;
7608 7608  
7609 7609 connector->dpms = DRM_MODE_DPMS_ON;
7610   - drm_connector_property_set_value(connector,
  7610 + drm_object_property_set_value(&connector->base,
7611 7611 dpms_property,
7612 7612 DRM_MODE_DPMS_ON);
7613 7613  
drivers/gpu/drm/i915/intel_dp.c
Diff comments   View file @ 662595d
... ... @@ -2393,7 +2393,7 @@
2393 2393 struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base);
2394 2394 int ret;
2395 2395  
2396   - ret = drm_connector_property_set_value(connector, property, val);
  2396 + ret = drm_object_property_set_value(&connector->base, property, val);
2397 2397 if (ret)
2398 2398 return ret;
2399 2399  
drivers/gpu/drm/i915/intel_hdmi.c
Diff comments   View file @ 662595d
... ... @@ -874,7 +874,7 @@
874 874 struct drm_i915_private *dev_priv = connector->dev->dev_private;
875 875 int ret;
876 876  
877   - ret = drm_connector_property_set_value(connector, property, val);
  877 + ret = drm_object_property_set_value(&connector->base, property, val);
878 878 if (ret)
879 879 return ret;
880 880  
drivers/gpu/drm/i915/intel_lvds.c
Diff comments   View file @ 662595d
... ... @@ -1016,7 +1016,7 @@
1016 1016  
1017 1017 /* create the scaling mode property */
1018 1018 drm_mode_create_scaling_mode_property(dev);
1019   - drm_connector_attach_property(&intel_connector->base,
  1019 + drm_object_attach_property(&connector->base,
1020 1020 dev->mode_config.scaling_mode_property,
1021 1021 DRM_MODE_SCALE_ASPECT);
1022 1022 intel_connector->panel.fitting_mode = DRM_MODE_SCALE_ASPECT;
drivers/gpu/drm/i915/intel_modes.c
Diff comments   View file @ 662595d
... ... @@ -97,7 +97,7 @@
97 97  
98 98 dev_priv->force_audio_property = prop;
99 99 }
100   - drm_connector_attach_property(connector, prop, 0);
  100 + drm_object_attach_property(&connector->base, prop, 0);
101 101 }
102 102  
103 103 static const struct drm_prop_enum_list broadcast_rgb_names[] = {
... ... @@ -124,6 +124,6 @@
124 124 dev_priv->broadcast_rgb_property = prop;
125 125 }
126 126  
127   - drm_connector_attach_property(connector, prop, 0);
  127 + drm_object_attach_property(&connector->base, prop, 0);
128 128 }
drivers/gpu/drm/i915/intel_sdvo.c
Diff comments   View file @ 662595d
... ... @@ -1864,7 +1864,7 @@
1864 1864 uint8_t cmd;
1865 1865 int ret;
1866 1866  
1867   - ret = drm_connector_property_set_value(connector, property, val);
  1867 + ret = drm_object_property_set_value(&connector->base, property, val);
1868 1868 if (ret)
1869 1869 return ret;
1870 1870  
... ... @@ -1919,7 +1919,7 @@
1919 1919 } else if (IS_TV_OR_LVDS(intel_sdvo_connector)) {
1920 1920 temp_value = val;
1921 1921 if (intel_sdvo_connector->left == property) {
1922   - drm_connector_property_set_value(connector,
  1922 + drm_object_property_set_value(&connector->base,
1923 1923 intel_sdvo_connector->right, val);
1924 1924 if (intel_sdvo_connector->left_margin == temp_value)
1925 1925 return 0;
... ... @@ -1931,7 +1931,7 @@
1931 1931 cmd = SDVO_CMD_SET_OVERSCAN_H;
1932 1932 goto set_value;
1933 1933 } else if (intel_sdvo_connector->right == property) {
1934   - drm_connector_property_set_value(connector,
  1934 + drm_object_property_set_value(&connector->base,
1935 1935 intel_sdvo_connector->left, val);
1936 1936 if (intel_sdvo_connector->right_margin == temp_value)
1937 1937 return 0;
... ... @@ -1943,7 +1943,7 @@
1943 1943 cmd = SDVO_CMD_SET_OVERSCAN_H;
1944 1944 goto set_value;
1945 1945 } else if (intel_sdvo_connector->top == property) {
1946   - drm_connector_property_set_value(connector,
  1946 + drm_object_property_set_value(&connector->base,
1947 1947 intel_sdvo_connector->bottom, val);
1948 1948 if (intel_sdvo_connector->top_margin == temp_value)
1949 1949 return 0;
... ... @@ -1955,7 +1955,7 @@
1955 1955 cmd = SDVO_CMD_SET_OVERSCAN_V;
1956 1956 goto set_value;
1957 1957 } else if (intel_sdvo_connector->bottom == property) {
1958   - drm_connector_property_set_value(connector,
  1958 + drm_object_property_set_value(&connector->base,
1959 1959 intel_sdvo_connector->top, val);
1960 1960 if (intel_sdvo_connector->bottom_margin == temp_value)
1961 1961 return 0;
... ... @@ -2465,7 +2465,7 @@
2465 2465 i, tv_format_names[intel_sdvo_connector->tv_format_supported[i]]);
2466 2466  
2467 2467 intel_sdvo->tv_format_index = intel_sdvo_connector->tv_format_supported[0];
2468   - drm_connector_attach_property(&intel_sdvo_connector->base.base,
  2468 + drm_object_attach_property(&intel_sdvo_connector->base.base.base,
2469 2469 intel_sdvo_connector->tv_format, 0);
2470 2470 return true;
2471 2471  
... ... @@ -2481,7 +2481,7 @@
2481 2481 intel_sdvo_connector->name = \
2482 2482 drm_property_create_range(dev, 0, #name, 0, data_value[0]); \
2483 2483 if (!intel_sdvo_connector->name) return false; \
2484   - drm_connector_attach_property(connector, \
  2484 + drm_object_attach_property(&connector->base, \
2485 2485 intel_sdvo_connector->name, \
2486 2486 intel_sdvo_connector->cur_##name); \
2487 2487 DRM_DEBUG_KMS(#name ": max %d, default %d, current %d\n", \
... ... @@ -2518,7 +2518,7 @@
2518 2518 if (!intel_sdvo_connector->left)
2519 2519 return false;
2520 2520  
2521   - drm_connector_attach_property(connector,
  2521 + drm_object_attach_property(&connector->base,
2522 2522 intel_sdvo_connector->left,
2523 2523 intel_sdvo_connector->left_margin);
2524 2524  
... ... @@ -2527,7 +2527,7 @@
2527 2527 if (!intel_sdvo_connector->right)
2528 2528 return false;
2529 2529  
2530   - drm_connector_attach_property(connector,
  2530 + drm_object_attach_property(&connector->base,
2531 2531 intel_sdvo_connector->right,
2532 2532 intel_sdvo_connector->right_margin);
2533 2533 DRM_DEBUG_KMS("h_overscan: max %d, "
... ... @@ -2555,7 +2555,7 @@
2555 2555 if (!intel_sdvo_connector->top)
2556 2556 return false;
2557 2557  
2558   - drm_connector_attach_property(connector,
  2558 + drm_object_attach_property(&connector->base,
2559 2559 intel_sdvo_connector->top,
2560 2560 intel_sdvo_connector->top_margin);
2561 2561  
... ... @@ -2565,7 +2565,7 @@
2565 2565 if (!intel_sdvo_connector->bottom)
2566 2566 return false;
2567 2567  
2568   - drm_connector_attach_property(connector,
  2568 + drm_object_attach_property(&connector->base,
2569 2569 intel_sdvo_connector->bottom,
2570 2570 intel_sdvo_connector->bottom_margin);
2571 2571 DRM_DEBUG_KMS("v_overscan: max %d, "
... ... @@ -2597,7 +2597,7 @@
2597 2597 if (!intel_sdvo_connector->dot_crawl)
2598 2598 return false;
2599 2599  
2600   - drm_connector_attach_property(connector,
  2600 + drm_object_attach_property(&connector->base,
2601 2601 intel_sdvo_connector->dot_crawl,
2602 2602 intel_sdvo_connector->cur_dot_crawl);
2603 2603 DRM_DEBUG_KMS("dot crawl: current %d\n", response);
drivers/gpu/drm/i915/intel_tv.c
Diff comments   View file @ 662595d
... ... @@ -1289,7 +1289,7 @@
1289 1289 }
1290 1290  
1291 1291 intel_tv->tv_format = tv_mode->name;
1292   - drm_connector_property_set_value(connector,
  1292 + drm_object_property_set_value(&connector->base,
1293 1293 connector->dev->mode_config.tv_mode_property, i);
1294 1294 }
1295 1295  
... ... @@ -1443,7 +1443,7 @@
1443 1443 int ret = 0;
1444 1444 bool changed = false;
1445 1445  
1446   - ret = drm_connector_property_set_value(connector, property, val);
  1446 + ret = drm_object_property_set_value(&connector->base, property, val);
1447 1447 if (ret < 0)
1448 1448 goto out;
1449 1449  
1450 1450  
1451 1451  
1452 1452  
1453 1453  
... ... @@ -1655,18 +1655,18 @@
1655 1655 ARRAY_SIZE(tv_modes),
1656 1656 tv_format_names);
1657 1657  
1658   - drm_connector_attach_property(connector, dev->mode_config.tv_mode_property,
  1658 + drm_object_attach_property(&connector->base, dev->mode_config.tv_mode_property,
1659 1659 initial_mode);
1660   - drm_connector_attach_property(connector,
  1660 + drm_object_attach_property(&connector->base,
1661 1661 dev->mode_config.tv_left_margin_property,
1662 1662 intel_tv->margin[TV_MARGIN_LEFT]);
1663   - drm_connector_attach_property(connector,
  1663 + drm_object_attach_property(&connector->base,
1664 1664 dev->mode_config.tv_top_margin_property,
1665 1665 intel_tv->margin[TV_MARGIN_TOP]);
1666   - drm_connector_attach_property(connector,
  1666 + drm_object_attach_property(&connector->base,
1667 1667 dev->mode_config.tv_right_margin_property,
1668 1668 intel_tv->margin[TV_MARGIN_RIGHT]);
1669   - drm_connector_attach_property(connector,
  1669 + drm_object_attach_property(&connector->base,
1670 1670 dev->mode_config.tv_bottom_margin_property,
1671 1671 intel_tv->margin[TV_MARGIN_BOTTOM]);
1672 1672 drm_sysfs_connector_add(connector);