diff --git a/src/gallium/drivers/crocus/crocus_resolve.c b/src/gallium/drivers/crocus/crocus_resolve.c
index 3629785cd3a..b32b8796707 100644
--- a/src/gallium/drivers/crocus/crocus_resolve.c
+++ b/src/gallium/drivers/crocus/crocus_resolve.c
@@ -760,8 +760,8 @@ miptree_level_range_length(const struct crocus_resource *res,
 {
    assert(start_level < res->surf.levels);
 
-   if (num_levels == INTEL_REMAINING_LAYERS)
-      num_levels = res->surf.levels;
+   if (num_levels == INTEL_REMAINING_LEVELS)
+      num_levels = res->surf.levels - start_level;
 
    /* Check for overflow */
    assert(start_level + num_levels >= start_level);
diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c
index 3078ad4eb2c..3c228780fb4 100644
--- a/src/gallium/drivers/iris/iris_resolve.c
+++ b/src/gallium/drivers/iris/iris_resolve.c
@@ -751,8 +751,8 @@ miptree_level_range_length(const struct iris_resource *res,
 {
    assert(start_level < res->surf.levels);
 
-   if (num_levels == INTEL_REMAINING_LAYERS)
-      num_levels = res->surf.levels;
+   if (num_levels == INTEL_REMAINING_LEVELS)
+      num_levels = res->surf.levels - start_level;
 
    /* Check for overflow */
    assert(start_level + num_levels >= start_level);