Commit 123cbb6c authored by Lyude Paul's avatar Lyude Paul

drm/dp_mst: Remove rebase-detritus in VCPI helper kernel-docs

Looks like when making the final revision of:

commit 022debad ("drm/atomic: Add drm_atomic_state->duplicated")

I forgot to remove some of the comments that I had added to
drm_dp_atomic_find_vcpi_slots() and drm_dp_atomic_release_vcpi_slots()
that were no longer valid due to us having removed the state->duplicated
checks from each function. This also introduced an error while building
the docs with sphinx:

./drivers/gpu/drm/drm_dp_mst_topology.c:3100: WARNING: Inline literal
start-string without end-string.

So, fix that by just removing the kerneldoc comments.
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Fixes: 022debad ("drm/atomic: Add drm_atomic_state->duplicated")
Reviewed-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190202002023.29665-5-lyude@redhat.com
parent e02f5c1b
...@@ -3097,10 +3097,6 @@ static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr, ...@@ -3097,10 +3097,6 @@ static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr,
* @port as needed. It is not OK however, to call this function and * @port as needed. It is not OK however, to call this function and
* drm_dp_atomic_release_vcpi_slots() in the same atomic check phase. * drm_dp_atomic_release_vcpi_slots() in the same atomic check phase.
* *
* When &drm_atomic_state.duplicated is set to %true%, this function will not
* perform any error checking and will instead simply return the previously
* recorded VCPI allocations.
*
* See also: * See also:
* drm_dp_atomic_release_vcpi_slots() * drm_dp_atomic_release_vcpi_slots()
* drm_dp_mst_atomic_check() * drm_dp_mst_atomic_check()
...@@ -3185,11 +3181,6 @@ EXPORT_SYMBOL(drm_dp_atomic_find_vcpi_slots); ...@@ -3185,11 +3181,6 @@ EXPORT_SYMBOL(drm_dp_atomic_find_vcpi_slots);
* drm_dp_atomic_find_vcpi_slots() on the same @port in a single atomic check * drm_dp_atomic_find_vcpi_slots() on the same @port in a single atomic check
* phase. * phase.
* *
* When &drm_atomic_state.duplicated is set, this function will not
* modify the VCPI allocations in &drm_dp_mst_topology_state.vcpis, so that
* those VCPI allocations may be restored as-is from the duplicated state. In
* this scenario, this function will always return 0.
*
* See also: * See also:
* drm_dp_atomic_find_vcpi_slots() * drm_dp_atomic_find_vcpi_slots()
* drm_dp_mst_atomic_check() * drm_dp_mst_atomic_check()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment