Advertisement
Guest User

Untitled

a guest
Aug 1st, 2022
94
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.63 KB | None | 0 0
  1. commit eb641a5fd5cf4461bf19b44552f3aa256146b456
  2. Author: Imre Deak <imre.deak@intel.com>
  3. Date: Fri Jul 29 17:40:51 2022 +0300
  4.  
  5. drm/amd/display: Fix compile error
  6.  
  7. commit 30c637151cfac8da3588f3773462e705a4ff2f59
  8. Author: Thomas Zimmermann <tzimmermann@suse.de>
  9. Date: Wed Jul 20 10:30:56 2022 +0200
  10.  
  11. drm/plane-helper: Export individual helpers
  12.  
  13. commit d93a13bd75b9b5d3f3534044c89516b037ffa0a7
  14. Author: Simon Ser <contact@emersion.fr>
  15. Date: Fri Jul 29 13:59:11 2022 +0200
  16.  
  17. Merge remote-tracking branch 'drm-misc/drm-misc-next' into drm-tip
  18.  
  19. Signed-off-by: Imre Deak <imre.deak@intel.com>
  20.  
  21. 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
  22. index 8cd25b2ea0dca..da3b086b0d6ef 100644
  23. --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
  24. +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
  25. @@ -33,6 +33,7 @@
  26. #include "amdgpu.h"
  27. #include "dal_asic_id.h"
  28. #include "amdgpu_display.h"
  29. +#include "amdgpu_dm_plane.h"
  30. #include "amdgpu_dm_trace.h"
  31. #include "gc/gc_11_0_0_offset.h"
  32. #include "gc/gc_11_0_0_sh_mask.h"
  33. @@ -1562,7 +1563,7 @@ int dm_drm_plane_get_property(struct drm_plane *plane,
  34. static const struct drm_plane_funcs dm_plane_funcs = {
  35. .update_plane = drm_atomic_helper_update_plane,
  36. .disable_plane = drm_atomic_helper_disable_plane,
  37. - .destroy = drm_primary_helper_destroy,
  38. + .destroy = drm_plane_helper_destroy,
  39. .reset = dm_drm_plane_reset,
  40. .atomic_duplicate_state = dm_drm_plane_duplicate_state,
  41. .atomic_destroy_state = dm_drm_plane_destroy_state,
  42.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement