diff options
author | Dave Airlie <airlied@redhat.com> | 2018-10-04 11:03:34 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-10-04 11:03:34 +1000 |
commit | 6004f172b375f5747e89afc62ad3baaf1bebd58a (patch) | |
tree | 914fafcc0e373c45c6e0dcc3661dad3a8be5f3d1 /drivers/gpu/drm/amd/display/dc/dc_link.h | |
parent | Merge tag 'exynos-drm-next-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (diff) | |
parent | Linux 4.19-rc6 (diff) | |
download | linux-dev-6004f172b375f5747e89afc62ad3baaf1bebd58a.tar.xz linux-dev-6004f172b375f5747e89afc62ad3baaf1bebd58a.zip |
BackMerge v4.19-rc6 into drm-next
I have some pulls based on rc6, and I prefer to have an explicit backmerge.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dc_link.h')
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/dc_link.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dc_link.h b/drivers/gpu/drm/amd/display/dc/dc_link.h index 438fb35d87b8..3bfdccceb524 100644 --- a/drivers/gpu/drm/amd/display/dc/dc_link.h +++ b/drivers/gpu/drm/amd/display/dc/dc_link.h @@ -216,6 +216,7 @@ void dc_link_enable_hpd_filter(struct dc_link *link, bool enable); bool dc_link_is_dp_sink_present(struct dc_link *link); +bool dc_link_detect_sink(struct dc_link *link, enum dc_connection_type *type); /* * DPCD access interfaces */ |