diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-07-20 10:40:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-07-20 10:46:49 +1000 |
| commit | 294f96ae8aa53415272045649e3e7a1749cc0575 (patch) | |
| tree | 20fb15da04d4fbc87ea5419b889fec5322056a8b /drivers/gpu/drm/i915/intel_dp_mst.c | |
| parent | 090cbdd0735b3752a9dd2e4008e585acd661c67d (diff) | |
| parent | 979c11ef39cee79d6f556091a357890962be2580 (diff) | |
| download | linux-294f96ae8aa53415272045649e3e7a1749cc0575.tar.gz linux-294f96ae8aa53415272045649e3e7a1749cc0575.tar.bz2 linux-294f96ae8aa53415272045649e3e7a1749cc0575.zip | |
Merge tag 'drm-misc-next-2018-07-18' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 4.19:
Core Changes:
- add support for DisplayPort CEC-Tunneling-over-AUX (Hans Verkuil)
- more doc updates (Daniel Vetter)
- fourcc: Add is_yuv field to drm_format_info (Ayan Kumar Halder)
- dma-buf: correctly place BUG_ON (Michel Dänzer)
Driver Changes:
- more vkms support(Rodrigo Siqueira)
- many fixes and small improments to all drivers
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180718200826.GA20165@juma
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp_mst.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp_mst.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index 85ecf41eeabb..7e3e01607643 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c @@ -466,8 +466,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo struct drm_encoder *enc = &intel_dp->mst_encoders[pipe]->base.base; - ret = drm_mode_connector_attach_encoder(&intel_connector->base, - enc); + ret = drm_connector_attach_encoder(&intel_connector->base, enc); if (ret) goto err; } @@ -475,7 +474,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0); drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0); - ret = drm_mode_connector_set_path_property(connector, pathprop); + ret = drm_connector_set_path_property(connector, pathprop); if (ret) goto err; |