diff --git a/.pick_status.json b/.pick_status.json
index 859060a1e50..0d8176c0dc9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -734,7 +734,7 @@
         "description": "st/mesa: fix implicit conversion warning in st_atom_framebuffer",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "2b37f233143275d5d11fc0a5f392b8d99c7bad29",
         "notes": null
diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c
index 08ed3d2b454..cc5ad3d3cb7 100644
--- a/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -200,7 +200,7 @@ st_update_framebuffer_state( struct st_context *st )
       memset(&framebuffer.zsbuf, 0, sizeof(framebuffer.zsbuf));
    }
 
-   framebuffer.viewmask = BITFIELD_MASK(num_multiview_layer);
+   framebuffer.viewmask = (uint8_t)BITFIELD_MASK(num_multiview_layer);
 
 #ifndef NDEBUG
    /* Make sure the resource binding flags were set properly */