diff --git a/x11-servers/xorg-server/files/patch-present_present__scmd.c b/x11-servers/xorg-server/files/patch-present_present__scmd.c
new file mode 100644
index 000000000000..d31ef7f7a311
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-present_present__scmd.c
@@ -0,0 +1,27 @@
+# present: Check for NULL to prevent crash
+#
+# https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275
+
+diff --git a/present/present_scmd.c b/present/present_scmd.c
+--- present/present_scmd.c.orig
++++ present/present_scmd.c
+@@ -168,6 +168,9 @@ present_scmd_get_crtc(present_screen_priv_ptr screen_priv, WindowPtr window)
+     if (!screen_priv->info)
+         return NULL;
+ 
++    if (!screen_priv->info->get_crtc)
++        return NULL;
++
+     return (*screen_priv->info->get_crtc)(window);
+ }
+ 
+@@ -206,6 +209,9 @@ present_flush(WindowPtr window)
+     if (!screen_priv->info)
+         return;
+ 
++    if (!screen_priv->info->flush)
++        return;
++
+     (*screen_priv->info->flush) (window);
+ }
+