egl/wayland-drm: Only announce formats via wl_drm which the driver supports.

Check if a pixel format is supported by the Wayland servers gpu driver
before exposing it to the client via wl_drm, so we avoid reporting formats
to the client which the server gpu can't handle.

Restrict this reporting to the new color depth 30 formats for now, as the
ARGB/XRGB8888 and RGB565 formats are probably supported by every gpu under
the sun.

Atm. this is mostly useful to allow proper PRIME renderoffload for depth
30 formats on the typical Intel iGPU + NVidia dGPU "NVidia Optimus" laptop
combo.

Tested on Intel, AMD, NVidia with single-gpu setup and on a Intel + NVidia
Optimus setup.

Signed-off-by: Mario Kleiner <[email protected]>
Reviewed-by: Adam Jackson <[email protected]>
Reviewed-by: Daniel Stone <[email protected]>

2 files changed, 29 insertions, 4 deletions

diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c b/src/egl/wayland/wayland-drm/wayland-drm.c
index 3c6696dbffb..51cdd2cb845 100644
--- a/src/egl/wayland/wayland-drm/wayland-drm.c
+++ b/src/egl/wayland/wayland-drm/wayland-drm.c
@@ -111,6 +111,8 @@ drm_create_buffer(struct wl_client *client, struct wl_resource *resource,
 		  uint32_t stride, uint32_t format)
 {
         switch (format) {
+        case WL_DRM_FORMAT_ABGR2101010:
+        case WL_DRM_FORMAT_XBGR2101010:
         case WL_DRM_FORMAT_ARGB2101010:
         case WL_DRM_FORMAT_XRGB2101010:
         case WL_DRM_FORMAT_ARGB8888:
@@ -210,10 +212,31 @@ bind_drm(struct wl_client *client, void *data, uint32_t version, uint32_t id)
 	wl_resource_set_implementation(resource, &drm_interface, data, NULL);
 
 	wl_resource_post_event(resource, WL_DRM_DEVICE, drm->device_name);
-	wl_resource_post_event(resource, WL_DRM_FORMAT,
-			       WL_DRM_FORMAT_ARGB2101010);
-	wl_resource_post_event(resource, WL_DRM_FORMAT,
-			       WL_DRM_FORMAT_XRGB2101010);
+
+	if (drm->callbacks.is_format_supported(drm->user_data,
+					       WL_DRM_FORMAT_ARGB2101010)) {
+		wl_resource_post_event(resource, WL_DRM_FORMAT,
+				       WL_DRM_FORMAT_ARGB2101010);
+	}
+
+	if (drm->callbacks.is_format_supported(drm->user_data,
+					       WL_DRM_FORMAT_XRGB2101010)) {
+		wl_resource_post_event(resource, WL_DRM_FORMAT,
+				       WL_DRM_FORMAT_XRGB2101010);
+	}
+
+	if (drm->callbacks.is_format_supported(drm->user_data,
+					       WL_DRM_FORMAT_ABGR2101010)) {
+		wl_resource_post_event(resource, WL_DRM_FORMAT,
+				       WL_DRM_FORMAT_ABGR2101010);
+	}
+
+	if (drm->callbacks.is_format_supported(drm->user_data,
+					       WL_DRM_FORMAT_XBGR2101010)) {
+		wl_resource_post_event(resource, WL_DRM_FORMAT,
+				       WL_DRM_FORMAT_XBGR2101010);
+	}
+
 	wl_resource_post_event(resource, WL_DRM_FORMAT,
 			       WL_DRM_FORMAT_ARGB8888);
 	wl_resource_post_event(resource, WL_DRM_FORMAT,
diff --git a/src/egl/wayland/wayland-drm/wayland-drm.h b/src/egl/wayland/wayland-drm/wayland-drm.h
index 36e5bf042a7..8b7fd3b0b64 100644
--- a/src/egl/wayland/wayland-drm/wayland-drm.h
+++ b/src/egl/wayland/wayland-drm/wayland-drm.h
@@ -14,6 +14,8 @@ struct wayland_drm_callbacks {
                                  struct wl_drm_buffer *buffer);
 
 	void (*release_buffer)(void *user_data, struct wl_drm_buffer *buffer);
+
+	bool (*is_format_supported)(void *user_data, uint32_t format);
 };