diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c
index 07bd35f8968..cc6630164e7 100644
--- a/src/nouveau/vulkan/nvk_cmd_draw.c
+++ b/src/nouveau/vulkan/nvk_cmd_draw.c
@@ -377,9 +377,9 @@ nvk_queue_init_context_draw_state(struct nvk_queue *queue)
    P_IMMD(p, NV9097, SET_VIEWPORT_SCALE_OFFSET, ENABLE_TRUE);
 
    P_IMMD(p, NV9097, SET_VIEWPORT_CLIP_CONTROL, {
-      .min_z_zero_max_z_one      = MIN_Z_ZERO_MAX_Z_ONE_TRUE,
+      .min_z_zero_max_z_one      = MIN_Z_ZERO_MAX_Z_ONE_FALSE,
       .pixel_min_z               = PIXEL_MIN_Z_CLAMP,
-      .pixel_max_z               = PIXEL_MAX_Z_CLIP,
+      .pixel_max_z               = PIXEL_MAX_Z_CLAMP,
       .geometry_guardband        = GEOMETRY_GUARDBAND_SCALE_256,
       .line_point_cull_guardband = LINE_POINT_CULL_GUARDBAND_SCALE_256,
       .geometry_clip             = GEOMETRY_CLIP_WZERO_CLIP,
@@ -988,6 +988,8 @@ nvk_flush_vp_state(struct nvk_cmd_buffer *cmd)
          float xmax = vp->x + vp->width;
          float ymin = MIN2(vp->y, vp->y + vp->height);
          float ymax = MAX2(vp->y, vp->y + vp->height);
+         float zmin = MIN2(vp->minDepth, vp->maxDepth);
+         float zmax = MAX2(vp->minDepth, vp->maxDepth);
          assert(xmin <= xmax && ymin <= ymax);
 
          const float max_dim = (float)0xffff;
@@ -1005,8 +1007,8 @@ nvk_flush_vp_state(struct nvk_cmd_buffer *cmd)
             .y0      = ymin,
             .height  = ymax - ymin,
          });
