diff --git a/.pick_status.json b/.pick_status.json
index 9bd751a29b4..5aa160ffa77 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4144,7 +4144,7 @@
         "description": "intel/common: Retry GEM_CONTEXT_CREATE when PXP have not finished initialization",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/intel/common/i915/intel_gem.c b/src/intel/common/i915/intel_gem.c
index 037d7d8dd66..75c3cd5c6e4 100644
--- a/src/intel/common/i915/intel_gem.c
+++ b/src/intel/common/i915/intel_gem.c
@@ -176,7 +176,17 @@ i915_gem_create_context_engines(int fd,
                              &low_latency_param.base);
    }
 
-   if (intel_ioctl(fd, DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT, &create) == -1)
+   int ret;
+   bool retry;
+   do {
+      ret = intel_ioctl(fd, DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT, &create);
+      retry = ret == -1 && errno == EIO &&
+              (flags & INTEL_GEM_CREATE_CONTEXT_EXT_PROTECTED_FLAG);
+      if (retry)
+         usleep(1000);
+   } while (retry);
+
+   if (ret)
       return false;
 
    *context_id = create.ctx_id;