weston: Update/port patches for Weston 13

[AGL/meta-agl-devel.git] / meta-agl-drm-lease / recipes-graphics / weston / weston / 0001-compositor-do-not-request-repaint-in-output_enable.patch

diff --git a/meta-agl-drm-lease/recipes-graphics/weston/weston/0001-compositor-do-not-request-repaint-in-output_enable.patch b/meta-agl-drm-lease/recipes-graphics/weston/weston/0001-compositor-do-not-request-repaint-in-output_enable.patch
index 8301b05..f982f0b 100644 (file)
--- a/meta-agl-drm-lease/recipes-graphics/weston/weston/0001-compositor-do-not-request-repaint-in-output_enable.patch
+++ b/meta-agl-drm-lease/recipes-graphics/weston/weston/0001-compositor-do-not-request-repaint-in-output_enable.patch
@@ -1,7 +1,7 @@
-From 434e7f0e87c7728ad2c9056ee4cf42686db2d5f2 Mon Sep 17 00:00:00 2001
-From: Michael Tretter <m.tretter@pengutronix.de>
-Date: Thu, 23 Aug 2018 16:58:47 +0200
-Subject: [PATCH 3/3] compositor: do not request repaint in output_enable
+From c030a31ee81e5d17002b4b6ee672ae3d532e4e28 Mon Sep 17 00:00:00 2001
+From: Marius Vlad <marius.vlad@collabora.com>
+Date: Sat, 4 May 2024 23:27:57 +0300
+Subject: [PATCH] compositor: do not request repaint in output_enable
 
 When enabling a weston_output, the compositor damages the entire output,
 to ensure that the entire output is redrawn. However, this triggers a
@@ -12,27 +12,25 @@ Damage the entire output region, but do not trigger the repaint when
 enabling a weston_output.
 
 Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
-
-%% original patch: 0001-compositor-do-not-request-repaint-in-output_enable.patch
+Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
 ---
- libweston/compositor.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ libweston/compositor.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/libweston/compositor.c b/libweston/compositor.c
-index 1670c50..a983e60 100644
+index 34cde8c..3eba50d 100644
 --- a/libweston/compositor.c
 +++ b/libweston/compositor.c
-@@ -6762,7 +6762,9 @@ weston_output_enable(struct weston_output *output)
-       weston_output_init_zoom(output);
+@@ -7823,7 +7823,8 @@ weston_output_enable(struct weston_output *output)
+       }
  
-       weston_output_init_geometry(output, x, y);
+       weston_compositor_add_output(output->compositor, output);
 -      weston_output_damage(output);
-+      pixman_region32_union(&c->primary_plane.damage,
-+                            &c->primary_plane.damage,
-+                            &output->region);
++      weston_output_flush_damage_for_plane(output, &output->primary_plane,
++                                           &output->region);
  
-       wl_list_init(&output->animation_list);
-       wl_list_init(&output->feedback_list);
+       head_names = weston_output_create_heads_string(output);
+       weston_log("Output '%s' enabled with head(s) %s\n",
 -- 
-2.17.1
+2.43.0