Skip to content

Commit 123cbb6

Browse files
committed
drm/dp_mst: Remove rebase-detritus in VCPI helper kernel-docs
Looks like when making the final revision of: commit 022deba ("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: Lyude Paul <lyude@redhat.com> Fixes: 022deba ("drm/atomic: Add drm_atomic_state->duplicated") Reviewed-by: Daniel Vetter <daniel@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20190202002023.29665-5-lyude@redhat.com
1 parent e02f5c1 commit 123cbb6

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

drivers/gpu/drm/drm_dp_mst_topology.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3097,10 +3097,6 @@ static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr,
30973097
* @port as needed. It is not OK however, to call this function and
30983098
* drm_dp_atomic_release_vcpi_slots() in the same atomic check phase.
30993099
*
3100-
* When &drm_atomic_state.duplicated is set to %true%, this function will not
3101-
* perform any error checking and will instead simply return the previously
3102-
* recorded VCPI allocations.
3103-
*
31043100
* See also:
31053101
* drm_dp_atomic_release_vcpi_slots()
31063102
* drm_dp_mst_atomic_check()
@@ -3185,11 +3181,6 @@ EXPORT_SYMBOL(drm_dp_atomic_find_vcpi_slots);
31853181
* drm_dp_atomic_find_vcpi_slots() on the same @port in a single atomic check
31863182
* phase.
31873183
*
3188-
* When &drm_atomic_state.duplicated is set, this function will not
3189-
* modify the VCPI allocations in &drm_dp_mst_topology_state.vcpis, so that
3190-
* those VCPI allocations may be restored as-is from the duplicated state. In
3191-
* this scenario, this function will always return 0.
3192-
*
31933184
* See also:
31943185
* drm_dp_atomic_find_vcpi_slots()
31953186
* drm_dp_mst_atomic_check()

0 commit comments

Comments
 (0)