diff --git a/.pick_status.json b/.pick_status.json
index f0b80aceb52..e36144e6e71 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -684,7 +684,7 @@
         "description": "nvk: Adjust maxFragmentCombinedOutputResources to match max descriptors limit",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c
index 2e63e169611..2a1f7a12fe4 100644
--- a/src/nouveau/vulkan/nvk_physical_device.c
+++ b/src/nouveau/vulkan/nvk_physical_device.c
@@ -835,7 +835,7 @@ nvk_get_device_properties(const struct nvk_instance *instance,
       .maxFragmentInputComponents = 128,
       .maxFragmentOutputAttachments = NVK_MAX_RTS,
       .maxFragmentDualSrcAttachments = 1,
-      .maxFragmentCombinedOutputResources = 16,
+      .maxFragmentCombinedOutputResources = NVK_MAX_RTS + NVK_MAX_DESCRIPTORS,
       /* Nvidia limits this to 48kB for consistency reasons, we could lift the
        * limit if we wanted to.
        */