From 9e370ade3377727d2c447f5301154ff5cb7e170f Mon Sep 17 00:00:00 2001
From: "Sergey Semyonov (Serge)" <ion2@mail.ru>
Date: Mon, 25 Aug 2014 20:52:50 +0000
Subject: [PATCH] sna: fixed invalid structure type.

git-svn-id: svn://kolibrios.org@5059 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 contrib/sdk/sources/Intel-2D/sna/kgem.c |  5 +++--
 contrib/sdk/sources/Intel-2D/sna/sna.c  |  2 +-
 contrib/sdk/sources/Intel-2D/uxa.ver    | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 contrib/sdk/sources/Intel-2D/uxa.ver

diff --git a/contrib/sdk/sources/Intel-2D/sna/kgem.c b/contrib/sdk/sources/Intel-2D/sna/kgem.c
index 1fa9bcbfe8..1bde09ca33 100644
--- a/contrib/sdk/sources/Intel-2D/sna/kgem.c
+++ b/contrib/sdk/sources/Intel-2D/sna/kgem.c
@@ -5667,9 +5667,10 @@ int kgem_init_fb(struct kgem *kgem, struct sna_fb *fb)
 	if (ret != 0) {
 		printf("Couldn't reference %s handle 0x%08x\n",
 		    fb->name, fb->name);
-		return NULL;
+        return 0;
 	}
-	size = open_arg.size / PAGE_SIZE;
+
+    size = fb->pitch * fb->height / PAGE_SIZE;
 
   	bo = __kgem_bo_alloc(open_arg.handle, size);
 	if (!bo) {
diff --git a/contrib/sdk/sources/Intel-2D/sna/sna.c b/contrib/sdk/sources/Intel-2D/sna/sna.c
index ca2c912132..a748e76ba8 100644
--- a/contrib/sdk/sources/Intel-2D/sna/sna.c
+++ b/contrib/sdk/sources/Intel-2D/sna/sna.c
@@ -1084,7 +1084,7 @@ int sna_blit_tex(bitmap_t *bitmap, int scale, int vsync,
 {
     surface_t *sf = to_surface(bitmap);
 
-    struct drm_i915_mask_update update;
+    struct drm_i915_mask update;
 
     struct sna_composite_op composite;
     struct _Pixmap src, dst, mask;
diff --git a/contrib/sdk/sources/Intel-2D/uxa.ver b/contrib/sdk/sources/Intel-2D/uxa.ver
new file mode 100644
index 0000000000..d5d43d69a8
--- /dev/null
+++ b/contrib/sdk/sources/Intel-2D/uxa.ver
@@ -0,0 +1,15 @@
+LIBDRM {
+    global: DllStartup;
+            DrvInit;
+	    uxa_bitmap_from_handle;
+    	    uxa_blit_tex;
+    	    sna_create_mask;
+    	    uxa_set_bo_handle;
+
+    local:  __chkstk;
+    	    __chkstk_ms;
+    	    _alloca;
+            __uxa_lock;
+            _nm__tls_alloc;
+            *;
+};