Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / ttm / tests / ttm_pool_test.c

diff --git a/drivers/gpu/drm/ttm/tests/ttm_pool_test.c b/drivers/gpu/drm/ttm/tests/ttm_pool_test.c
index b97f7b6daf5bd63367fe6b2efacc57f4e95079aa..0a3fede84da92e46e7dca23e6404b45c361659ab 100644 (file)
--- a/drivers/gpu/drm/ttm/tests/ttm_pool_test.c
+++ b/drivers/gpu/drm/ttm/tests/ttm_pool_test.c
@@ -108,7 +108,7 @@ static const struct ttm_pool_test_case ttm_pool_basic_cases[] = {
        },
        {
                .description = "Above the allocation limit",
-               .order = MAX_ORDER + 1,
+               .order = MAX_PAGE_ORDER + 1,
        },
        {
                .description = "One page, with coherent DMA mappings enabled",
@@ -117,7 +117,7 @@ static const struct ttm_pool_test_case ttm_pool_basic_cases[] = {
        },
        {
                .description = "Above the allocation limit, with coherent DMA mappings enabled",
-               .order = MAX_ORDER + 1,
+               .order = MAX_PAGE_ORDER + 1,
                .use_dma_alloc = true,
        },
 };
@@ -164,7 +164,7 @@ static void ttm_pool_alloc_basic(struct kunit *test)
        fst_page = tt->pages[0];
        last_page = tt->pages[tt->num_pages - 1];
 
-       if (params->order <= MAX_ORDER) {
+       if (params->order <= MAX_PAGE_ORDER) {
                if (params->use_dma_alloc) {
                        KUNIT_ASSERT_NOT_NULL(test, (void *)fst_page->private);
                        KUNIT_ASSERT_NOT_NULL(test, (void *)last_page->private);
@@ -181,7 +181,7 @@ static void ttm_pool_alloc_basic(struct kunit *test)
                         * order 0 blocks
                         */
                        KUNIT_ASSERT_EQ(test, fst_page->private,
-                                       min_t(unsigned int, MAX_ORDER,
+                                       min_t(unsigned int, MAX_PAGE_ORDER,
                                              params->order));
                        KUNIT_ASSERT_EQ(test, last_page->private, 0);
                }