| Message ID | 20190206183101.9867-1-lyude@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/dp_mst: Remove rebase-detritus in VCPI helper kernel-docs | expand |
On Wed, Feb 06, 2019 at 01:31:01PM -0500, Lyude Paul wrote: > Looks like when making the final revision of: > > 022debad063e ("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> Reviewed-by: Sean Paul <sean@poorly.run> > Fixes: 022debad063e ("drm/atomic: Add drm_atomic_state->duplicated") > Cc: Daniel Vetter <daniel@ffwll.ch> > --- > drivers/gpu/drm/drm_dp_mst_topology.c | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c > index 5a99135d39cd..dc7ac0c60547 100644 > --- a/drivers/gpu/drm/drm_dp_mst_topology.c > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c > @@ -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 > * 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: > * drm_dp_atomic_release_vcpi_slots() > * drm_dp_mst_atomic_check() > @@ -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 > * 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: > * drm_dp_atomic_find_vcpi_slots() > * drm_dp_mst_atomic_check() > -- > 2.20.1 >
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 5a99135d39cd..dc7ac0c60547 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -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 * 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: * drm_dp_atomic_release_vcpi_slots() * drm_dp_mst_atomic_check() @@ -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 * 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: * drm_dp_atomic_find_vcpi_slots() * drm_dp_mst_atomic_check()
Looks like when making the final revision of: 022debad063e ("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: 022debad063e ("drm/atomic: Add drm_atomic_state->duplicated") Cc: Daniel Vetter <daniel@ffwll.ch> --- drivers/gpu/drm/drm_dp_mst_topology.c | 9 --------- 1 file changed, 9 deletions(-)