diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c
index bc310435eb1..b93b8505b9b 100644
--- a/src/gallium/frontends/dri/dri_util.c
+++ b/src/gallium/frontends/dri/dri_util.c
@@ -1182,20 +1182,18 @@ const __DRIimageDriverExtension driImageDriverExtension = {
 };
 
 
-static int dri_vblank_mode(__DRIscreen *driScreen, const __DRI2configQueryExtension *config)
+static int dri_vblank_mode(__DRIscreen *driScreen)
 {
    GLint vblank_mode = DRI_CONF_VBLANK_DEF_INTERVAL_1;
  
-   if (config)
-      config->configQueryi(driScreen, "vblank_mode", &vblank_mode);
+   dri2GalliumConfigQueryi(driScreen, "vblank_mode", &vblank_mode);
  
    return vblank_mode;
 }
  
-int dri_get_initial_swap_interval(__DRIscreen *driScreen,
-                                  const __DRI2configQueryExtension *config)
+int dri_get_initial_swap_interval(__DRIscreen *driScreen)
 {
-   int vblank_mode = dri_vblank_mode(driScreen, config);
+   int vblank_mode = dri_vblank_mode(driScreen);
  
    switch (vblank_mode) {
    case DRI_CONF_VBLANK_NEVER:
@@ -1208,10 +1206,9 @@ int dri_get_initial_swap_interval(__DRIscreen *driScreen,
    }
 }
  
-bool dri_valid_swap_interval(__DRIscreen *driScreen,
-                             const __DRI2configQueryExtension *config, int interval)
+bool dri_valid_swap_interval(__DRIscreen *driScreen, int interval)
 {
-   int vblank_mode = dri_vblank_mode(driScreen, config);
+   int vblank_mode = dri_vblank_mode(driScreen);
  
    switch (vblank_mode) {
    case DRI_CONF_VBLANK_NEVER:
diff --git a/src/gallium/frontends/dri/dri_util.h b/src/gallium/frontends/dri/dri_util.h
index 8709e6fe46c..62fbc8cc617 100644
--- a/src/gallium/frontends/dri/dri_util.h
+++ b/src/gallium/frontends/dri/dri_util.h
@@ -194,8 +194,6 @@ dri2GalliumConfigQueryf(__DRIscreen *sPriv, const char *var, float *val);
 PUBLIC int
 dri2GalliumConfigQuerys(__DRIscreen *sPriv, const char *var, char **val);
 
-PUBLIC int dri_get_initial_swap_interval(__DRIscreen *driScreen,
-                                  const __DRI2configQueryExtension *config);
-PUBLIC bool dri_valid_swap_interval(__DRIscreen *driScreen,
-                             const __DRI2configQueryExtension *config, int interval);
+PUBLIC int dri_get_initial_swap_interval(__DRIscreen *driScreen);
+PUBLIC bool dri_valid_swap_interval(__DRIscreen *driScreen, int interval);
 #endif /* _DRI_UTIL_H_ */
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 25fdafd0767..8da770385fc 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -294,7 +294,7 @@ dri2CreateDrawable(struct glx_screen *base, XID xDrawable,
    pdraw->base.drawable = drawable;
    pdraw->base.psc = &psc->base;
    pdraw->bufferCount = 0;
-   pdraw->swap_interval = dri_get_initial_swap_interval(psc->driScreen, psc->config);
+   pdraw->swap_interval = dri_get_initial_swap_interval(psc->driScreen);
    pdraw->have_back = 0;
 
    DRI2CreateDrawable(psc->base.dpy, xDrawable);
@@ -763,7 +763,7 @@ dri2SetSwapInterval(__GLXDRIdrawable *pdraw, int interval)
    struct dri2_drawable *priv =  (struct dri2_drawable *) pdraw;
    struct dri2_screen *psc = (struct dri2_screen *) priv->base.psc;
 
-   if (!dri_valid_swap_interval(psc->driScreen, psc->config, interval))
+   if (!dri_valid_swap_interval(psc->driScreen, interval))
       return GLX_BAD_VALUE;
 
    xcb_dri2_swap_interval(c, priv->base.xDrawable, interval);
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index f6d9363d981..bb5b2595a71 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -608,7 +608,7 @@ dri3_set_swap_interval(__GLXDRIdrawable *pdraw, int interval)
    struct dri3_drawable *priv =  (struct dri3_drawable *) pdraw;
    struct dri3_screen *psc = (struct dri3_screen *) priv->base.psc;
 
-   if (!dri_valid_swap_interval(psc->driScreenRenderGPU, psc->config, interval))
+   if (!dri_valid_swap_interval(psc->driScreenRenderGPU, interval))
       return GLX_BAD_VALUE;
 
    loader_dri3_set_swap_interval(&priv->loader_drawable, interval);
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 01a957daa59..2650df7b064 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -690,7 +690,7 @@ driswCreateDrawable(struct glx_screen *base, XID xDrawable,
             .is_pixmap = !(type & GLX_WINDOW_BIT),
          });
 
-      pdp->swapInterval = dri_get_initial_swap_interval(psc->driScreen, psc->config);
+      pdp->swapInterval = dri_get_initial_swap_interval(psc->driScreen);
       kopperSetSwapInterval(pdp->driDrawable, pdp->swapInterval);
    }
    else
@@ -859,7 +859,7 @@ driswKopperSetSwapInterval(__GLXDRIdrawable *pdraw, int interval)
    struct drisw_drawable *pdp = (struct drisw_drawable *) pdraw;
    struct drisw_screen *psc = (struct drisw_screen *) pdp->base.psc;
 
-   if (!dri_valid_swap_interval(psc->driScreen, psc->config, interval))
+   if (!dri_valid_swap_interval(psc->driScreen, interval))
       return GLX_BAD_VALUE;
 
    kopperSetSwapInterval(pdp->driDrawable, interval);
diff --git a/src/loader_dri3/loader_dri3_helper.c b/src/loader_dri3/loader_dri3_helper.c
index 87018046dd1..7081f8ce3e3 100644
--- a/src/loader_dri3/loader_dri3_helper.c
+++ b/src/loader_dri3/loader_dri3_helper.c
@@ -435,8 +435,7 @@ loader_dri3_drawable_init(xcb_connection_t *conn,
    if (!draw->adaptive_sync)
       set_adaptive_sync_property(conn, draw->drawable, false);
 
-   draw->swap_interval = dri_get_initial_swap_interval(draw->dri_screen_render_gpu,
-                                                       draw->ext->config);
+   draw->swap_interval = dri_get_initial_swap_interval(draw->dri_screen_render_gpu);
 
    dri3_update_max_num_back(draw);