All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] drm/amd/display: Fix merge conflict resolution in amdgpu_dm_plane.c
@ 2022-08-01 13:52 ` Imre Deak
  0 siblings, 0 replies; 23+ messages in thread
From: Imre Deak @ 2022-08-01 13:52 UTC (permalink / raw)
  To: dri-devel; +Cc: intel-gfx, Thomas Zimmermann

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


^ permalink raw reply related	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2022-08-10 16:46 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-01 13:52 [PATCH 1/3] drm/amd/display: Fix merge conflict resolution in amdgpu_dm_plane.c Imre Deak
2022-08-01 13:52 ` [Intel-gfx] " Imre Deak
2022-08-01 13:52 ` [PATCH 2/3] drm/amd/display: Fix 'no previous prototype' compiler warns " Imre Deak
2022-08-01 13:52   ` [Intel-gfx] " Imre Deak
2022-08-02 16:57   ` Rodrigo Siqueira Jordao
2022-08-02 16:57     ` [Intel-gfx] " Rodrigo Siqueira Jordao
2022-08-03 12:41     ` Imre Deak
2022-08-03 12:41       ` [Intel-gfx] " Imre Deak
2022-08-03 14:24       ` Rodrigo Siqueira Jordao
2022-08-03 14:24         ` [Intel-gfx] " Rodrigo Siqueira Jordao
2022-08-01 13:52 ` [Intel-gfx] [PATCH 3/3] drm/amd/display: Fix static declaration follows non-static declaration compiler warn Imre Deak
2022-08-01 13:52   ` Imre Deak
2022-08-02 16:58   ` Rodrigo Siqueira Jordao
2022-08-02 16:58     ` [Intel-gfx] " Rodrigo Siqueira Jordao
2022-08-01 13:57 ` [PATCH 1/3] drm/amd/display: Fix merge conflict resolution in amdgpu_dm_plane.c Simon Ser
2022-08-01 13:57   ` [Intel-gfx] " Simon Ser
2022-08-10 16:45   ` Alex Deucher
2022-08-10 16:45     ` Alex Deucher
2022-08-10 16:45     ` [Intel-gfx] " Alex Deucher
2022-08-01 20:29 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/3] " Patchwork
2022-08-01 20:29 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-08-01 20:53 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-08-02  6:47 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.