diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-07-09 04:40:08 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-07-13 12:40:27 -0400 |
| commit | 97e14fbeb53fe060c5f6a7a07e37fd24c087ed0c (patch) | |
| tree | 848f96ce3daf9dc0c037ed71c8611fcec21bff36 | |
| parent | cde4c44d8769c1be16074c097592c46c7d64092b (diff) | |
drm: drop _mode_ from remaining connector functions
Since there's very few callers of these I've decided to do them all in
one patch. With this the unecessarily long drm_mode_connector_ prefix
is gone from the codebase! The only exception being struct
drm_mode_connector_set_property, which is part of the uapi so can't be
renamed.
Again done with sed+some manual fixups for indent issues.
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180709084016.23750-8-daniel.vetter@ffwll.ch
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_connector.c | 36 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_crtc_internal.h | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_dp_mst_topology.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_ioctl.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_mode_object.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_modes.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_probe_helper.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp_mst.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 | ||||
| -rw-r--r-- | include/drm/drm_connector.h | 14 | ||||
| -rw-r--r-- | include/drm/drm_modes.h | 2 |
17 files changed, 49 insertions, 50 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 581bb75d08eb..65f210d3497b 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | |||
| @@ -345,7 +345,7 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, | |||
| 345 | aconnector, connector->base.id, aconnector->mst_port); | 345 | aconnector, connector->base.id, aconnector->mst_port); |
| 346 | 346 | ||
| 347 | aconnector->port = port; | 347 | aconnector->port = port; |
| 348 | drm_mode_connector_set_path_property(connector, pathprop); | 348 | drm_connector_set_path_property(connector, pathprop); |
| 349 | 349 | ||
| 350 | drm_connector_list_iter_end(&conn_iter); | 350 | drm_connector_list_iter_end(&conn_iter); |
| 351 | aconnector->mst_connected = true; | 351 | aconnector->mst_connected = true; |
| @@ -393,7 +393,7 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, | |||
| 393 | dev->mode_config.tile_property, | 393 | dev->mode_config.tile_property, |
| 394 | 0); | 394 | 0); |
| 395 | 395 | ||
| 396 | drm_mode_connector_set_path_property(connector, pathprop); | 396 | drm_connector_set_path_property(connector, pathprop); |
| 397 | 397 | ||
| 398 | /* | 398 | /* |
| 399 | * Initialize connector state before adding the connectror to drm and | 399 | * Initialize connector state before adding the connectror to drm and |
| @@ -441,7 +441,7 @@ static void dm_dp_mst_hotplug(struct drm_dp_mst_topology_mgr *mgr) | |||
| 441 | static void dm_dp_mst_link_status_reset(struct drm_connector *connector) | 441 | static void dm_dp_mst_link_status_reset(struct drm_connector *connector) |
| 442 | { | 442 | { |
| 443 | mutex_lock(&connector->dev->mode_config.mutex); | 443 | mutex_lock(&connector->dev->mode_config.mutex); |
| 444 | drm_mode_connector_set_link_status_property(connector, DRM_MODE_LINK_STATUS_BAD); | 444 | drm_connector_set_link_status_property(connector, DRM_MODE_LINK_STATUS_BAD); |
| 445 | mutex_unlock(&connector->dev->mode_config.mutex); | 445 | mutex_unlock(&connector->dev->mode_config.mutex); |
| 446 | } | 446 | } |
| 447 | 447 | ||
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 91fda6b8926e..866a2cc72ef6 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c | |||
| @@ -2867,7 +2867,7 @@ static int update_output_state(struct drm_atomic_state *state, | |||
| 2867 | * resets the "link-status" property to GOOD, to force any link | 2867 | * resets the "link-status" property to GOOD, to force any link |
| 2868 | * re-training. The SETCRTC ioctl does not define whether an update does | 2868 | * re-training. The SETCRTC ioctl does not define whether an update does |
| 2869 | * need a full modeset or just a plane update, hence we're allowed to do | 2869 | * need a full modeset or just a plane update, hence we're allowed to do |
| 2870 | * that. See also drm_mode_connector_set_link_status_property(). | 2870 | * that. See also drm_connector_set_link_status_property(). |
| 2871 | * | 2871 | * |
| 2872 | * Returns: | 2872 | * Returns: |
| 2873 | * Returns 0 on success, negative errno numbers on failure. | 2873 | * Returns 0 on success, negative errno numbers on failure. |
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 8997792e2e23..8f3f672a47b0 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c | |||
| @@ -852,7 +852,7 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list) | |||
| 852 | * PATH: | 852 | * PATH: |
| 853 | * Connector path property to identify how this sink is physically | 853 | * Connector path property to identify how this sink is physically |
| 854 | * connected. Used by DP MST. This should be set by calling | 854 | * connected. Used by DP MST. This should be set by calling |
| 855 | * drm_mode_connector_set_path_property(), in the case of DP MST with the | 855 | * drm_connector_set_path_property(), in the case of DP MST with the |
| 856 | * path property the MST manager created. Userspace cannot change this | 856 | * path property the MST manager created. Userspace cannot change this |
| 857 | * property. | 857 | * property. |
| 858 | * TILE: | 858 | * TILE: |
| @@ -863,14 +863,14 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list) | |||
| 863 | * are not gen-locked. Note that for tiled panels which are genlocked, like | 863 | * are not gen-locked. Note that for tiled panels which are genlocked, like |
| 864 | * dual-link LVDS or dual-link DSI, the driver should try to not expose the | 864 | * dual-link LVDS or dual-link DSI, the driver should try to not expose the |
| 865 | * tiling and virtualize both &drm_crtc and &drm_plane if needed. Drivers | 865 | * tiling and virtualize both &drm_crtc and &drm_plane if needed. Drivers |
| 866 | * should update this value using drm_mode_connector_set_tile_property(). | 866 | * should update this value using drm_connector_set_tile_property(). |
| 867 | * Userspace cannot change this property. | 867 | * Userspace cannot change this property. |
| 868 | * link-status: | 868 | * link-status: |
| 869 | * Connector link-status property to indicate the status of link. The | 869 | * Connector link-status property to indicate the status of link. The |
| 870 | * default value of link-status is "GOOD". If something fails during or | 870 | * default value of link-status is "GOOD". If something fails during or |
| 871 | * after modeset, the kernel driver may set this to "BAD" and issue a | 871 | * after modeset, the kernel driver may set this to "BAD" and issue a |
| 872 | * hotplug uevent. Drivers should update this value using | 872 | * hotplug uevent. Drivers should update this value using |
| 873 | * drm_mode_connector_set_link_status_property(). | 873 | * drm_connector_set_link_status_property(). |
| 874 | * non_desktop: | 874 | * non_desktop: |
| 875 | * Indicates the output should be ignored for purposes of displaying a | 875 | * Indicates the output should be ignored for purposes of displaying a |
| 876 | * standard desktop environment or console. This is most likely because | 876 | * standard desktop environment or console. This is most likely because |
| @@ -1425,7 +1425,7 @@ int drm_mode_create_suggested_offset_properties(struct drm_device *dev) | |||
| 1425 | EXPORT_SYMBOL(drm_mode_create_suggested_offset_properties); | 1425 | EXPORT_SYMBOL(drm_mode_create_suggested_offset_properties); |
| 1426 | 1426 | ||
| 1427 | /** | 1427 | /** |
| 1428 | * drm_mode_connector_set_path_property - set tile property on connector | 1428 | * drm_connector_set_path_property - set tile property on connector |
| 1429 | * @connector: connector to set property on. | 1429 | * @connector: connector to set property on. |
| 1430 | * @path: path to use for property; must not be NULL. | 1430 | * @path: path to use for property; must not be NULL. |
| 1431 | * | 1431 | * |
| @@ -1437,8 +1437,8 @@ EXPORT_SYMBOL(drm_mode_create_suggested_offset_properties); | |||
| 1437 | * Returns: | 1437 | * Returns: |
| 1438 | * Zero on success, negative errno on failure. | 1438 | * Zero on success, negative errno on failure. |
| 1439 | */ | 1439 | */ |
| 1440 | int drm_mode_connector_set_path_property(struct drm_connector *connector, | 1440 | int drm_connector_set_path_property(struct drm_connector *connector, |
| 1441 | const char *path) | 1441 | const char *path) |
| 1442 | { | 1442 | { |
| 1443 | struct drm_device *dev = connector->dev; | 1443 | struct drm_device *dev = connector->dev; |
| 1444 | int ret; | 1444 | int ret; |
| @@ -1451,10 +1451,10 @@ int drm_mode_connector_set_path_property(struct drm_connector *connector, | |||
| 1451 | dev->mode_config.path_property); | 1451 | dev->mode_config.path_property); |
| 1452 | return ret; | 1452 | return ret; |
| 1453 | } | 1453 | } |
| 1454 | EXPORT_SYMBOL(drm_mode_connector_set_path_property); | 1454 | EXPORT_SYMBOL(drm_connector_set_path_property); |
| 1455 | 1455 | ||
| 1456 | /** | 1456 | /** |
| 1457 | * drm_mode_connector_set_tile_property - set tile property on connector | 1457 | * drm_connector_set_tile_property - set tile property on connector |
| 1458 | * @connector: connector to set property on. | 1458 | * @connector: connector to set property on. |
| 1459 | * | 1459 | * |
| 1460 | * This looks up the tile information for a connector, and creates a | 1460 | * This looks up the tile information for a connector, and creates a |
| @@ -1464,7 +1464,7 @@ EXPORT_SYMBOL(drm_mode_connector_set_path_property); | |||
| 1464 | * Returns: | 1464 | * Returns: |
| 1465 | * Zero on success, errno on failure. | 1465 | * Zero on success, errno on failure. |
| 1466 | */ | 1466 | */ |
| 1467 | int drm_mode_connector_set_tile_property(struct drm_connector *connector) | 1467 | int drm_connector_set_tile_property(struct drm_connector *connector) |
| 1468 | { | 1468 | { |
| 1469 | struct drm_device *dev = connector->dev; | 1469 | struct drm_device *dev = connector->dev; |
| 1470 | char tile[256]; | 1470 | char tile[256]; |
| @@ -1494,7 +1494,7 @@ int drm_mode_connector_set_tile_property(struct drm_connector *connector) | |||
| 1494 | dev->mode_config.tile_property); | 1494 | dev->mode_config.tile_property); |
| 1495 | return ret; | 1495 | return ret; |
| 1496 | } | 1496 | } |
| 1497 | EXPORT_SYMBOL(drm_mode_connector_set_tile_property); | 1497 | EXPORT_SYMBOL(drm_connector_set_tile_property); |
| 1498 | 1498 | ||
| 1499 | /** | 1499 | /** |
| 1500 | * drm_connector_update_edid_property - update the edid property of a connector | 1500 | * drm_connector_update_edid_property - update the edid property of a connector |
| @@ -1508,7 +1508,7 @@ EXPORT_SYMBOL(drm_mode_connector_set_tile_property); | |||
| 1508 | * Zero on success, negative errno on failure. | 1508 | * Zero on success, negative errno on failure. |
| 1509 | */ | 1509 | */ |
| 1510 | int drm_connector_update_edid_property(struct drm_connector *connector, | 1510 | int drm_connector_update_edid_property(struct drm_connector *connector, |
| 1511 | const struct edid *edid) | 1511 | const struct edid *edid) |
| 1512 | { | 1512 | { |
| 1513 | struct drm_device *dev = connector->dev; | 1513 | struct drm_device *dev = connector->dev; |
| 1514 | size_t size = 0; | 1514 | size_t size = 0; |
| @@ -1549,7 +1549,7 @@ int drm_connector_update_edid_property(struct drm_connector *connector, | |||
| 1549 | EXPORT_SYMBOL(drm_connector_update_edid_property); | 1549 | EXPORT_SYMBOL(drm_connector_update_edid_property); |
| 1550 | 1550 | ||
| 1551 | /** | 1551 | /** |
| 1552 | * drm_mode_connector_set_link_status_property - Set link status property of a connector | 1552 | * drm_connector_set_link_status_property - Set link status property of a connector |
| 1553 | * @connector: drm connector | 1553 | * @connector: drm connector |
| 1554 | * @link_status: new value of link status property (0: Good, 1: Bad) | 1554 | * @link_status: new value of link status property (0: Good, 1: Bad) |
| 1555 | * | 1555 | * |
| @@ -1567,8 +1567,8 @@ EXPORT_SYMBOL(drm_connector_update_edid_property); | |||
| 1567 | * it is not limited to DP or link training. For example, if we implement | 1567 | * it is not limited to DP or link training. For example, if we implement |
| 1568 | * asynchronous setcrtc, this property can be used to report any failures in that. | 1568 | * asynchronous setcrtc, this property can be used to report any failures in that. |
| 1569 | */ | 1569 | */ |
| 1570 | void drm_mode_connector_set_link_status_property(struct drm_connector *connector, | 1570 | void drm_connector_set_link_status_property(struct drm_connector *connector, |
| 1571 | uint64_t link_status) | 1571 | uint64_t link_status) |
| 1572 | { | 1572 | { |
| 1573 | struct drm_device *dev = connector->dev; | 1573 | struct drm_device *dev = connector->dev; |
| 1574 | 1574 | ||
| @@ -1576,7 +1576,7 @@ void drm_mode_connector_set_link_status_property(struct drm_connector *connector | |||
| 1576 | connector->state->link_status = link_status; | 1576 | connector->state->link_status = link_status; |
| 1577 | drm_modeset_unlock(&dev->mode_config.connection_mutex); | 1577 | drm_modeset_unlock(&dev->mode_config.connection_mutex); |
| 1578 | } | 1578 | } |
| 1579 | EXPORT_SYMBOL(drm_mode_connector_set_link_status_property); | 1579 | EXPORT_SYMBOL(drm_connector_set_link_status_property); |
| 1580 | 1580 | ||
| 1581 | /** | 1581 | /** |
| 1582 | * drm_connector_init_panel_orientation_property - | 1582 | * drm_connector_init_panel_orientation_property - |
| @@ -1629,7 +1629,7 @@ int drm_connector_init_panel_orientation_property( | |||
| 1629 | } | 1629 | } |
| 1630 | EXPORT_SYMBOL(drm_connector_init_panel_orientation_property); | 1630 | EXPORT_SYMBOL(drm_connector_init_panel_orientation_property); |
| 1631 | 1631 | ||
| 1632 | int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj, | 1632 | int drm_connector_set_obj_prop(struct drm_mode_object *obj, |
| 1633 | struct drm_property *property, | 1633 | struct drm_property *property, |
| 1634 | uint64_t value) | 1634 | uint64_t value) |
| 1635 | { | 1635 | { |
| @@ -1647,8 +1647,8 @@ int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj, | |||
| 1647 | return ret; | 1647 | return ret; |
| 1648 | } | 1648 | } |
| 1649 | 1649 | ||
| 1650 | int drm_mode_connector_property_set_ioctl(struct drm_device *dev, | 1650 | int drm_connector_property_set_ioctl(struct drm_device *dev, |
| 1651 | void *data, struct drm_file *file_priv) | 1651 | void *data, struct drm_file *file_priv) |
| 1652 | { | 1652 | { |
| 1653 | struct drm_mode_connector_set_property *conn_set_prop = data; | 1653 | struct drm_mode_connector_set_property *conn_set_prop = data; |
| 1654 | struct drm_mode_obj_set_property obj_set_prop = { | 1654 | struct drm_mode_obj_set_property obj_set_prop = { |
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h index 235d40fce8b5..b61322763394 100644 --- a/drivers/gpu/drm/drm_crtc_internal.h +++ b/drivers/gpu/drm/drm_crtc_internal.h | |||
| @@ -148,7 +148,7 @@ void drm_connector_ida_init(void); | |||
| 148 | void drm_connector_ida_destroy(void); | 148 | void drm_connector_ida_destroy(void); |
| 149 | void drm_connector_unregister_all(struct drm_device *dev); | 149 | void drm_connector_unregister_all(struct drm_device *dev); |
| 150 | int drm_connector_register_all(struct drm_device *dev); | 150 | int drm_connector_register_all(struct drm_device *dev); |
| 151 | int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj, | 151 | int drm_connector_set_obj_prop(struct drm_mode_object *obj, |
| 152 | struct drm_property *property, | 152 | struct drm_property *property, |
| 153 | uint64_t value); | 153 | uint64_t value); |
| 154 | int drm_connector_create_standard_properties(struct drm_device *dev); | 154 | int drm_connector_create_standard_properties(struct drm_device *dev); |
| @@ -156,8 +156,8 @@ const char *drm_get_connector_force_name(enum drm_connector_force force); | |||
| 156 | void drm_connector_free_work_fn(struct work_struct *work); | 156 | void drm_connector_free_work_fn(struct work_struct *work); |
| 157 | 157 | ||
| 158 | /* IOCTL */ | 158 | /* IOCTL */ |
| 159 | int drm_mode_connector_property_set_ioctl(struct drm_device *dev, | 159 | int drm_connector_property_set_ioctl(struct drm_device *dev, |
| 160 | void *data, struct drm_file *file_priv); | 160 | void *data, struct drm_file *file_priv); |
| 161 | int drm_mode_getconnector(struct drm_device *dev, | 161 | int drm_mode_getconnector(struct drm_device *dev, |
| 162 | void *data, struct drm_file *file_priv); | 162 | void *data, struct drm_file *file_priv); |
| 163 | 163 | ||
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 658830620ca3..7780567aa669 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c | |||
| @@ -1215,7 +1215,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb, | |||
| 1215 | port->pdt == DP_PEER_DEVICE_SST_SINK) && | 1215 | port->pdt == DP_PEER_DEVICE_SST_SINK) && |
| 1216 | port->port_num >= DP_MST_LOGICAL_PORT_0) { | 1216 | port->port_num >= DP_MST_LOGICAL_PORT_0) { |
| 1217 | port->cached_edid = drm_get_edid(port->connector, &port->aux.ddc); | 1217 | port->cached_edid = drm_get_edid(port->connector, &port->aux.ddc); |
| 1218 | drm_mode_connector_set_tile_property(port->connector); | 1218 | drm_connector_set_tile_property(port->connector); |
| 1219 | } | 1219 | } |
| 1220 | (*mstb->mgr->cbs->register_connector)(port->connector); | 1220 | (*mstb->mgr->cbs->register_connector)(port->connector); |
| 1221 | } | 1221 | } |
| @@ -2559,7 +2559,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_ | |||
| 2559 | edid = drm_edid_duplicate(port->cached_edid); | 2559 | edid = drm_edid_duplicate(port->cached_edid); |
| 2560 | else { | 2560 | else { |
| 2561 | edid = drm_get_edid(connector, &port->aux.ddc); | 2561 | edid = drm_get_edid(connector, &port->aux.ddc); |
| 2562 | drm_mode_connector_set_tile_property(connector); | 2562 | drm_connector_set_tile_property(connector); |
| 2563 | } | 2563 | } |
| 2564 | port->has_audio = drm_detect_monitor_audio(edid); | 2564 | port->has_audio = drm_detect_monitor_audio(edid); |
| 2565 | drm_dp_put_port(port); | 2565 | drm_dp_put_port(port); |
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 3c125041a597..ea10e9a26aad 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c | |||
| @@ -641,7 +641,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = { | |||
| 641 | DRM_IOCTL_DEF(DRM_IOCTL_MODE_ATTACHMODE, drm_noop, DRM_MASTER|DRM_UNLOCKED), | 641 | DRM_IOCTL_DEF(DRM_IOCTL_MODE_ATTACHMODE, drm_noop, DRM_MASTER|DRM_UNLOCKED), |
| 642 | DRM_IOCTL_DEF(DRM_IOCTL_MODE_DETACHMODE, drm_noop, DRM_MASTER|DRM_UNLOCKED), | 642 | DRM_IOCTL_DEF(DRM_IOCTL_MODE_DETACHMODE, drm_noop, DRM_MASTER|DRM_UNLOCKED), |
| 643 | DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPERTY, drm_mode_getproperty_ioctl, DRM_UNLOCKED), | 643 | DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPERTY, drm_mode_getproperty_ioctl, DRM_UNLOCKED), |
| 644 | DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY, drm_mode_connector_property_set_ioctl, DRM_MASTER|DRM_UNLOCKED), | 644 | DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY, drm_connector_property_set_ioctl, DRM_MASTER|DRM_UNLOCKED), |
| 645 | DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPBLOB, drm_mode_getblob_ioctl, DRM_UNLOCKED), | 645 | DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPBLOB, drm_mode_getblob_ioctl, DRM_UNLOCKED), |
| 646 | DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_UNLOCKED), | 646 | DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_UNLOCKED), |
| 647 | DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb_ioctl, DRM_UNLOCKED), | 647 | DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb_ioctl, DRM_UNLOCKED), |
diff --git a/drivers/gpu/drm/drm_mode_object.c b/drivers/gpu/drm/drm_mode_object.c index ce4d2fb32810..fcb0ab0abb75 100644 --- a/drivers/gpu/drm/drm_mode_object.c +++ b/drivers/gpu/drm/drm_mode_object.c | |||
| @@ -433,8 +433,7 @@ static int set_property_legacy(struct drm_mode_object *obj, | |||
| 433 | drm_modeset_lock_all(dev); | 433 | drm_modeset_lock_all(dev); |
| 434 | switch (obj->type) { | 434 | switch (obj->type) { |
| 435 | case DRM_MODE_OBJECT_CONNECTOR: | 435 | case DRM_MODE_OBJECT_CONNECTOR: |
| 436 | ret = drm_mode_connector_set_obj_prop(obj, prop, | 436 | ret = drm_connector_set_obj_prop(obj, prop, prop_value); |
| 437 | prop_value); | ||
| 438 | break; | 437 | break; |
| 439 | case DRM_MODE_OBJECT_CRTC: | 438 | case DRM_MODE_OBJECT_CRTC: |
| 440 | ret = drm_mode_crtc_set_obj_prop(obj, prop, prop_value); | 439 | ret = drm_mode_crtc_set_obj_prop(obj, prop, prop_value); |
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index f8f7eae738ab..02db9ac82d7a 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c | |||
| @@ -1353,7 +1353,7 @@ void drm_mode_sort(struct list_head *mode_list) | |||
| 1353 | EXPORT_SYMBOL(drm_mode_sort); | 1353 | EXPORT_SYMBOL(drm_mode_sort); |
| 1354 | 1354 | ||
| 1355 | /** | 1355 | /** |
| 1356 | * drm_mode_connector_list_update - update the mode list for the connector | 1356 | * drm_connector_list_update - update the mode list for the connector |
| 1357 | * @connector: the connector to update | 1357 | * @connector: the connector to update |
| 1358 | * | 1358 | * |
| 1359 | * This moves the modes from the @connector probed_modes list | 1359 | * This moves the modes from the @connector probed_modes list |
| @@ -1363,7 +1363,7 @@ EXPORT_SYMBOL(drm_mode_sort); | |||
| 1363 | * This is just a helper functions doesn't validate any modes itself and also | 1363 | * This is just a helper functions doesn't validate any modes itself and also |
| 1364 | * doesn't prune any invalid modes. Callers need to do that themselves. | 1364 | * doesn't prune any invalid modes. Callers need to do that themselves. |
| 1365 | */ | 1365 | */ |
| 1366 | void drm_mode_connector_list_update(struct drm_connector *connector) | 1366 | void drm_connector_list_update(struct drm_connector *connector) |
| 1367 | { | 1367 | { |
| 1368 | struct drm_display_mode *pmode, *pt; | 1368 | struct drm_display_mode *pmode, *pt; |
| 1369 | 1369 | ||
| @@ -1412,7 +1412,7 @@ void drm_mode_connector_list_update(struct drm_connector *connector) | |||
| 1412 | } | 1412 | } |
| 1413 | } | 1413 | } |
| 1414 | } | 1414 | } |
| 1415 | EXPORT_SYMBOL(drm_mode_connector_list_update); | 1415 | EXPORT_SYMBOL(drm_connector_list_update); |
| 1416 | 1416 | ||
| 1417 | /** | 1417 | /** |
| 1418 | * drm_mode_parse_command_line_for_connector - parse command line modeline for connector | 1418 | * drm_mode_parse_command_line_for_connector - parse command line modeline for connector |
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index 3d58e0eb26a4..a1bb157bfdfa 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c | |||
| @@ -360,7 +360,7 @@ EXPORT_SYMBOL(drm_helper_probe_detect); | |||
| 360 | * using the VESA GTF/CVT formulas. | 360 | * using the VESA GTF/CVT formulas. |
| 361 | * | 361 | * |
| 362 | * 3. Modes are moved from the probed_modes list to the modes list. Potential | 362 | * 3. Modes are moved from the probed_modes list to the modes list. Potential |
| 363 | * duplicates are merged together (see drm_mode_connector_list_update()). | 363 | * duplicates are merged together (see drm_connector_list_update()). |
| 364 | * After this step the probed_modes list will be empty again. | 364 | * After this step the probed_modes list will be empty again. |
| 365 | * | 365 | * |
| 366 | * 4. Any non-stale mode on the modes list then undergoes validation | 366 | * 4. Any non-stale mode on the modes list then undergoes validation |
| @@ -485,7 +485,7 @@ retry: | |||
| 485 | if (count == 0) | 485 | if (count == 0) |
| 486 | goto prune; | 486 | goto prune; |
| 487 | 487 | ||
| 488 | drm_mode_connector_list_update(connector); | 488 | drm_connector_list_update(connector); |
| 489 | 489 | ||
| 490 | if (connector->interlace_allowed) | 490 | if (connector->interlace_allowed) |
| 491 | mode_flags |= DRM_MODE_FLAG_INTERLACE; | 491 | mode_flags |= DRM_MODE_FLAG_INTERLACE; |
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index c8268f377602..8caf20fb6587 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
| @@ -6320,8 +6320,8 @@ static void intel_dp_modeset_retry_work_fn(struct work_struct *work) | |||
| 6320 | /* Set connector link status to BAD and send a Uevent to notify | 6320 | /* Set connector link status to BAD and send a Uevent to notify |
| 6321 | * userspace to do a modeset. | 6321 | * userspace to do a modeset. |
| 6322 | */ | 6322 | */ |
| 6323 | drm_mode_connector_set_link_status_property(connector, | 6323 | drm_connector_set_link_status_property(connector, |
| 6324 | DRM_MODE_LINK_STATUS_BAD); | 6324 | DRM_MODE_LINK_STATUS_BAD); |
| 6325 | mutex_unlock(&connector->dev->mode_config.mutex); | 6325 | mutex_unlock(&connector->dev->mode_config.mutex); |
| 6326 | /* Send Hotplug uevent so userspace can reprobe */ | 6326 | /* Send Hotplug uevent so userspace can reprobe */ |
| 6327 | drm_kms_helper_hotplug_event(connector->dev); | 6327 | drm_kms_helper_hotplug_event(connector->dev); |
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index 364330fc5d6a..0095c197f155 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c | |||
| @@ -474,7 +474,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo | |||
| 474 | drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0); | 474 | drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0); |
| 475 | drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0); | 475 | drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0); |
| 476 | 476 | ||
| 477 | ret = drm_mode_connector_set_path_property(connector, pathprop); | 477 | ret = drm_connector_set_path_property(connector, pathprop); |
| 478 | if (ret) | 478 | if (ret) |
| 479 | goto err; | 479 | goto err; |
| 480 | 480 | ||
diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c index 21e0dc51531d..d5006d6923e0 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c | |||
| @@ -393,7 +393,7 @@ static int dsi_mgr_connector_get_modes(struct drm_connector *connector) | |||
| 393 | ret = dsi_dual_connector_tile_init(connector, id); | 393 | ret = dsi_dual_connector_tile_init(connector, id); |
| 394 | if (ret) | 394 | if (ret) |
| 395 | return ret; | 395 | return ret; |
| 396 | ret = drm_mode_connector_set_tile_property(connector); | 396 | ret = drm_connector_set_tile_property(connector); |
| 397 | if (ret) { | 397 | if (ret) { |
| 398 | pr_err("%s: set tile property failed, %d\n", | 398 | pr_err("%s: set tile property failed, %d\n", |
| 399 | __func__, ret); | 399 | __func__, ret); |
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 475456c19b76..5a247eb71899 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c | |||
| @@ -931,7 +931,7 @@ nv50_mstc_new(struct nv50_mstm *mstm, struct drm_dp_mst_port *port, | |||
| 931 | 931 | ||
| 932 | drm_object_attach_property(&mstc->connector.base, dev->mode_config.path_property, 0); | 932 | drm_object_attach_property(&mstc->connector.base, dev->mode_config.path_property, 0); |
| 933 | drm_object_attach_property(&mstc->connector.base, dev->mode_config.tile_property, 0); | 933 | drm_object_attach_property(&mstc->connector.base, dev->mode_config.tile_property, 0); |
| 934 | drm_mode_connector_set_path_property(&mstc->connector, path); | 934 | drm_connector_set_path_property(&mstc->connector, path); |
| 935 | return 0; | 935 | return 0; |
| 936 | } | 936 | } |
| 937 | 937 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c index 37956cfc0b6d..f920be236cc9 100644 --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c | |||
| @@ -290,7 +290,7 @@ static struct drm_connector *radeon_dp_add_mst_connector(struct drm_dp_mst_topol | |||
| 290 | 290 | ||
| 291 | drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0); | 291 | drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0); |
| 292 | drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0); | 292 | drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0); |
| 293 | drm_mode_connector_set_path_property(connector, pathprop); | 293 | drm_connector_set_path_property(connector, pathprop); |
| 294 | 294 | ||
| 295 | return connector; | 295 | return connector; |
| 296 | } | 296 | } |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index bc5fbd39cf9a..4a0f0f41afa1 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | |||
| @@ -2114,7 +2114,7 @@ int vmw_du_connector_fill_modes(struct drm_connector *connector, | |||
| 2114 | drm_mode_probed_add(connector, mode); | 2114 | drm_mode_probed_add(connector, mode); |
| 2115 | } | 2115 | } |
| 2116 | 2116 | ||
| 2117 | drm_mode_connector_list_update(connector); | 2117 | drm_connector_list_update(connector); |
| 2118 | /* Move the prefered mode first, help apps pick the right mode. */ | 2118 | /* Move the prefered mode first, help apps pick the right mode. */ |
| 2119 | drm_mode_sort(&connector->modes); | 2119 | drm_mode_sort(&connector->modes); |
| 2120 | 2120 | ||
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index f9a78a53bd9f..97ea41dc678f 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h | |||
| @@ -919,7 +919,7 @@ struct drm_connector { | |||
| 919 | * @path_blob_ptr: | 919 | * @path_blob_ptr: |
| 920 | * | 920 | * |
| 921 | * DRM blob property data for the DP MST path property. This should only | 921 | * DRM blob property data for the DP MST path property. This should only |
| 922 | * be updated by calling drm_mode_connector_set_path_property(). | 922 | * be updated by calling drm_connector_set_path_property(). |
| 923 | */ | 923 | */ |
| 924 | struct drm_property_blob *path_blob_ptr; | 924 | struct drm_property_blob *path_blob_ptr; |
| 925 | 925 | ||
| @@ -1046,7 +1046,7 @@ struct drm_connector { | |||
| 1046 | * the tiling and virtualize both &drm_crtc and &drm_plane if needed. | 1046 | * the tiling and virtualize both &drm_crtc and &drm_plane if needed. |
| 1047 | * | 1047 | * |
| 1048 | * This should only be updated by calling | 1048 | * This should only be updated by calling |
| 1049 | * drm_mode_connector_set_tile_property(). | 1049 | * drm_connector_set_tile_property(). |
| 1050 | */ | 1050 | */ |
| 1051 | struct drm_property_blob *tile_blob_ptr; | 1051 | struct drm_property_blob *tile_blob_ptr; |
| 1052 | 1052 | ||
| @@ -1191,13 +1191,13 @@ void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame, | |||
| 1191 | 1191 | ||
| 1192 | int drm_mode_create_suggested_offset_properties(struct drm_device *dev); | 1192 | int drm_mode_create_suggested_offset_properties(struct drm_device *dev); |
| 1193 | 1193 | ||
| 1194 | int drm_mode_connector_set_path_property(struct drm_connector *connector, | 1194 | int drm_connector_set_path_property(struct drm_connector *connector, |
| 1195 | const char *path); | 1195 | const char *path); |
| 1196 | int drm_mode_connector_set_tile_property(struct drm_connector *connector); | 1196 | int drm_connector_set_tile_property(struct drm_connector *connector); |
| 1197 | int drm_connector_update_edid_property(struct drm_connector *connector, | 1197 | int drm_connector_update_edid_property(struct drm_connector *connector, |
| 1198 | const struct edid *edid); | 1198 | const struct edid *edid); |
| 1199 | void drm_mode_connector_set_link_status_property(struct drm_connector *connector, | 1199 | void drm_connector_set_link_status_property(struct drm_connector *connector, |
| 1200 | uint64_t link_status); | 1200 | uint64_t link_status); |
| 1201 | int drm_connector_init_panel_orientation_property( | 1201 | int drm_connector_init_panel_orientation_property( |
| 1202 | struct drm_connector *connector, int width, int height); | 1202 | struct drm_connector *connector, int width, int height); |
| 1203 | 1203 | ||
diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h index b159fe07fcf9..baded6514456 100644 --- a/include/drm/drm_modes.h +++ b/include/drm/drm_modes.h | |||
| @@ -530,7 +530,7 @@ drm_mode_validate_ycbcr420(const struct drm_display_mode *mode, | |||
| 530 | void drm_mode_prune_invalid(struct drm_device *dev, | 530 | void drm_mode_prune_invalid(struct drm_device *dev, |
| 531 | struct list_head *mode_list, bool verbose); | 531 | struct list_head *mode_list, bool verbose); |
| 532 | void drm_mode_sort(struct list_head *mode_list); | 532 | void drm_mode_sort(struct list_head *mode_list); |
| 533 | void drm_mode_connector_list_update(struct drm_connector *connector); | 533 | void drm_connector_list_update(struct drm_connector *connector); |
| 534 | 534 | ||
| 535 | /* parsing cmdline modes */ | 535 | /* parsing cmdline modes */ |
| 536 | bool | 536 | bool |
