From f80d663e095f73db58b9baf568c87bb903af3fe5 Mon Sep 17 00:00:00 2001
From: Takanari Hayama <taki@igel.co.jp>
Date: Tue, 5 Aug 2014 13:32:15 +0900
Subject: [PATCH] multi-planer support.

Add wl_kms_create_mp_buffer() to support a multiplaner buffer such
as NV12/NV16.

The API will be supported in protocol version 2 and above.

Change-Id: Ib0022a6c88dc43f7d3503b2e9a7fd58faf1a6cac
Signed-off-by: Tony SIM <chinyeow.sim.xt@renesas.com>
---
 wayland-kms.c   | 46 +++++++++++++++++++++++++++++++++++++---------
 wayland-kms.h   | 11 +++++++++++
 wayland-kms.xml | 17 ++++++++++++++++-
 3 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/wayland-kms.c b/wayland-kms.c
index c6d37ff..29ada01 100644
--- a/wayland-kms.c
+++ b/wayland-kms.c
@@ -123,18 +123,33 @@ kms_authenticate(struct wl_client *client, struct wl_resource *resource,
 }
 
 static void
-kms_create_buffer(struct wl_client *client, struct wl_resource *resource,
-		  uint32_t id, int32_t prime_fd, int32_t width, int32_t height,
-		  uint32_t stride, uint32_t format, uint32_t handle)
+kms_create_mp_buffer(struct wl_client *client, struct wl_resource *resource,
+		     uint32_t id, int32_t width, int32_t height, uint32_t format,
+		     int32_t fd0, uint32_t stride0, int32_t fd1, uint32_t stride1,
+		     int32_t fd2, uint32_t stride2)
 {
 	struct wl_kms *kms = resource->data;
 	struct wl_kms_buffer *buffer;
-	int err;
+	int err, nplanes;
 
 	switch (format) {
 	case WL_KMS_FORMAT_ARGB8888:
 	case WL_KMS_FORMAT_XRGB8888:
+	case WL_KMS_FORMAT_ABGR8888:
+	case WL_KMS_FORMAT_XBGR8888:
+	case WL_KMS_FORMAT_YUYV:
+	case WL_KMS_FORMAT_RGB565:
+	case WL_KMS_FORMAT_BGR565:
+		nplanes = 1;
 		break;
+
+	case WL_KMS_FORMAT_NV12:
+	case WL_KMS_FORMAT_NV21:
+	case WL_KMS_FORMAT_NV16:
+	case WL_KMS_FORMAT_NV61:
+		nplanes = 2;
+		break;
+
 	default:
 		wl_resource_post_error(resource,
 				       WL_KMS_ERROR_INVALID_FORMAT,
@@ -152,12 +167,14 @@ kms_create_buffer(struct wl_client *client, struct wl_resource *resource,
 	buffer->width = width;
 	buffer->height = height;
 	buffer->format = format;
-	buffer->stride = stride;
-	buffer->fd = prime_fd;
+	buffer->num_planes = nplanes;
+	buffer->stride = buffer->planes[0].stride = stride0;
+	buffer->fd = buffer->planes[0].fd = fd0;
 
-	WLKMS_DEBUG("%s: %s: prime_fd=%d\n", __FILE__, __func__, prime_fd);
+	WLKMS_DEBUG("%s: %s: %d planes (%d, %d, %d)\n", __FILE__, __func__, nplanes, fd0, fd1, fd2);
 
-	if ((err = drmPrimeFDToHandle(kms->fd, prime_fd, &buffer->handle))) {
+	// XXX: Do we need to support multiplaner KMS BO?
+	if ((err = drmPrimeFDToHandle(kms->fd, fd0, &buffer->handle))) {
 		WLKMS_DEBUG("%s: %s: drmPrimeFDToHandle() failed...%d (%s)\n", __FILE__, __func__, err, strerror(errno));
 		wl_resource_post_error(resource,
 				       WL_KMS_ERROR_INVALID_FD,
@@ -178,9 +195,20 @@ kms_create_buffer(struct wl_client *client, struct wl_resource *resource,
 				       buffer, destroy_buffer);
 }
 
+
+static void
+kms_create_buffer(struct wl_client *client, struct wl_resource *resource,
+		  uint32_t id, int32_t prime_fd, int32_t width, int32_t height,
+		  uint32_t stride, uint32_t format, uint32_t handle)
+{
+	kms_create_mp_buffer(client, resource, id, width, height, format, prime_fd, stride,
+			     0, 0, 0, 0);
+}
+
 const static struct wl_kms_interface kms_interface = {
 	.authenticate = kms_authenticate,
 	.create_buffer = kms_create_buffer,
+	.create_mp_buffer = kms_create_mp_buffer,
 };
 
 static void
@@ -232,7 +260,7 @@ struct wl_kms *wayland_kms_init(struct wl_display *display,
 	kms->device_name = strdup(device_name);
 	kms->fd = fd;
 
-	wl_global_create(display, &wl_kms_interface, 1, kms, bind_kms);
+	wl_global_create(display, &wl_kms_interface, 2, kms, bind_kms);
 
 	/*
 	 * we're the server in the middle. we should forward the auth
diff --git a/wayland-kms.h b/wayland-kms.h
index 2d0c4b7..9312ba8 100644
--- a/wayland-kms.h
+++ b/wayland-kms.h
@@ -34,6 +34,13 @@
 
 struct wl_kms;
 
+#define MAX_PLANES 3
+
+struct wl_kms_planes {
+	int fd;
+	uint32_t stride;
+};
+
 struct wl_kms_buffer {
 	struct wl_resource *resource;
 	struct wl_kms *kms;
@@ -42,6 +49,10 @@ struct wl_kms_buffer {
 	uint32_t handle;
 	int fd;
 	void *private;
+
+	// for multi-planer formats
+	int num_planes;
+	struct wl_kms_planes planes[MAX_PLANES];
 };
 
 int wayland_kms_fd_get(struct wl_kms *kms);
diff --git a/wayland-kms.xml b/wayland-kms.xml
index e6f8610..3027bf1 100644
--- a/wayland-kms.xml
+++ b/wayland-kms.xml
@@ -32,7 +32,7 @@
 
   <!-- KMS BO support. This object is created by the server and published
        using the display's global event. -->
-  <interface name="wl_kms" version="1">
+  <interface name="wl_kms" version="2">
     <enum name="error">
       <entry name="invalid_format" value="0"/>
       <entry name="invalid_fd" value="1"/>
@@ -122,6 +122,21 @@
       <arg name="handle" type="uint"/>	<!-- XXX: Unused -->
     </request>
 
+    <!-- Create a wayland buffer for the KMS BO buffer. The KMS
+         surface must have a prime FD. This is for a multi-planer. -->
+    <request name="create_mp_buffer" since="2">
+      <arg name="id" type="new_id" interface="wl_buffer"/>
+      <arg name="width" type="int" summary="Width"/>
+      <arg name="height" type="int" summary="Height"/>
+      <arg name="format" type="uint" summary="Pixelformat"/>
+      <arg name="fd0" type="fd" summary="DMABUF/PRIME FD for plane0"/>
+      <arg name="stride0" type="uint" summary="Stride for plane0"/>
+      <arg name="fd1" type="fd" summary="DMABUF/PRIME FD for plane1"/>
+      <arg name="stride1" type="uint" summary="Stride for plane1"/>
+      <arg name="fd2" type="fd" summary="DMABUF/PRIME FD for plane2"/>
+      <arg name="stride2" type="uint" summary="Stride for plane2"/>
+    </request>
+
     <!-- Notification of the path of the drm device which is used by
          the server.  The client should use this device for creating
          local buffers.  Only buffers created from this device should
-- 
2.7.4