drm/buddy: Fix the warn on's during force merge

Move the fallback and block incompatible checks
above, so that we dont unnecessarily split the blocks
and leaving the unmerged. This resolves the unnecessary
warn on's thrown during force_merge call.

v2:(Matthew)
  - Move the fallback and block incompatible checks above
    the contains check.

Signed-off-by: Arunpravin Paneer Selvam <[email protected]>
Reviewed-by: Matthew Auld <[email protected]>
Fixes: 96950929eb23 ("drm/buddy: Implement tracking clear page feature")
Link: https://patchwork.kernel.org/project/dri-devel/patch/[email protected]/
Signed-off-by: Dave Airlie <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/drm_buddy.c b/drivers/gpu/drm/drm_buddy.c
index 1daf778cf6fabda7ac176ae5ca1ffca52d8498b4..94f8c34fc2932867c70f7816631ccd99fbac4691 100644 (file)
--- a/drivers/gpu/drm/drm_buddy.c
+++ b/drivers/gpu/drm/drm_buddy.c
@@ -524,11 +524,11 @@ __alloc_range_bias(struct drm_buddy *mm,
                                continue;
                }
 
+               if (!fallback && block_incompatible(block, flags))
+                       continue;
+
                if (contains(start, end, block_start, block_end) &&
                    order == drm_buddy_block_order(block)) {
-                       if (!fallback && block_incompatible(block, flags))
-                               continue;
-
                        /*
                         * Find the free block within the range.
                         */