diff --git a/.pick_status.json b/.pick_status.json
index d4a369bc6a0..a450d5dcea1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1844,7 +1844,7 @@
         "description": "dri: Fix hardware cursor for cards without modifier support",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "361f3622587e5bc452a62dbd671969b713273b79",
         "notes": null
diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c
index 54ce3cf78c5..d8ee9536479 100644
--- a/src/gallium/frontends/dri/dri2.c
+++ b/src/gallium/frontends/dri/dri2.c
@@ -1137,22 +1137,15 @@ dri_create_image(struct dri_screen *screen,
 
    if (!pscreen->resource_create_with_modifiers && count > 0) {
       bool invalid_ok = false;
-      bool linear_ok = false;
 
       for (unsigned i = 0; i < _count; i++) {
-         if (modifiers[i] == DRM_FORMAT_MOD_LINEAR)
-            linear_ok = true;
-         else if (modifiers[i] == DRM_FORMAT_MOD_INVALID)
+         if (modifiers[i] == DRM_FORMAT_MOD_INVALID)
             invalid_ok = true;
       }
 
       if (invalid_ok) {
          count = 0;
          modifiers = NULL;
-      } else if (linear_ok) {
-         count = 0;
-         modifiers = NULL;
-         use |= __DRI_IMAGE_USE_LINEAR;
       } else {
          return NULL;
       }