drm: Branch 'master'

 tests/amdgpu/basic_tests.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 028760201554b22e0e9faafa81e0dc80b28db777
Author: [email protected] <[email protected]>
Date:   Thu Aug 8 08:47:07 2019 +0000

    tests/amdgpu/basic_tests.c: change BUFFER_SIZE used in Userptr Test adjust to PAGE_SIZE
    
    Userptr Test will fail on PAGE_SIZE bigger than BUFFER_SIZE(8 * 1024)
    
    Signed-off-by: xinxu <[email protected]>
    
    
    (cherry picked from commit fb7dfdc5fb58795365b70117c3eb625f2edb8f06)

diff --git a/tests/amdgpu/basic_tests.c b/tests/amdgpu/basic_tests.c
index ab2a6728..0f4aa5db 100644
--- a/tests/amdgpu/basic_tests.c
+++ b/tests/amdgpu/basic_tests.c
@@ -86,7 +86,7 @@ CU_TestInfo basic_tests[] = {
 	{ "GPU reset Test", amdgpu_gpu_reset_test },
 	CU_TEST_INFO_NULL,
 };
-#define BUFFER_SIZE (8 * 1024)
+#define BUFFER_SIZE (MAX2(8 * 1024, getpagesize()))
 #define SDMA_PKT_HEADER_op_offset 0
 #define SDMA_PKT_HEADER_op_mask   0x000000FF
 #define SDMA_PKT_HEADER_op_shift  0


--