diff --git a/hw/xfree86/drivers/video/modesetting/driver.c b/hw/xfree86/drivers/video/modesetting/driver.c
index 4cf5cf9d6..dd404a51e 100644
--- a/hw/xfree86/drivers/video/modesetting/driver.c
+++ b/hw/xfree86/drivers/video/modesetting/driver.c
@@ -159,6 +159,8 @@ static const OptionInfoRec Options[] = {
 
 int ms_entity_index = -1;
 
+DevPrivateKeyRec asyncFlipPrivateKeyRec;
+
 static MODULESETUPPROTO(Setup);
 
 static XF86ModuleVersionInfo VersRec = {
@@ -934,7 +936,7 @@ ms_window_has_async_flip(WindowPtr win)
     ScrnInfoPtr scrn = xf86ScreenToScrn(win->drawable.pScreen);
     modesettingPtr ms = modesettingPTR(scrn);
     struct ms_async_flip_priv *priv = dixLookupPrivate(&win->devPrivates,
-                                                       &ms->drmmode.asyncFlipPrivateKeyRec);
+                                                       &asyncFlipPrivateKeyRec);
 
     return priv->async_flip;
 }
@@ -945,7 +947,7 @@ ms_window_update_async_flip(WindowPtr win, Bool async_flip)
     ScrnInfoPtr scrn = xf86ScreenToScrn(win->drawable.pScreen);
     modesettingPtr ms = modesettingPTR(scrn);
     struct ms_async_flip_priv *priv = dixLookupPrivate(&win->devPrivates,
-                                                       &ms->drmmode.asyncFlipPrivateKeyRec);
+                                                       &asyncFlipPrivateKeyRec);
 
     priv->async_flip = async_flip;
 }
@@ -956,7 +958,7 @@ ms_window_has_async_flip_modifiers(WindowPtr win)
     ScrnInfoPtr scrn = xf86ScreenToScrn(win->drawable.pScreen);
     modesettingPtr ms = modesettingPTR(scrn);
     struct ms_async_flip_priv *priv = dixLookupPrivate(&win->devPrivates,
-                                                       &ms->drmmode.asyncFlipPrivateKeyRec);
+                                                       &asyncFlipPrivateKeyRec);
 
     return priv->async_flip_modifiers;
 }
@@ -967,7 +969,7 @@ ms_window_update_async_flip_modifiers(WindowPtr win, Bool async_flip)
     ScrnInfoPtr scrn = xf86ScreenToScrn(win->drawable.pScreen);
     modesettingPtr ms = modesettingPTR(scrn);
     struct ms_async_flip_priv *priv = dixLookupPrivate(&win->devPrivates,
-                                                       &ms->drmmode.asyncFlipPrivateKeyRec);
+                                                       &asyncFlipPrivateKeyRec);
 
     priv->async_flip_modifiers = async_flip;
 }
@@ -1756,7 +1758,7 @@ modesetCreateScreenResources(ScreenPtr pScreen)
                                sizeof(struct ms_vrr_priv)))
             return FALSE;
 
-    if (!dixRegisterPrivateKey(&ms->drmmode.asyncFlipPrivateKeyRec,
+    if (!dixRegisterPrivateKey(&asyncFlipPrivateKeyRec,
                                PRIVATE_WINDOW,
                                sizeof(struct ms_async_flip_priv)))
             return FALSE;
diff --git a/hw/xfree86/drivers/video/modesetting/drmmode_display.h b/hw/xfree86/drivers/video/modesetting/drmmode_display.h
index efb3bb61f..468f35877 100644
--- a/hw/xfree86/drivers/video/modesetting/drmmode_display.h
+++ b/hw/xfree86/drivers/video/modesetting/drmmode_display.h
@@ -120,7 +120,6 @@ typedef struct {
     DevPrivateKeyRec pixmapPrivateKeyRec;
     DevScreenPrivateKeyRec spritePrivateKeyRec;
     DevPrivateKeyRec vrrPrivateKeyRec;
-    DevPrivateKeyRec asyncFlipPrivateKeyRec;
     /* Number of SW cursors currently visible on this screen */
     int sprites_visible;