diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
index daa03ca60..8020bcd15 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -2,7 +2,7 @@
 include conf/machine/include/digi-defaults.inc
 
 XSERVER_DRIVER = "xf86-video-fbdev"
-XSERVER_DRIVER_imxgpu2d = "xf86-video-imxfb-vivante"
+XSERVER_DRIVER_imxgpu2d = "xf86-video-imx-vivante"
 XSERVER_DRIVER_append_mx8 = " xf86-video-modesetting"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
diff --git a/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch b/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante/Stop-using-Git-to-write-local-version.patch
similarity index 100%
rename from meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch
rename to meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante/Stop-using-Git-to-write-local-version.patch
diff --git a/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi b/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi
similarity index 100%
rename from meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi
rename to meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi
diff --git a/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante_%.bbappend b/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante_%.bbappend
new file mode 100644
index 000000000..9ec6bd0dc
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante_%.bbappend
@@ -0,0 +1,8 @@
+# Patch for MX8 DRM_VIV
+RDEPENDS_${PN}_append_mx8 = " kernel-module-vivante"
+
+DEPENDS_remove = "virtual/libgal-x11"
+DEPENDS_append = " libgal-imx"
+
+# Use lflags defined in the EXA makefile
+EXTRA_OEMAKE_remove = "LFLAGS="${LDFLAGS}""
diff --git a/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb b/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb
similarity index 52%
rename from meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb
rename to meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb
index 3768064a3..931f7a765 100644
--- a/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb
+++ b/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb
@@ -1,24 +1,29 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
 # Copyright (C) 2012-2014 O.S. Systems Software LTDA.
-# Copyright 2017 NXP
+# Copyright 2017-2018 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
 require recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
 
-NXP_REPO_MIRROR ?= "nxp/"
-SRCBRANCH = "${NXP_REPO_MIRROR}imx_4.9.11_1.0.0_ga"
-S = "${WORKDIR}/git/"
+SRCBRANCH = "imx_exa_viv6_g2d"
 XF86_VIDEO_IMX_VIVANTE_SRC ?= "git://source.codeaurora.org/external/imx/xf86-video-imx-vivante.git;protocol=https"
-SRC_URI = "${XF86_VIDEO_IMX_VIVANTE_SRC};branch=${SRCBRANCH}"
-SRC_URI +="file://rc.autohdmi"
-SRCREV = "07ef065dfe09f1c05a1a188c371577faa3677a17"
+SRC_URI  = "${XF86_VIDEO_IMX_VIVANTE_SRC};branch=${SRCBRANCH}"
+SRC_URI += "file://rc.autohdmi"
+SRCREV = "946e8603ed9a52f36d305405dbb2ab8ff90943d0"
 
-DEPENDS += "virtual/libg2d"
+S = "${WORKDIR}/git/"
+
+DEPENDS += "virtual/libg2d pixman"
+
+EXTRA_OEMAKE += "SDKTARGETSYSROOT=${STAGING_DIR_HOST}"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+EXTRA_OEMAKE_remove = "prefix=${D}/usr"
+EXTRA_OEMAKE += "prefix=${exec_prefix}"
 
 RDEPENDS_${PN}_remove = "libvivante-dri-mx6"
-
+RDEPENDS_${PN}_remove_mx8mq = "xserver-xorg-extension-glx"
 RDEPENDS_${PN}_append = " libvivante-dri-imx"
 
 COMPATIBLE_MACHINE = "(mx6|mx8|mx7ulp)"