diff --git a/.pick_status.json b/.pick_status.json
index 31924803ca0..a1d5129f8ed 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2200,7 +2200,7 @@
         "description": "amd/common: Fix various non-critical integer overflows",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/common/ac_shader_util.c b/src/amd/common/ac_shader_util.c
index eabde97348e..d4ccf38d803 100644
--- a/src/amd/common/ac_shader_util.c
+++ b/src/amd/common/ac_shader_util.c
@@ -64,7 +64,7 @@ ac_get_cb_shader_mask(unsigned spi_shader_col_format)
 			cb_shader_mask |= 0x3 << (i * 4);
 			break;
 		case V_028714_SPI_SHADER_32_AR:
-			cb_shader_mask |= 0x9 << (i * 4);
+			cb_shader_mask |= 0x9u << (i * 4);
 			break;
 		case V_028714_SPI_SHADER_FP16_ABGR:
 		case V_028714_SPI_SHADER_UNORM16_ABGR:
@@ -72,7 +72,7 @@ ac_get_cb_shader_mask(unsigned spi_shader_col_format)
 		case V_028714_SPI_SHADER_UINT16_ABGR:
 		case V_028714_SPI_SHADER_SINT16_ABGR:
 		case V_028714_SPI_SHADER_32_ABGR:
-			cb_shader_mask |= 0xf << (i * 4);
+			cb_shader_mask |= 0xfu << (i * 4);
 			break;
 		default:
 			assert(0);