diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 4cd46f2a7ccc1397852bc2a8a79adf95d7000c3e..47e21702dd59738012d700caa8f0a37457a568fd 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -318,13 +318,13 @@ static Bool AMDGPUCreateScreenResources_KMS(ScreenPtr pScreen)
 			RROutputChanged(rrScrPriv->primaryOutput, FALSE);
 			rrScrPriv->layoutChanged = TRUE;
 		}
+
+		drmmode_uevent_init(pScrn, &info->drmmode);
 	}
 
 	if (!drmmode_set_desired_modes(pScrn, &info->drmmode, pScreen->isGPU))
 		return FALSE;
 
-	drmmode_uevent_init(pScrn, &info->drmmode);
-
 	if (info->shadow_fb) {
 		pixmap = pScreen->GetScreenPixmap(pScreen);
 
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index fdadf89596706e73dde4b0880397ec8c6a86e743..aea53adecc44b662d16fa4ba90f72a10972ad449 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -3710,7 +3710,8 @@ Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode,
 	}
 
 	/* Validate leases on VT re-entry */
-	drmmode_validate_leases(pScrn);
+	if (dixPrivateKeyRegistered(rrPrivKey))
+		drmmode_validate_leases(pScrn);
 
 	return TRUE;
 }
@@ -3907,7 +3908,7 @@ restart_destroy:
 	/* Check to see if a lessee has disappeared */
 	drmmode_validate_leases(scrn);
 
-	if (changed && dixPrivateKeyRegistered(rrPrivKey)) {
+	if (changed) {
 #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
 		RRSetChanged(xf86ScrnToScreen(scrn));
 #else