drm: Branch 'master'

 tests/amdgpu/vm_tests.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 10e85a8b7f28e80f5184919b2448ade18c19ca21
Author: Emil Velikov <[email protected]>
Date:   Mon Jan 29 14:51:31 2018 +0000

    tests/amdgpu: add missing config.h include
    
    Otherwise we'll end up without the macros set during configure stage.
    And effectively error out in sanity tests such as the mmap static
    assert.
    
    To reproduce, do a multilib build - 32bit build on 64bit machine.
    
    Cc: Fabio Pedretti <[email protected]>
    Cc: Andrey Grodzovsky <[email protected]>
    Fixes: 33dcc29f7cc ("amdgpu: Add VMID reservation per GPU context test.")
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104819
    Signed-off-by: Emil Velikov <[email protected]>
    Reviewed-by: Eric Engestrom <[email protected]>

diff --git a/tests/amdgpu/vm_tests.c b/tests/amdgpu/vm_tests.c
index 7b6dc5d6..502a9405 100644
--- a/tests/amdgpu/vm_tests.c
+++ b/tests/amdgpu/vm_tests.c
@@ -21,6 +21,10 @@
  *
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "CUnit/Basic.h"
 
 #include "amdgpu_test.h"

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