| Message ID | 20190926225122.31455-4-lyude@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amdgpu: Fix incorrect encoder API usages | expand |
On Thu, Sep 26, 2019 at 6:52 PM Lyude Paul <lyude@redhat.com> wrote: > > We are supposed to be atomic after all. We'll need this in a moment for > the next commit. > > Signed-off-by: Lyude Paul <lyude@redhat.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> > --- > .../drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > index a398ddd1f306..d9113ce0be09 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > @@ -243,17 +243,17 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector) > return ret; > } > > -static struct drm_encoder *dm_mst_best_encoder(struct drm_connector *connector) > +static struct drm_encoder * > +dm_mst_atomic_best_encoder(struct drm_connector *connector, > + struct drm_connector_state *connector_state) > { > - struct amdgpu_dm_connector *amdgpu_dm_connector = to_amdgpu_dm_connector(connector); > - > - return &amdgpu_dm_connector->mst_encoder->base; > + return &to_amdgpu_dm_connector(connector)->mst_encoder->base; > } > > static const struct drm_connector_helper_funcs dm_dp_mst_connector_helper_funcs = { > .get_modes = dm_dp_mst_get_modes, > .mode_valid = amdgpu_dm_connector_mode_valid, > - .best_encoder = dm_mst_best_encoder, > + .atomic_best_encoder = dm_mst_atomic_best_encoder, > }; > > static void amdgpu_dm_encoder_destroy(struct drm_encoder *encoder) > -- > 2.21.0 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
On 2019-09-26 6:51 p.m., Lyude Paul wrote: > We are supposed to be atomic after all. We'll need this in a moment for > the next commit. > > Signed-off-by: Lyude Paul <lyude@redhat.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Harry > --- > .../drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > index a398ddd1f306..d9113ce0be09 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > @@ -243,17 +243,17 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector) > return ret; > } > > -static struct drm_encoder *dm_mst_best_encoder(struct drm_connector *connector) > +static struct drm_encoder * > +dm_mst_atomic_best_encoder(struct drm_connector *connector, > + struct drm_connector_state *connector_state) > { > - struct amdgpu_dm_connector *amdgpu_dm_connector = to_amdgpu_dm_connector(connector); > - > - return &amdgpu_dm_connector->mst_encoder->base; > + return &to_amdgpu_dm_connector(connector)->mst_encoder->base; > } > > static const struct drm_connector_helper_funcs dm_dp_mst_connector_helper_funcs = { > .get_modes = dm_dp_mst_get_modes, > .mode_valid = amdgpu_dm_connector_mode_valid, > - .best_encoder = dm_mst_best_encoder, > + .atomic_best_encoder = dm_mst_atomic_best_encoder, > }; > > static void amdgpu_dm_encoder_destroy(struct drm_encoder *encoder) >
On Fri, Sep 27, 2019 at 1:56 PM Harry Wentland <hwentlan@amd.com> wrote: > > On 2019-09-26 6:51 p.m., Lyude Paul wrote: > > We are supposed to be atomic after all. We'll need this in a moment for > > the next commit. > > > > Signed-off-by: Lyude Paul <lyude@redhat.com> > > Reviewed-by: Harry Wentland <harry.wentland@amd.com> > Applied. Thanks! Alex > Harry > > > --- > > .../drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > > index a398ddd1f306..d9113ce0be09 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > > @@ -243,17 +243,17 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector) > > return ret; > > } > > > > -static struct drm_encoder *dm_mst_best_encoder(struct drm_connector *connector) > > +static struct drm_encoder * > > +dm_mst_atomic_best_encoder(struct drm_connector *connector, > > + struct drm_connector_state *connector_state) > > { > > - struct amdgpu_dm_connector *amdgpu_dm_connector = to_amdgpu_dm_connector(connector); > > - > > - return &amdgpu_dm_connector->mst_encoder->base; > > + return &to_amdgpu_dm_connector(connector)->mst_encoder->base; > > } > > > > static const struct drm_connector_helper_funcs dm_dp_mst_connector_helper_funcs = { > > .get_modes = dm_dp_mst_get_modes, > > .mode_valid = amdgpu_dm_connector_mode_valid, > > - .best_encoder = dm_mst_best_encoder, > > + .atomic_best_encoder = dm_mst_atomic_best_encoder, > > }; > > > > static void amdgpu_dm_encoder_destroy(struct drm_encoder *encoder) > > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index a398ddd1f306..d9113ce0be09 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -243,17 +243,17 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector) return ret; } -static struct drm_encoder *dm_mst_best_encoder(struct drm_connector *connector) +static struct drm_encoder * +dm_mst_atomic_best_encoder(struct drm_connector *connector, + struct drm_connector_state *connector_state) { - struct amdgpu_dm_connector *amdgpu_dm_connector = to_amdgpu_dm_connector(connector); - - return &amdgpu_dm_connector->mst_encoder->base; + return &to_amdgpu_dm_connector(connector)->mst_encoder->base; } static const struct drm_connector_helper_funcs dm_dp_mst_connector_helper_funcs = { .get_modes = dm_dp_mst_get_modes, .mode_valid = amdgpu_dm_connector_mode_valid, - .best_encoder = dm_mst_best_encoder, + .atomic_best_encoder = dm_mst_atomic_best_encoder, }; static void amdgpu_dm_encoder_destroy(struct drm_encoder *encoder)
We are supposed to be atomic after all. We'll need this in a moment for the next commit. Signed-off-by: Lyude Paul <lyude@redhat.com> --- .../drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)