Merge branch 'r300' into hhienvsa_r300

2 files changed, 23 insertions, 0 deletions

diff --git a/src/gallium/state_trackers/egl/android/native_android.cpp b/src/gallium/state_trackers/egl/android/native_android.cpp
index a584d54db4..7687ec86a6 100644
--- a/src/gallium/state_trackers/egl/android/native_android.cpp
+++ b/src/gallium/state_trackers/egl/android/native_android.cpp
@@ -413,7 +413,11 @@ android_display_create_window_surface(struct native_display *ndpy,
 
    asurf = CALLOC_STRUCT(android_surface);
    if (!asurf)
+   {
+      LOGE("Can't allocate android surface structure... X_x ");
       return NULL;
+   }
+   LOGI("Android surface struct allocated :)");
 
    asurf->adpy = adpy;
    asurf->win = win;
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index fa20d7eb98..a388e379b9 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -63,6 +63,25 @@ static void* android_mmap2(void *addr, size_t size, int prot, int flags, int fd,
 #define RADEON_BO_FLAGS_MICRO_TILE  2
 #define RADEON_BO_FLAGS_MICRO_TILE_SQUARE 0x20
 
+#ifdef ANDROID
+
+extern void*  __mmap2(void*, size_t, int, int, int, size_t);
+
+#define  MMAP2_SHIFT  12
+static void* android_mmap2(void *addr, size_t size, int prot, int flags, int fd, unsigned long long offset)
+{
+   if ( offset & ((1UL << MMAP2_SHIFT)-1) ) {
+      errno = EINVAL;
+      return MAP_FAILED;
+   }
+
+   return __mmap2(addr, size, prot, flags, fd, (size_t)(offset >> MMAP2_SHIFT));
+}
+
+#define mmap(addr, size, prot, flags, fd, offset) android_mmap2(addr, size, prot, flags, fd, offset)
+
+#endif /* ANDROID */
+
 extern const struct pb_vtbl radeon_bo_vtbl;