| Message ID | 20190913220355.6883-2-lyude@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] drm/nouveau: dispnv50: Don't create MSTMs for eDP connectors | expand |
On Fri, Sep 13, 2019 at 6:05 PM Lyude Paul <lyude@redhat.com> wrote: > > When drm_connector_helper_funcs->atomic_best_encoder is defined, > ->best_encoder is ignored both by the atomic modesetting helpers. That By both the atomic modesetting helpers and ... (usually "both" implies 2 things) > being said, this hook is completely broken anyway - it always returns > the first msto for a given mstc, despite the fact it might already be in > use. > > So, just get rid of it. We'll need this in a moment anyway, when we make > mstos per-head as opposed to per-connector. > > Signed-off-by: Lyude Paul <lyude@redhat.com> > --- > drivers/gpu/drm/nouveau/dispnv50/disp.c | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c > index b46be8a091e9..a3f350fdfa8c 100644 > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c > @@ -920,14 +920,6 @@ nv50_mstc_atomic_best_encoder(struct drm_connector *connector, > return &mstc->mstm->msto[head->base.index]->encoder; > } > > -static struct drm_encoder * > -nv50_mstc_best_encoder(struct drm_connector *connector) > -{ > - struct nv50_mstc *mstc = nv50_mstc(connector); > - > - return &mstc->mstm->msto[0]->encoder; > -} > - > static enum drm_mode_status > nv50_mstc_mode_valid(struct drm_connector *connector, > struct drm_display_mode *mode) > @@ -990,7 +982,6 @@ static const struct drm_connector_helper_funcs > nv50_mstc_help = { > .get_modes = nv50_mstc_get_modes, > .mode_valid = nv50_mstc_mode_valid, > - .best_encoder = nv50_mstc_best_encoder, > .atomic_best_encoder = nv50_mstc_atomic_best_encoder, > .atomic_check = nv50_mstc_atomic_check, > }; > -- > 2.21.0 >
On Fri, 2019-09-13 at 18:20 -0400, Ilia Mirkin wrote: > On Fri, Sep 13, 2019 at 6:05 PM Lyude Paul <lyude@redhat.com> wrote: > > When drm_connector_helper_funcs->atomic_best_encoder is defined, > > ->best_encoder is ignored both by the atomic modesetting helpers. That > > By both the atomic modesetting helpers and ... (usually "both" implies 2 > things) good catch, will fix and respin in a moment > > > being said, this hook is completely broken anyway - it always returns > > the first msto for a given mstc, despite the fact it might already be in > > use. > > > > So, just get rid of it. We'll need this in a moment anyway, when we make > > mstos per-head as opposed to per-connector. > > > > Signed-off-by: Lyude Paul <lyude@redhat.com> > > --- > > drivers/gpu/drm/nouveau/dispnv50/disp.c | 9 --------- > > 1 file changed, 9 deletions(-) > > > > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c > > b/drivers/gpu/drm/nouveau/dispnv50/disp.c > > index b46be8a091e9..a3f350fdfa8c 100644 > > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c > > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c > > @@ -920,14 +920,6 @@ nv50_mstc_atomic_best_encoder(struct drm_connector > > *connector, > > return &mstc->mstm->msto[head->base.index]->encoder; > > } > > > > -static struct drm_encoder * > > -nv50_mstc_best_encoder(struct drm_connector *connector) > > -{ > > - struct nv50_mstc *mstc = nv50_mstc(connector); > > - > > - return &mstc->mstm->msto[0]->encoder; > > -} > > - > > static enum drm_mode_status > > nv50_mstc_mode_valid(struct drm_connector *connector, > > struct drm_display_mode *mode) > > @@ -990,7 +982,6 @@ static const struct drm_connector_helper_funcs > > nv50_mstc_help = { > > .get_modes = nv50_mstc_get_modes, > > .mode_valid = nv50_mstc_mode_valid, > > - .best_encoder = nv50_mstc_best_encoder, > > .atomic_best_encoder = nv50_mstc_atomic_best_encoder, > > .atomic_check = nv50_mstc_atomic_check, > > }; > > -- > > 2.21.0 > >
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index b46be8a091e9..a3f350fdfa8c 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -920,14 +920,6 @@ nv50_mstc_atomic_best_encoder(struct drm_connector *connector, return &mstc->mstm->msto[head->base.index]->encoder; } -static struct drm_encoder * -nv50_mstc_best_encoder(struct drm_connector *connector) -{ - struct nv50_mstc *mstc = nv50_mstc(connector); - - return &mstc->mstm->msto[0]->encoder; -} - static enum drm_mode_status nv50_mstc_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) @@ -990,7 +982,6 @@ static const struct drm_connector_helper_funcs nv50_mstc_help = { .get_modes = nv50_mstc_get_modes, .mode_valid = nv50_mstc_mode_valid, - .best_encoder = nv50_mstc_best_encoder, .atomic_best_encoder = nv50_mstc_atomic_best_encoder, .atomic_check = nv50_mstc_atomic_check, };
When drm_connector_helper_funcs->atomic_best_encoder is defined, ->best_encoder is ignored both by the atomic modesetting helpers. That being said, this hook is completely broken anyway - it always returns the first msto for a given mstc, despite the fact it might already be in use. So, just get rid of it. We'll need this in a moment anyway, when we make mstos per-head as opposed to per-connector. Signed-off-by: Lyude Paul <lyude@redhat.com> --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 9 --------- 1 file changed, 9 deletions(-)