drm: Branch 'master' - 3 commits

 amdgpu/Android.mk |    6 ++++++
 data/Android.mk   |    9 +++++++++
 tests/drmsl.c     |   28 ++++++++++++++++++++--------
 3 files changed, 35 insertions(+), 8 deletions(-)

New commits:
commit a0531e76f68e5f69cdc149d7cbff4ba299352dfe
Author: Chih-Wei Huang <[email protected]>
Date:   Thu Jul 27 16:20:52 2017 +0800

    android: amdgpu: fix build break
    
    Define two macros to avoid building errors.
    
    Fixes: 7e6bf88cac (amdgpu: move asic id table to a separate file)
    
    Signed-off-by: Chih-Wei Huang <[email protected]>

diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk
index bf0611ba..88d37651 100644
--- a/amdgpu/Android.mk
+++ b/amdgpu/Android.mk
@@ -10,5 +10,11 @@ LOCAL_SHARED_LIBRARIES := libdrm
 
 LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES)
 
+LOCAL_CFLAGS := \
+	-DAMDGPU_ASIC_ID_TABLE=\"/system/etc/hwdata/amdgpu.ids\" \
+	-DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' $(LIBDRM_TOP)/data/amdgpu.ids)
+
+LOCAL_REQUIRED_MODULES := amdgpu.ids
+
 include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)
commit e5ce5c6807a85187dd9cede54e9144f3bcc3ee47
Author: Chih-Wei Huang <[email protected]>
Date:   Thu Jul 27 16:20:51 2017 +0800

    android: add rules to build amdgpu.ids
    
    Signed-off-by: Chih-Wei Huang <[email protected]>

diff --git a/data/Android.mk b/data/Android.mk
new file mode 100644
index 00000000..3c1fd7c6
--- /dev/null
+++ b/data/Android.mk
@@ -0,0 +1,9 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := amdgpu.ids
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/hwdata
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
commit 20138ea997e4e2eadd43846c114a7891688d653d
Author: Jan Vesely <[email protected]>
Date:   Fri Jul 28 10:23:22 2017 -0400

    drmsltest: Check expected neighbours
    
    Fixes: 7d8c9464081634f053e16e5eac9655a12fae1dc4
    Signed-off-by: Jan Vesely <[email protected]>
    Reviewed-by: Emil Velikov <[email protected]>

diff --git a/tests/drmsl.c b/tests/drmsl.c
index d0ac0efa..d1b59a86 100644
--- a/tests/drmsl.c
+++ b/tests/drmsl.c
@@ -106,7 +106,9 @@ static double do_time(int size, int iter)
     return usec;
 }
 
-static void print_neighbors(void *list, unsigned long key)
+static void print_neighbors(void *list, unsigned long key,
+                            unsigned long expected_prev,
+                            unsigned long expected_next)
 {
     unsigned long prev_key = 0;
     unsigned long next_key = 0;
@@ -119,6 +121,16 @@ static void print_neighbors(void *list, unsigned long key)
 				  &next_key, &next_value);
     printf("Neighbors of %5lu: %d %5lu %5lu\n",
 	   key, retval, prev_key, next_key);
+    if (prev_key != expected_prev) {
+        fprintf(stderr, "Unexpected neighbor: %5lu. Expected: %5lu\n",
+                prev_key, expected_prev);
+	exit(1);
+    }
+    if (next_key != expected_next) {
+        fprintf(stderr, "Unexpected neighbor: %5lu. Expected: %5lu\n",
+                next_key, expected_next);
+	exit(1);
+    }
 }
 
 int main(void)
@@ -138,13 +150,13 @@ int main(void)
     print(list);
     printf("\n==============================\n\n");
 
-    print_neighbors(list, 0);
-    print_neighbors(list, 50);
-    print_neighbors(list, 51);
-    print_neighbors(list, 123);
-    print_neighbors(list, 200);
-    print_neighbors(list, 213);
-    print_neighbors(list, 256);
+    print_neighbors(list, 0, 0, 50);
+    print_neighbors(list, 50, 0, 50);
+    print_neighbors(list, 51, 50, 123);
+    print_neighbors(list, 123, 50, 123);
+    print_neighbors(list, 200, 123, 213);
+    print_neighbors(list, 213, 123, 213);
+    print_neighbors(list, 256, 213, 256);
     printf("\n==============================\n\n");
 
     drmSLDelete(list, 50);

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--