diff --git a/src/gpu/GrContextThreadSafeProxy.cpp b/src/gpu/GrContextThreadSafeProxy.cpp
index 2e0758a..8da3afe 100644
--- a/src/gpu/GrContextThreadSafeProxy.cpp
+++ b/src/gpu/GrContextThreadSafeProxy.cpp
@@ -47,12 +47,7 @@
         isMipMapped = false;
     }
 
-    GrPixelConfig config = this->caps()->getConfigFromBackendFormat(backendFormat, ii.colorType());
-    if (config == kUnknown_GrPixelConfig) {
-        return SkSurfaceCharacterization(); // return an invalid characterization
-    }
-
-    if (!SkSurface_Gpu::Valid(this->caps(), config, ii.colorSpace())) {
+    if (!SkSurface_Gpu::Valid(this->caps(), backendFormat)) {
         return SkSurfaceCharacterization(); // return an invalid characterization
     }
 
@@ -70,6 +65,11 @@
         return SkSurfaceCharacterization(); // return an invalid characterization
     }
 
+    GrPixelConfig config = this->caps()->getConfigFromBackendFormat(backendFormat, ii.colorType());
+    if (kUnknown_GrPixelConfig == config) {
+        return SkSurfaceCharacterization(); // return an invalid characterization
+    }
+
     return SkSurfaceCharacterization(sk_ref_sp<GrContextThreadSafeProxy>(this),
                                      cacheMaxResourceBytes, ii,
                                      origin, config, sampleCnt,