[PATCH 22/40] drm/i915: Build DRM range manager selftests for CI

[Chris Wilson]

Build the struct drm_mm selftests so that we can trivially run them
within our CI.

"Enable debug, become developer." - Joonas Lahtinen

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
---
 drivers/gpu/drm/i915/Kconfig.debug      | 1 +
 drivers/gpu/drm/selftests/test-drm_mm.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/Kconfig.debug b/drivers/gpu/drm/i915/Kconfig.debug
index 597648c7a645..598551dbf62c 100644
--- a/drivers/gpu/drm/i915/Kconfig.debug
+++ b/drivers/gpu/drm/i915/Kconfig.debug
@@ -24,6 +24,7 @@ config DRM_I915_DEBUG
         select X86_MSR # used by igt/pm_rpm
         select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks)
         select DRM_DEBUG_MM if DRM=y
+	select DRM_DEBUG_MM_SELFTEST
 	select DRM_I915_SW_FENCE_DEBUG_OBJECTS
         default n
         help
diff --git a/drivers/gpu/drm/selftests/test-drm_mm.c b/drivers/gpu/drm/selftests/test-drm_mm.c
index b5a00ea57d09..b255b847d0f8 100644
--- a/drivers/gpu/drm/selftests/test-drm_mm.c
+++ b/drivers/gpu/drm/selftests/test-drm_mm.c
@@ -1932,7 +1932,7 @@ static int igt_color_evict(void *ignored)
 
 	ret = -EINVAL;
 	drm_mm_init(&mm, 0, 2*total_size - 1);
-	mm.color_adjust = no_color_touching;
+	mm.color_adjust = separate_adjacent_colors;
 	for (n = 0; n < total_size; n++) {
 		err = drm_mm_insert_node_generic(&mm, &nodes[n].node,
 						 1, 0, color++,
@@ -2034,7 +2034,7 @@ static int igt_color_evict_range(void *ignored)
 
 	ret = -EINVAL;
 	drm_mm_init(&mm, 0, 2*total_size - 1);
-	mm.color_adjust = no_color_touching;
+	mm.color_adjust = separate_adjacent_colors;
 	for (n = 0; n < total_size; n++) {
 		err = drm_mm_insert_node_generic(&mm, &nodes[n].node,
 						 1, 0, color++,
-- 
2.11.0