Merge branch 'develop' into fix/ebusy-on-atomic-commit

Author: ardera

Makefile

@@ -1,7 +1,5 @@
 REAL_CFLAGS = -I./include $(shell pkg-config --cflags gbm libdrm glesv2 egl libsystemd libinput libudev) \
 	-DBUILD_TEXT_INPUT_PLUGIN \
-	-DBUILD_GPIOD_PLUGIN \
-	-DBUILD_SPIDEV_PLUGIN \
 	-DBUILD_TEST_PLUGIN \
 	-DBUILD_OMXPLAYER_VIDEO_PLAYER_PLUGIN \
 	-O0 -ggdb \

include/modesetting.h

@@ -86,17 +86,35 @@ int drmdev_configure(
     const drmModeModeInfo *mode
 );
 
-int drmdev_plane_supports_rotation_value(
+int drmdev_plane_supports_setting_rotation_value(
     struct drmdev *drmdev,
     uint32_t plane_id,
     int drm_rotation,
     bool *result
 );
 
-int drmdev_plane_supports_zpos_value(
+int drmdev_plane_get_min_zpos_value(
     struct drmdev *drmdev,
     uint32_t plane_id,
-    int zpos,
+    int64_t *min_zpos_out
+);
+
+int drmdev_plane_get_max_zpos_value(
+    struct drmdev *drmdev,
+    uint32_t plane_id,
+    int64_t *max_zpos_out
+);
+
+int drmdev_plane_supports_setting_zpos(
+    struct drmdev *drmdev,
+    uint32_t plane_id,
+    bool *result
+);
+
+int drmdev_plane_supports_setting_zpos_value(
+    struct drmdev *drmdev,
+    uint32_t plane_id,
+    int64_t zpos,
     bool *result
 );
 

src/compositor.c

@@ -370,7 +370,7 @@ static int rendertarget_gbm_present(
 	drmdev_atomic_req_put_plane_property(atomic_req, drm_plane_id, "CRTC_W", flutterpi.display.width);
 	drmdev_atomic_req_put_plane_property(atomic_req, drm_plane_id, "CRTC_H", flutterpi.display.height);
 
-	ok = drmdev_plane_supports_rotation_value(atomic_req->drmdev, drm_plane_id, DRM_MODE_ROTATE_0, &supported);
+	ok = drmdev_plane_supports_setting_rotation_value(atomic_req->drmdev, drm_plane_id, DRM_MODE_ROTATE_0, &supported);
 	if (ok != 0) return ok;
 
 	if (supported) {
@@ -388,7 +388,7 @@ static int rendertarget_gbm_present(
 		}
 	}
 
-	ok = drmdev_plane_supports_zpos_value(atomic_req->drmdev, drm_plane_id, zpos, &supported);
+	ok = drmdev_plane_supports_setting_zpos_value(atomic_req->drmdev, drm_plane_id, zpos, &supported);
 	if (ok != 0) return ok;
 
 	if (supported) {
@@ -492,7 +492,7 @@ static int rendertarget_nogbm_present(
 	drmdev_atomic_req_put_plane_property(req, drm_plane_id, "CRTC_W", flutterpi.display.width);
 	drmdev_atomic_req_put_plane_property(req, drm_plane_id, "CRTC_H", flutterpi.display.height);
 
-	ok = drmdev_plane_supports_rotation_value(req->drmdev, drm_plane_id, DRM_MODE_ROTATE_0 | DRM_MODE_REFLECT_Y, &supported);
+	ok = drmdev_plane_supports_setting_rotation_value(req->drmdev, drm_plane_id, DRM_MODE_ROTATE_0 | DRM_MODE_REFLECT_Y, &supported);
 	if (ok != 0) return ok;
 
 	if (supported) {
@@ -509,6 +509,9 @@ static int rendertarget_nogbm_present(
 			printed = true;
 		}
 	}
+
+	ok = drmdev_plane_supports_setting_zpos_value(req->drmdev, drm_plane_id, zpos, &supported);
+	if (ok != 0) return ok;
 
 	if (supported) {
 		drmdev_atomic_req_put_plane_property(req, drm_plane_id, "zpos", zpos);
@@ -799,10 +802,32 @@ static bool on_present_layers(
 		ok = drmdev_atomic_req_put_modeset_props(req, &req_flags);
 		if (ok != 0) return false;
 
+		int64_t max_zpos = 0;
+
 		for_each_unreserved_plane_in_atomic_req(req, plane) {
 			if (plane->type == DRM_PLANE_TYPE_CURSOR) {
 				// make sure the cursor is in front of everything
-				drmdev_atomic_req_put_plane_property(req, plane->plane->plane_id, "zpos", 2);
+				int64_t max_zpos;
+				bool supported;
+
+				ok = drmdev_plane_get_max_zpos_value(req->drmdev, plane->plane->plane_id, &max_zpos);
+				if (ok != 0) {
+					printf("[compositor] Could not move cursor to front. Mouse cursor may be invisible. drmdev_plane_get_max_zpos_value: %s\n", strerror(ok));
+					continue;
+				}
+				
+				ok = drmdev_plane_supports_setting_zpos_value(req->drmdev, plane->plane->plane_id, max_zpos, &supported);
+				if (ok != 0) {
+					printf("[compositor] Could not move cursor to front. Mouse cursor may be invisible. drmdev_plane_supports_setting_zpos_value: %s\n", strerror(ok));
+					continue;
+				}
+
+				if (supported) {
+					drmdev_atomic_req_put_plane_property(req, plane->plane->plane_id, "zpos", max_zpos);
+				} else {
+					printf("[compositor] Could not move cursor to front. Mouse cursor may be invisible. drmdev_plane_supports_setting_zpos_value: %s\n", strerror(ok));
+					continue;
+				}
 			}
 		}
 
@@ -955,6 +980,17 @@ static bool on_present_layers(
 			}
 		}
 	}
+	
+	int64_t min_zpos;
+	for_each_unreserved_plane_in_atomic_req(req, plane) {
+		if (plane->type == DRM_PLANE_TYPE_PRIMARY) {
+			ok = drmdev_plane_get_min_zpos_value(req->drmdev, plane->plane->plane_id, &min_zpos);
+			if (ok != 0) {
+				min_zpos = 0;
+			}
+			break;
+		}
+	}
 
 	for (int i = 0; i < layers_count; i++) {
 		if (layers[i]->type == kFlutterLayerContentTypeBackingStore) {
@@ -989,7 +1025,7 @@ static bool on_present_layers(
 				0,
 				compositor->drmdev->selected_mode->hdisplay,
 				compositor->drmdev->selected_mode->vdisplay,
-				plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1
+				i + min_zpos
 			);
 			if (ok != 0) {
 				fprintf(stderr, "[compositor] Could not present backing store. rendertarget->present: %s\n", strerror(ok));
@@ -1007,7 +1043,7 @@ static bool on_present_layers(
 					(int) round(layers[i]->offset.y),
 					(int) round(layers[i]->size.width),
 					(int) round(layers[i]->size.height),
-					i,
+					i + min_zpos,
 					cb_data->userdata
 				);
 				if (ok != 0) {

src/flutter-pi.c

@@ -1035,7 +1035,6 @@ void on_pageflip_event(
 
 	flutterpi.flutter.libflutter_engine.FlutterEngineTraceEventInstant("pageflip");
 
-	printf("[%12.6f] pageflip ocurred at %12.6f\n", flutterpi.flutter.libflutter_engine.FlutterEngineGetCurrentTime() / 1000000000.0, sec + usec / 1000000.0);
 
 	cqueue_lock(&flutterpi.frame_queue);