-         P_NV9097_SET_VIEWPORT_CLIP_MIN_Z(p, i, fui(vp->minDepth));
-         P_NV9097_SET_VIEWPORT_CLIP_MAX_Z(p, i, fui(vp->maxDepth));
+         P_NV9097_SET_VIEWPORT_CLIP_MIN_Z(p, i, fui(zmin));
+         P_NV9097_SET_VIEWPORT_CLIP_MAX_Z(p, i, fui(zmax));
 
          if (nvk_cmd_buffer_3d_cls(cmd) >= MAXWELL_B) {
             P_IMMD(p, NVB197, SET_VIEWPORT_COORDINATE_SWIZZLE(i), {
diff --git a/src/nouveau/vulkan/nvk_graphics_pipeline.c b/src/nouveau/vulkan/nvk_graphics_pipeline.c
index a0ab6a8b058..868ea8063b0 100644
--- a/src/nouveau/vulkan/nvk_graphics_pipeline.c
+++ b/src/nouveau/vulkan/nvk_graphics_pipeline.c
@@ -35,18 +35,34 @@ emit_pipeline_vp_state(struct nv_push *p,
 }
 
 static void
-emit_pipeline_rs_state(struct nv_push *p,
+emit_pipeline_rs_state(struct nv_push *p, struct nvk_device *dev,
                        const struct vk_rasterization_state *rs)
 {
-   bool depth_clip_enable = vk_rasterization_state_depth_clip_enable(rs);
-   P_IMMD(p, NV9097, SET_VIEWPORT_CLIP_CONTROL, {
-      .min_z_zero_max_z_one      = MIN_Z_ZERO_MAX_Z_ONE_TRUE,
-      .pixel_min_z               = !depth_clip_enable ? PIXEL_MIN_Z_CLAMP : PIXEL_MIN_Z_CLIP,
-      .pixel_max_z               = !depth_clip_enable ? PIXEL_MAX_Z_CLAMP : PIXEL_MAX_Z_CLIP,
-      .geometry_guardband        = GEOMETRY_GUARDBAND_SCALE_256,
+   bool z_clamp = rs->depth_clamp_enable;
+   bool z_clip = vk_rasterization_state_depth_clip_enable(rs);
+
+   P_IMMD(p, NVC397, SET_VIEWPORT_CLIP_CONTROL, {
+      /* TODO: Fix pre-Volta
+       *
+       * This probably involves a few macros, one which stases viewport
+       * min/maxDepth in scratch states and one which goes here and
+       * emits either min/maxDepth or -/+INF as needed.
+       */
+      .min_z_zero_max_z_one = MIN_Z_ZERO_MAX_Z_ONE_FALSE,
+      .z_clip_range = dev->pdev->info.cls_eng3d >= VOLTA_A
+                      ? ((z_clamp || z_clip)
+                         ? Z_CLIP_RANGE_MIN_Z_MAX_Z
+                         :Z_CLIP_RANGE_MINUS_INF_PLUS_INF)
+                      : Z_CLIP_RANGE_USE_FIELD_MIN_Z_ZERO_MAX_Z_ONE,
+
+      .pixel_min_z = z_clip ? PIXEL_MIN_Z_CLIP : PIXEL_MIN_Z_CLAMP,
+      .pixel_max_z = z_clip ? PIXEL_MAX_Z_CLIP : PIXEL_MAX_Z_CLAMP,
+
+      .geometry_guardband = GEOMETRY_GUARDBAND_SCALE_256,
       .line_point_cull_guardband = LINE_POINT_CULL_GUARDBAND_SCALE_256,
-      .geometry_clip             = !rs->depth_clip_enable ? GEOMETRY_CLIP_WZERO_CLIP_NO_Z_CULL : GEOMETRY_CLIP_WZERO_CLIP,
-      .geometry_guardband_z      = GEOMETRY_GUARDBAND_Z_SAME_AS_XY_GUARDBAND,
+      .geometry_clip = z_clip ? GEOMETRY_CLIP_FRUSTUM_XYZ_CLIP :
+                                GEOMETRY_CLIP_FRUSTUM_XY_CLIP,
+      .geometry_guardband_z = GEOMETRY_GUARDBAND_Z_SCALE_256,
    });
 
    P_IMMD(p, NV9097, SET_RASTER_INPUT, rs->rasterization_stream);
@@ -485,7 +501,7 @@ nvk_graphics_pipeline_create(struct nvk_device *dev,
 
    if (state.ts) emit_pipeline_ts_state(&push, state.ts);
    if (state.vp) emit_pipeline_vp_state(&push, state.vp);
-   if (state.rs) emit_pipeline_rs_state(&push, state.rs);
+   if (state.rs) emit_pipeline_rs_state(&push, dev, state.rs);
    if (state.ms) emit_pipeline_ms_state(&push, state.ms, force_max_samples);
    if (state.cb) emit_pipeline_cb_state(&push, state.cb);
 
diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c
index 86671d2a17d..a3844dc67da 100644
--- a/src/nouveau/vulkan/nvk_physical_device.c
+++ b/src/nouveau/vulkan/nvk_physical_device.c
@@ -34,6 +34,7 @@
 #include "clb1c0.h"
 #include "clc0c0.h"
 #include "clc1c0.h"
+#include "clc397.h"
 #include "clc3c0.h"
 #include "clc597.h"
 #include "clc5c0.h"
@@ -267,7 +268,7 @@ nvk_get_device_features(const struct nv_device_info *info,
       .customBorderColorWithoutFormat = true,
 
       /* VK_EXT_depth_clip_control */
-      .depthClipControl = true,
+      .depthClipControl = info->cls_eng3d >= VOLTA_A,
 
       /* VK_EXT_depth_clip_enable */
       .depthClipEnable = true,