From 95434e4af5b6ec4fea398346455e7b67bbe66a2d Mon Sep 17 00:00:00 2001
From: "Sergey Semyonov (Serge)" <ion2@mail.ru>
Date: Tue, 17 Dec 2013 06:10:28 +0000
Subject: [PATCH] ddk:update to 3.12.5

git-svn-id: svn://kolibrios.org@4370 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 drivers/include/ddk.h                     |  2 +-
 drivers/include/linux/mm.h                |  2 ++
 drivers/include/linux/uapi/drm/i915_drm.h | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/drivers/include/ddk.h b/drivers/include/ddk.h
index 59733f2cd8..c152fc94d6 100644
--- a/drivers/include/ddk.h
+++ b/drivers/include/ddk.h
@@ -14,7 +14,7 @@
 
 #define PG_SW               0x003
 #define PG_UW               0x007
-#define PG_NOCACHE          0x010
+#define PG_NOCACHE          0x018
 #define PG_SHARED           0x200
 
 
diff --git a/drivers/include/linux/mm.h b/drivers/include/linux/mm.h
index 62864e2a1b..34aafa7703 100644
--- a/drivers/include/linux/mm.h
+++ b/drivers/include/linux/mm.h
@@ -12,4 +12,6 @@
 /* to align the pointer to the (next) page boundary */
 #define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)
 
+#define offset_in_page(p)       ((unsigned long)(p) & ~PAGE_MASK)
+
 #endif
diff --git a/drivers/include/linux/uapi/drm/i915_drm.h b/drivers/include/linux/uapi/drm/i915_drm.h
index 55bb5729bd..45887236e7 100644
--- a/drivers/include/linux/uapi/drm/i915_drm.h
+++ b/drivers/include/linux/uapi/drm/i915_drm.h
@@ -1030,4 +1030,22 @@ struct drm_i915_reg_read {
 	__u64 offset;
 	__u64 val; /* Return value */
 };
+
+struct drm_i915_mask {
+    __u32 handle;
+    __u32 width;
+    __u32 height;
+    __u32 bo_size;
+    __u32 bo_pitch;
+    __u32 bo_map;
+};
+
+struct drm_i915_fb_info {
+        __u32 name;
+        __u32 width;
+        __u32 height;
+        __u32 pitch;
+        __u32 tiling;
+};
+
 #endif /* _UAPI_I915_DRM_H_ */