| Message ID | 20220801135259.3039679-1-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] drm/amd/display: Fix merge conflict resolution in amdgpu_dm_plane.c | expand |
Acked-by: Simon Ser <contact@emersion.fr> CC amd-gfx On Monday, August 1st, 2022 at 15:52, Imre Deak <imre.deak@intel.com> wrote: > The API change introduced in > > commit 30c637151cfa ("drm/plane-helper: Export individual helpers") > > was missed in the conflict resolution of > > commit d93a13bd75b9 ("Merge remote-tracking branch 'drm-misc/drm-misc-next' into drm-tip") > > fix this up. > > Fixes: d93a13bd75b9 ("Merge remote-tracking branch 'drm-misc/drm-misc-next' into drm-tip") > Cc: Simon Ser contact@emersion.fr > > Cc: Thomas Zimmermann tzimmermann@suse.de > > Acked-by: Thomas Zimmermann tzimmermann@suse.de > > Signed-off-by: Imre Deak imre.deak@intel.com > > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > index 8cd25b2ea0dca..5eb5d31e591de 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > @@ -1562,7 +1562,7 @@ int dm_drm_plane_get_property(struct drm_plane *plane, > static const struct drm_plane_funcs dm_plane_funcs = { > .update_plane = drm_atomic_helper_update_plane, > .disable_plane = drm_atomic_helper_disable_plane, > - .destroy = drm_primary_helper_destroy, > + .destroy = drm_plane_helper_destroy, > .reset = dm_drm_plane_reset, > .atomic_duplicate_state = dm_drm_plane_duplicate_state, > .atomic_destroy_state = dm_drm_plane_destroy_state, > -- > 2.37.1
Acked-by: Alex Deucher <alexander.deucher@amd.com> On Mon, Aug 1, 2022 at 10:08 AM Simon Ser <contact@emersion.fr> wrote: > > Acked-by: Simon Ser <contact@emersion.fr> > > CC amd-gfx > > On Monday, August 1st, 2022 at 15:52, Imre Deak <imre.deak@intel.com> wrote: > > > The API change introduced in > > > > commit 30c637151cfa ("drm/plane-helper: Export individual helpers") > > > > was missed in the conflict resolution of > > > > commit d93a13bd75b9 ("Merge remote-tracking branch 'drm-misc/drm-misc-next' into drm-tip") > > > > fix this up. > > > > Fixes: d93a13bd75b9 ("Merge remote-tracking branch 'drm-misc/drm-misc-next' into drm-tip") > > Cc: Simon Ser contact@emersion.fr > > > > Cc: Thomas Zimmermann tzimmermann@suse.de > > > > Acked-by: Thomas Zimmermann tzimmermann@suse.de > > > > Signed-off-by: Imre Deak imre.deak@intel.com > > > > --- > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > > index 8cd25b2ea0dca..5eb5d31e591de 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > > @@ -1562,7 +1562,7 @@ int dm_drm_plane_get_property(struct drm_plane *plane, > > static const struct drm_plane_funcs dm_plane_funcs = { > > .update_plane = drm_atomic_helper_update_plane, > > .disable_plane = drm_atomic_helper_disable_plane, > > - .destroy = drm_primary_helper_destroy, > > + .destroy = drm_plane_helper_destroy, > > .reset = dm_drm_plane_reset, > > .atomic_duplicate_state = dm_drm_plane_duplicate_state, > > .atomic_destroy_state = dm_drm_plane_destroy_state, > > -- > > 2.37.1
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c index 8cd25b2ea0dca..5eb5d31e591de 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c @@ -1562,7 +1562,7 @@ int dm_drm_plane_get_property(struct drm_plane *plane, static const struct drm_plane_funcs dm_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, - .destroy = drm_primary_helper_destroy, + .destroy = drm_plane_helper_destroy, .reset = dm_drm_plane_reset, .atomic_duplicate_state = dm_drm_plane_duplicate_state, .atomic_destroy_state = dm_drm_plane_destroy_state,
The API change introduced in commit 30c637151cfa ("drm/plane-helper: Export individual helpers") was missed in the conflict resolution of commit d93a13bd75b9 ("Merge remote-tracking branch 'drm-misc/drm-misc-next' into drm-tip") fix this up. Fixes: d93a13bd75b9 ("Merge remote-tracking branch 'drm-misc/drm-misc-next' into drm-tip") Cc: Simon Ser <contact@emersion.fr> Cc: Thomas Zimmermann <tzimmermann@suse.de> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Imre Deak <imre.deak@intel.com> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)