xref: /OK3568_Linux_fs/buildroot/package/weston/0042-backend-drm-Support-modifier.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)

From 96d5f6823314a2a1a2355d5a72dd2c95c5311ca8 Mon Sep 17 00:00:00 2001
From: Jeffy Chen <jeffy.chen@rock-chips.com>
Date: Wed, 6 Jan 2021 04:11:48 +0800
Subject: [PATCH 42/95] backend-drm: Support modifier

Tested on rk356x with ARM AFBC modifier.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
 libweston/backend-drm/drm-internal.h |   1 +
 libweston/backend-drm/drm.c          | 100 +++++++++++++++++++++------
 libweston/backend-drm/kms.c          |   3 +-
 libweston/pixel-formats.c            |   1 +
 4 files changed, 84 insertions(+), 21 deletions(-)

diff --git a/libweston/backend-drm/drm-internal.h b/libweston/backend-drm/drm-internal.h
index e175f16..12ee031 100644
--- a/libweston/backend-drm/drm-internal.h
+++ b/libweston/backend-drm/drm-internal.h
@@ -534,6 +534,7 @@ struct drm_plane {
 	struct weston_drm_format_array formats;

 	bool can_scale;
+	bool has_modifiers;
 };

 struct drm_connector {
diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
index 756ee00..97e3382 100644
--- a/libweston/backend-drm/drm.c
+++ b/libweston/backend-drm/drm.c
@@ -1265,6 +1265,42 @@ err:
 	return NULL;
 }

