releasing version 1.9.0.4.1.1-0linaro1debian/1.9.0.4.1.1-0linaro1

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>

7 files changed, 32 insertions, 56 deletions

diff --git a/debian/changelog b/debian/changelog
index 8dbe2e5..33b8f68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pvr-omap4 (1.9.0.4.1.1-0linaro1) precise; urgency=low
+
+  * New upstream release
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>  Wed, 18 Jul 2012 02:09:52 -0300
+
 pvr-omap4 (1.7.15.0.1.57-1linaro2) precise; urgency=low
 
   * Adding km-fix-failed-mmap-s-of-non-page-aligned-buffers.patch to the
diff --git a/debian/control b/debian/control
index 5723a95..c8aacf3 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Homepage: https://launchpad.net/~tiomap-dev/+archive/release
 Package: pvr-omap4
 Architecture: armhf
 Depends: dkms (>= 1.95), make, coreutils (>= 8.5),
-         grep (>= 2.6.3), dos2unix, linux-headers-omap4,
+         grep (>= 2.6.3), dos2unix,
          ${xviddriver:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: PowerVR SGX540 libraries for OMAP4, libs and drivers.
  PowerVR SGX540 Linux libraries for OMAP4.
diff --git a/debian/dkms.conf.in b/debian/dkms.conf.in
index f683333..e317534 100644
--- a/debian/dkms.conf.in
+++ b/debian/dkms.conf.in
@@ -6,4 +6,4 @@ BUILT_MODULE_NAME[0]="omapdrm_pvr"
 DEST_MODULE_LOCATION[0]="/updates"
 AUTOINSTALL="yes"
 PATCH[0]="adding-omap_drv-omap_drm-workaround.patch"
-PATCH[1]="0001-km-fix-failed-mmap-s-of-non-page-aligned-buffers.patch"
+PATCH[1]="0001-core-mk-fix.patch"
diff --git a/debian/dkms/patches/0001-core-mk-fix.patch b/debian/dkms/patches/0001-core-mk-fix.patch
new file mode 100644
index 0000000..fa94d6a
--- /dev/null
+++ b/debian/dkms/patches/0001-core-mk-fix.patch
@@ -0,0 +1,14 @@
+Index: a/eurasiacon/build/linux2/config/core.mk
+===================================================================
+--- a/eurasiacon/build/linux2/config/core.mk	2012-07-04 10:52:08.000000000 +0200
++++ b/eurasiacon/build/linux2/config/core.mk	2012-07-04 14:29:03.000000000 +0200
+@@ -471,9 +471,6 @@
+ # Build-type dependent options
+ #
+ $(eval $(call BothConfigMake,BUILD,$(BUILD)))
+-$(eval $(call KernelConfigC,DEBUG_LINUX_MMAP_AREAS,))
+-$(eval $(call KernelConfigC,DEBUG_LINUX_MEM_AREAS,))
+-$(eval $(call KernelConfigC,DEBUG_LINUX_MEMORY_ALLOCATIONS,))
+ $(eval $(call KernelConfigC,PVRSRV_DISABLE_UM_SYNCOBJ_MAPPINGS,1))
+ 
+ ifeq ($(BUILD),debug)
diff --git a/debian/dkms/patches/0001-km-fix-failed-mmap-s-of-non-page-aligned-buffers.patch b/debian/dkms/patches/0001-km-fix-failed-mmap-s-of-non-page-aligned-buffers.patch
deleted file mode 100644
index 8b5a076..0000000
--- a/debian/dkms/patches/0001-km-fix-failed-mmap-s-of-non-page-aligned-buffers.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From d13f1b816d82ba4dd1d4fd13efbfb78cdf6eac6f Mon Sep 17 00:00:00 2001
-From: Rob Clark <rob@ti.com>
-Date: Mon, 23 Apr 2012 16:38:37 -0500
-Subject: [PATCH] km: fix failed mmap's of non-page aligned buffers
-
-GEM would round up the buffer size to next page boundary, but if the
-backing memory is not page aligned to begin w/ the ui32RealByteSize
-could actually be rounded up to next+1 page boundary.  Causing an
-error to be returned from drm_gem_mmap() later when userspace attempts
-to mmap() the buffer.
----
- services4/srvkm/env/linux/mmap.c |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/services4/srvkm/env/linux/mmap.c b/services4/srvkm/env/linux/mmap.c
-index ca38e5d..5835594 100644
---- a/services4/srvkm/env/linux/mmap.c
-+++ b/services4/srvkm/env/linux/mmap.c
-@@ -420,6 +420,10 @@ PVRMMapOSMemHandleToMMapData(PVRSRV_PER_PROCESS_DATA *psPerProc,
- 
-     psLinuxMemArea = (LinuxMemArea *)hOSMemHandle;
- 
-+    DetermineUsersSizeAndByteOffset(psLinuxMemArea,
-+                                   pui32RealByteSize,
-+                                   pui32ByteOffset);
-+
- #if defined(SUPPORT_DRI_DRM_EXTERNAL)
-     /* if we are using DRM/GEM, then let GEM generate the buffer offset..
-      * this is done by creating a wrapper object.
-@@ -430,7 +434,7 @@ PVRMMapOSMemHandleToMMapData(PVRSRV_PER_PROCESS_DATA *psPerProc,
-         if (!buf)
-         {
-             buf = create_gem_wrapper(psEnvPerProc->dev,
--                    psLinuxMemArea, 0, psLinuxMemArea->ui32ByteSize);
-+                    psLinuxMemArea, 0, *pui32RealByteSize);
-             if (!buf)
-             {
-                 PVR_DPF((PVR_DBG_ERROR, "%s: Screw you guys, I'm going home..", __FUNCTION__));
-@@ -442,10 +446,6 @@ PVRMMapOSMemHandleToMMapData(PVRSRV_PER_PROCESS_DATA *psPerProc,
-     }
- #endif /* SUPPORT_DRI_DRM_EXTERNAL */
- 
--    DetermineUsersSizeAndByteOffset(psLinuxMemArea,
--                                   pui32RealByteSize,
--                                   pui32ByteOffset);
--
-     psOffsetStruct = FindOffsetStructByPID(psLinuxMemArea, psPerProc->ui32PID);
-     if (psOffsetStruct)
-     {
--- 
-1.7.4.1
-
diff --git a/debian/dkms/patches/adding-omap_drv-omap_drm-workaround.patch b/debian/dkms/patches/adding-omap_drv-omap_drm-workaround.patch
index 172df6d..5c22f3d 100644
--- a/debian/dkms/patches/adding-omap_drv-omap_drm-workaround.patch
+++ b/debian/dkms/patches/adding-omap_drv-omap_drm-workaround.patch
@@ -144,10 +144,10 @@ index 0000000..be61257
 +#endif /* __OMAP_DRM_H__ */
 diff --git a/services4/srvkm/include/linux/omap_drv.h b/services4/srvkm/include/linux/omap_drv.h
 new file mode 100644
-index 0000000..3918542
+index 0000000..799dd46
 --- /dev/null
 +++ b/services4/srvkm/include/linux/omap_drv.h
-@@ -0,0 +1,284 @@
+@@ -0,0 +1,291 @@
 +/*
 + * drivers/staging/omapdrm/omap_drv.h
 + *
@@ -312,6 +312,8 @@ index 0000000..3918542
 +int omap_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
 +		struct drm_mode_create_dumb *args);
 +int omap_gem_mmap(struct file *filp, struct vm_area_struct *vma);
++int omap_gem_mmap_obj(struct drm_gem_object *obj,
++		struct vm_area_struct *vma);
 +int omap_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
 +int omap_gem_op_start(struct drm_gem_object *obj, enum omap_gem_op op);
 +int omap_gem_op_finish(struct drm_gem_object *obj, enum omap_gem_op op);
@@ -319,6 +321,9 @@ index 0000000..3918542
 +int omap_gem_op_async(struct drm_gem_object *obj, enum omap_gem_op op,
 +		void (*fxn)(void *arg), void *arg);
 +int omap_gem_roll(struct drm_gem_object *obj, uint32_t roll);
++void omap_gem_cpu_sync(struct drm_gem_object *obj, int pgoff);
++void omap_gem_dma_sync(struct drm_gem_object *obj,
++		enum dma_data_direction dir);
 +int omap_gem_get_paddr(struct drm_gem_object *obj,
 +		dma_addr_t *paddr, bool remap);
 +int omap_gem_put_paddr(struct drm_gem_object *obj);
@@ -335,6 +340,8 @@ index 0000000..3918542
 +
 +struct dma_buf * omap_gem_prime_export(struct drm_device *dev,
 +		struct drm_gem_object *obj, int flags);
++struct drm_gem_object * omap_gem_prime_import(struct drm_device *dev,
++		struct dma_buf *buffer);
 +
 +static inline int align_pitch(int pitch, int width, int bpp)
 +{
diff --git a/debian/pvr-omap4.install.in b/debian/pvr-omap4.install.in
index 3ff1bea..3bb8a18 100644
--- a/debian/pvr-omap4.install.in
+++ b/debian/pvr-omap4.install.in
@@ -17,3 +17,4 @@ usr/lib/lib*.so*	#PKGLIBDIR#
 
 # Xorg Driver
 usr/lib/xorg		#PKGLIBDIR#
+usr/share/X11/xorg.conf.d