0002-Backporting-upstream-patch-to-fix-input-segment-faul.patch 1.8 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556
  1. From 77418b06c3687eb42f3705d4feef463cb55d503d Mon Sep 17 00:00:00 2001
  2. From: Yugang <fanyugang.fyg@linux.alibaba.com>
  3. Date: Tue, 15 Feb 2022 13:28:45 +0800
  4. Subject: [PATCH 2/2] Backporting upstream patch to fix input segment fault.
  5. Ref:
  6. * https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/585
  7. ---
  8. libweston/backend-drm/drm.c | 8 ++++----
  9. libweston/backend-drm/kms.c | 4 ++--
  10. 2 files changed, 6 insertions(+), 6 deletions(-)
  11. diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
  12. index 2780f3bd..2df80157 100644
  13. --- a/libweston/backend-drm/drm.c
  14. +++ b/libweston/backend-drm/drm.c
  15. @@ -3025,10 +3025,6 @@ err_drm_source:
  16. err_udev_input:
  17. udev_input_destroy(&b->input);
  18. err_sprite:
  19. -#ifdef BUILD_DRM_GBM
  20. - if (b->gbm)
  21. - gbm_device_destroy(b->gbm);
  22. -#endif
  23. destroy_sprites(b);
  24. err_udev_dev:
  25. udev_device_unref(drm_device);
  26. @@ -3038,6 +3034,10 @@ err_launcher:
  27. weston_launcher_destroy(compositor->launcher);
  28. err_compositor:
  29. weston_compositor_shutdown(compositor);
  30. +#ifdef BUILD_DRM_GBM
  31. + if (b->gbm)
  32. + gbm_device_destroy(b->gbm);
  33. +#endif
  34. free(b);
  35. return NULL;
  36. }
  37. diff --git a/libweston/backend-drm/kms.c b/libweston/backend-drm/kms.c
  38. index c91e3810..68412214 100644
  39. --- a/libweston/backend-drm/kms.c
  40. +++ b/libweston/backend-drm/kms.c
  41. @@ -1168,8 +1168,8 @@ drm_pending_state_apply_atomic(struct drm_pending_state *pending_state,
  42. wl_list_for_each(plane, &b->plane_list, link) {
  43. drm_debug(b, "\t\t[atomic] starting with plane %lu disabled\n",
  44. (unsigned long) plane->plane_id);
  45. - plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0);
  46. - plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0);
  47. + //plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0);
  48. + //plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0);
  49. }
  50. flags |= DRM_MODE_ATOMIC_ALLOW_MODESET;
  51. --
  52. 2.17.1