On Tue, Oct 23, 2018 at 07:12:47PM -0400, Lyude Paul wrote: > There's no reason to track the atomic state three times. Unfortunately, > this is currently what we're doing, and even worse is that there is only > one actually correct state pointer: the one in mst_state->base.state. > mgr->state never seems to be used, along with the one in > mst_state->state. > > This confused me for over 4 hours until I realized there was no magic > behind these pointers. So, let's save everyone else from the trouble. > > Signed-off-by: Lyude Paul <[email protected]>. > Cc: Daniel Vetter <[email protected]> > Signed-off-by: Lyude Paul <[email protected]>
Uh, that's some fail :-/ Thanks for cleaning up. Reviewed-by: Daniel Vetter <[email protected]> > --- > include/drm/drm_dp_mst_helper.h | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h > index 7f78d26a0766..59f005b419cf 100644 > --- a/include/drm/drm_dp_mst_helper.h > +++ b/include/drm/drm_dp_mst_helper.h > @@ -409,7 +409,6 @@ struct drm_dp_payload { > struct drm_dp_mst_topology_state { > struct drm_private_state base; > int avail_slots; > - struct drm_atomic_state *state; > struct drm_dp_mst_topology_mgr *mgr; > }; > > @@ -497,11 +496,6 @@ struct drm_dp_mst_topology_mgr { > */ > int pbn_div; > > - /** > - * @state: State information for topology manager > - */ > - struct drm_dp_mst_topology_state *state; > - > /** > * @funcs: Atomic helper callbacks > */ > -- > 2.17.2 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau
