diff --git a/src/amdgpu_glamor.c b/src/amdgpu_glamor.c
index 5b8d5606b048c6dede4b17ae8b158683f109fe32..bd3838ce1f687326a5fe1fcae514ff91300037ab 100644
--- a/src/amdgpu_glamor.c
+++ b/src/amdgpu_glamor.c
@@ -115,7 +115,11 @@ Bool amdgpu_glamor_pre_init(ScrnInfoPtr scrn)
 				return FALSE;
 			}
 
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,20,99,1,0)
 			if (glamor_egl_init(scrn, pAMDGPUEnt->fd)) {
+#else
+			if (glamor_egl_init(xf86ScrnToScreen(scrn), pAMDGPUEnt->fd)) {
+#endif
 				xf86DrvMsg(scrn->scrnIndex, X_INFO,
 					   "glamor detected, initialising EGL layer.\n");
 			} else {