diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-12-09 09:58:51 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-12-09 09:58:51 +1000 |
| commit | d1b8792b636f83804add26ec1ac90a686be19e49 (patch) | |
| tree | dd12f04f8e18574f134a66bd8ceb93fbf5109606 /drivers/gpu/drm/i915/intel_dp_mst.c | |
| parent | b75478d1c7e4758abcf15c8494d70d4dc4dcb553 (diff) | |
| parent | b0ee9e7fa5b461a91f24d1d03b10c6bf162c86f9 (diff) | |
Merge branch 'drm-mst-next' of ssh://people.freedesktop.org/~/linux into drm-next
Merge mst tiling patches and MST fixes
* 'drm-mst-next' of ssh://people.freedesktop.org/~/linux:
drm/fb: add support for tiled monitor configurations. (v2)
drm/tile: expose the tile property to userspace (v3)
drm/connector: store tile information from displayid (v3)
drm/mst: cached EDID for logical ports (v2)
drm: add tile_group support. (v3)
drm/displayid: add displayid defines and edid extension (v2)
drm/dp-mst: Remove branches before dropping the reference
drm/fb_helper: move deferred fb checking into restore mode (v2)
drm/dp: retry AUX transactions 32 times (v1.1)
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp_mst.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp_mst.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index bfe359506377..7f8c6a66680a 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c @@ -283,7 +283,7 @@ intel_dp_mst_detect(struct drm_connector *connector, bool force) struct intel_connector *intel_connector = to_intel_connector(connector); struct intel_dp *intel_dp = intel_connector->mst_port; - return drm_dp_mst_detect_port(&intel_dp->mst_mgr, intel_connector->port); + return drm_dp_mst_detect_port(connector, &intel_dp->mst_mgr, intel_connector->port); } static int @@ -414,6 +414,8 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo intel_dp_add_properties(intel_dp, connector); drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0); + drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0); + drm_mode_connector_set_path_property(connector, pathprop); drm_reinit_primary_mode_group(dev); mutex_lock(&dev->mode_config.mutex); |