diff --git a/.pick_status.json b/.pick_status.json
index e67dbe76dae..371590336ef 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2092,7 +2092,7 @@
         "description": "ac/llvm: fix unaligned VS input loads on gfx10.3",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "a23802bcb9a42a02d34a5a36d6e66d6532813a0d"
     },
diff --git a/src/amd/llvm/ac_llvm_build.c b/src/amd/llvm/ac_llvm_build.c
index 8be8433c997..ce995cc0249 100644
--- a/src/amd/llvm/ac_llvm_build.c
+++ b/src/amd/llvm/ac_llvm_build.c
@@ -1656,7 +1656,7 @@ ac_build_opencoded_load_format(struct ac_llvm_context *ctx,
 	}
 
 	int log_recombine = 0;
-	if ((ctx->chip_class == GFX6 || ctx->chip_class == GFX10) && !known_aligned) {
+	if ((ctx->chip_class == GFX6 || ctx->chip_class >= GFX10) && !known_aligned) {
 		/* Avoid alignment restrictions by loading one byte at a time. */
 		load_num_channels <<= load_log_size;
 		log_recombine = load_log_size;