+static inline bool
+drm_plane_has_modifier(struct drm_plane *plane, uint32_t format)
+{
+	struct weston_drm_format *fmt;
+	const uint64_t *modifiers;
+	unsigned int num_modifiers, i;
+
+	fmt = weston_drm_format_array_find_format(&plane->formats, format);
+	if (!fmt)
+		return false;
+
+	modifiers = weston_drm_format_get_modifiers(fmt, &num_modifiers);
+	for (i = 0; i < num_modifiers; i++) {
+		if (DRM_MOD_VALID(modifiers[i]))
+			return true;
+	}
+
+	return false;
+}
+
+static inline bool
+drm_planes_have_modifier(struct drm_device *device)
+{
+	struct drm_plane *plane;
+
+	if (!device->fb_modifiers)
+		return false;
+
+	wl_list_for_each_reverse(plane, &device->plane_list, link) {
+		if (plane->has_modifiers)
+			return true;
+	}
+
+	return false;
+}
+
 /**
  * Find, or create, a special-purpose plane
  *
@@ -1279,7 +1315,10 @@ drm_output_find_special_plane(struct drm_device *device,
 {
 	struct drm_backend *b = device->backend;
 	struct drm_plane *plane;
+	bool prefer_modifier =
+		device->fb_modifiers && type == WDRM_PLANE_TYPE_PRIMARY;

+retry:
 	wl_list_for_each(plane, &device->plane_list, link) {
 		struct weston_output *base;
 		bool found_elsewhere = false;
@@ -1311,10 +1350,22 @@ drm_output_find_special_plane(struct drm_device *device,
 		if (found_elsewhere)
 			continue;

+		if (prefer_modifier &&
+		    !drm_plane_has_modifier(plane, output->gbm_format))
+			continue;
+
+		if (plane->type != type)
+			continue;
+
 		plane->possible_crtcs = (1 << output->crtc->pipe);
 		return plane;
 	}

+	if (prefer_modifier) {
+		prefer_modifier = false;
+		goto retry;
+	}
+
 	return NULL;
 }

@@ -4271,9 +4322,6 @@ drm_backend_create(struct weston_compositor *compositor,

 	compositor->backend = &b->base;

-	if (parse_gbm_format(config->gbm_format, DRM_FORMAT_XRGB8888, &b->gbm_format) < 0)
-		goto err_compositor;
-
 	/* Check if we run drm-backend using a compatible launcher */
 	compositor->launcher = weston_launcher_connect(compositor, seat_id, true);
 	if (compositor->launcher == NULL) {
@@ -4306,15 +4354,42 @@ drm_backend_create(struct weston_compositor *compositor,
 		goto err_udev_dev;
 	}

+	res = drmModeGetResources(b->drm->drm.fd);
+	if (!res) {
+		weston_log("Failed to get drmModeRes\n");
+		goto err_udev_dev;
+	}
+
+	wl_list_init(&b->drm->crtc_list);
+	if (drm_backend_create_crtc_list(b->drm, res) == -1) {
+		weston_log("Failed to create CRTC list for DRM-backend\n");
+		goto err_create_crtc_list;
+	}
+
+	wl_list_init(&device->plane_list);
+	create_sprites(b->drm, res);
+
+	if (!drm_planes_have_modifier(b->drm))
+		device->fb_modifiers = false;
+
+	b->gbm_format = DRM_FORMAT_XRGB8888;
+
+	/* HACK: The modifiers only work with xbgr8888 now */
+	if (device->fb_modifiers)
+		b->gbm_format = DRM_FORMAT_XBGR8888;
+
+	if (parse_gbm_format(config->gbm_format, b->gbm_format, &b->gbm_format) < 0)
+		goto err_sprite;
+
 	if (b->use_pixman) {
 		if (init_pixman(b) < 0) {
 			weston_log("failed to initialize pixman renderer\n");
-			goto err_udev_dev;
+			goto err_sprite;
 		}
 	} else {
 		if (init_egl(b) < 0) {
 			weston_log("failed to initialize egl\n");
-			goto err_udev_dev;
+			goto err_sprite;
 		}
 	}

@@ -4328,21 +4403,6 @@ drm_backend_create(struct weston_compositor *compositor,

 	weston_setup_vt_switch_bindings(compositor);

-	res = drmModeGetResources(b->drm->drm.fd);
-	if (!res) {
-		weston_log("Failed to get drmModeRes\n");
-		goto err_udev_dev;
-	}
-
-	wl_list_init(&b->drm->crtc_list);
-	if (drm_backend_create_crtc_list(b->drm, res) == -1) {
-		weston_log("Failed to create CRTC list for DRM-backend\n");
-		goto err_create_crtc_list;
-	}
-
-	wl_list_init(&device->plane_list);
-	create_sprites(b->drm, res);
-
 	if (udev_input_init(&b->input,
 			    compositor, b->udev, seat_id,
 			    config->configure_device) < 0) {
diff --git a/libweston/backend-drm/kms.c b/libweston/backend-drm/kms.c
index 3d97df2..52f0c68 100644
--- a/libweston/backend-drm/kms.c
+++ b/libweston/backend-drm/kms.c
@@ -38,6 +38,7 @@

 #include <libweston/libweston.h>
 #include <libweston/backend-drm.h>
+#include <libweston/linux-dmabuf.h>
 #include "shared/helpers.h"
 #include "shared/weston-drm-fourcc.h"
 #include "drm-internal.h"
@@ -1618,7 +1619,7 @@ init_kms_caps(struct drm_device *device)
 	weston_log("DRM: %s atomic modesetting\n",
 		   device->atomic_modeset ? "supports" : "does not support");

-	if (!getenv("WESTON_DISABLE_GBM_MODIFIERS")) {
+	if (getenv("WESTON_ALLOW_GBM_MODIFIERS")) {
 		ret = drmGetCap(device->drm.fd, DRM_CAP_ADDFB2_MODIFIERS, &cap);
 		if (ret == 0)
 			device->fb_modifiers = cap;
diff --git a/libweston/pixel-formats.c b/libweston/pixel-formats.c
index 10b3ed9..a7ae8c0 100644
--- a/libweston/pixel-formats.c
+++ b/libweston/pixel-formats.c
@@ -261,6 +261,7 @@ static const struct pixel_format_info pixel_format_table[] = {
 	{
 		DRM_FORMAT(XBGR8888),
 		BITS_RGBA_FIXED(8, 8, 8, 0),
+		.addfb_legacy_depth = 24,
 		.bpp = 32,
 		GL_FORMAT(GL_RGBA),
 		GL_TYPE(GL_UNSIGNED_BYTE),
--
2.20.1