diff --git a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/imxdrm/xorg.conf b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/imxdrm/xorg.conf
index 24ebbadc8..2b2d4cdc6 100644
--- a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/imxdrm/xorg.conf
+++ b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/imxdrm/xorg.conf
@@ -1,8 +1,6 @@
-Section "Device"
-    Identifier  "i.MX Accelerated DRM Device"
-    Driver      "vivante"
-    Option      "kmsdev"     "/dev/dri/card0"
-    Option      "fbdev"      "/dev/fb0"
+Section "Module"
+  Load "dri2"
+  Load "glamoregl"
 EndSection
 
 Section "ServerFlags"
@@ -10,7 +8,4 @@ Section "ServerFlags"
     Option "StandbyTime"  "0"
     Option "SuspendTime"  "0"
     Option "OffTime"  "0"
-    Option "Xinerama"  "off"
-    Option "Clone"  "on"
-    Option "SWcursor"  "true"
 EndSection
diff --git a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg/0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg/0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch
new file mode 100644
index 000000000..3e24fcfe9
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg/0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch
@@ -0,0 +1,32 @@
+From ed3c55fa6260ad125a32f9ac67f9e44a9bce7cf1 Mon Sep 17 00:00:00 2001
+From: Prabhu Sundararaj <prabhu.sundarara@nxp.com>
+Date: Mon, 11 May 2020 19:12:51 -0500
+Subject: [PATCH] MGS-5186 Per Specification EGL_NATIVE_PIXMAP_KHR requires
+ EGL_NO_CONTEXT
+
+https://www.khronos.org/registry/EGL/extensions/KHR/EGL_KHR_image_pixmap.txt
+
+Per Specification EGL_NATIVE_PIXMAP_KHR requires EGL_NO_CONTEXT.
+So passing context will result in error.
+
+Signed-off-by: Prabhu Sundararaj <prabhu.sundarara@nxp.com>
+---
+ hw/xwayland/xwayland-glamor-gbm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
+index 80655fd16..e8c623e56 100644
+--- a/hw/xwayland/xwayland-glamor-gbm.c
++++ b/hw/xwayland/xwayland-glamor-gbm.c
+@@ -174,7 +174,7 @@ xwl_glamor_gbm_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo,
+     xwl_pixmap->bo = bo;
+     xwl_pixmap->buffer = NULL;
+     xwl_pixmap->image = eglCreateImageKHR(xwl_screen->egl_display,
+-                                          xwl_screen->egl_context,
++                                          EGL_NO_CONTEXT /*xwl_screen->egl_context*/,
+                                           EGL_NATIVE_PIXMAP_KHR,
+                                           xwl_pixmap->bo, NULL);
+     if (xwl_pixmap->image == EGL_NO_IMAGE_KHR)
+-- 
+2.17.1
+
diff --git a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg/0002-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg/0002-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch
new file mode 100644
index 000000000..ef60d122a
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg/0002-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch
@@ -0,0 +1,32 @@
+From 65b31124191b53e65d2cb2ab7349144f219543da Mon Sep 17 00:00:00 2001
+From: Prabhu Sundararaj <prabhu.sundarara@nxp.com>
+Date: Mon, 11 May 2020 23:26:19 -0500
+Subject: [PATCH] MGS-5186 Per Specification EGL_NATIVE_PIXMAP_KHR requires
+ EGL_NO_CONTEXT
+
+https://www.khronos.org/registry/EGL/extensions/KHR/EGL_KHR_image_pixmap.txt
+
+Per Specification EGL_NATIVE_PIXMAP_KHR requires EGL_NO_CONTEXT.
+So passing a valid context will result in error.
+
+Signed-off-by: Prabhu Sundararaj <prabhu.sundarara@nxp.com>
+---
+ glamor/glamor_egl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
+index d3c678d6b..5385e7c90 100644
+--- a/glamor/glamor_egl.c
++++ b/glamor/glamor_egl.c
+@@ -233,7 +233,7 @@ glamor_egl_create_textured_pixmap_from_gbm_bo(PixmapPtr pixmap,
+     glamor_make_current(glamor_priv);
+ 
+     image = eglCreateImageKHR(glamor_egl->display,
+-                              glamor_egl->context,
++                              EGL_NO_CONTEXT /*glamor_egl->context*/,
+                               EGL_NATIVE_PIXMAP_KHR, bo, NULL);
+     if (image == EGL_NO_IMAGE_KHR) {
+         glamor_set_pixmap_type(pixmap, GLAMOR_DRM_ONLY);
+-- 
+2.17.1
+
diff --git a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
index 20ad108df..4891eafbf 100644
--- a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -1,4 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 # Trailing space is intentional due to a bug in meta-freescale
-SRC_URI += "file://0001-glamor-Use-CFLAGS-for-EGL-and-GBM.patch "
+SRC_URI += "file://0001-glamor-Use-CFLAGS-for-EGL-and-GBM.patch \
+            file://0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch \
+            file://0002-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch"
+
+PACKAGECONFIG_append_mx8 = " glamor"