diff --git a/config/graphic b/config/graphic
index 3df8ac4797..c11c46dec6 100644
--- a/config/graphic
+++ b/config/graphic
@@ -26,6 +26,20 @@ get_graphicdrivers() {
     GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeonsi nvidia nvidia-legacy vmware virtio vc4"
   fi
 
+  if listcontains "$GRAPHIC_DRIVERS" "etnaviv"; then
+    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,etnaviv,imx"
+    V4L2_SUPPORT="yes"
+    VAAPI_SUPPORT="no"
+    VDPAU_SUPPORT="no"
+  fi
+
+  if listcontains "$GRAPHIC_DRIVERS" "freedreno"; then
+    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,freedreno"
+    V4L2_SUPPORT="yes"
+    VAAPI_SUPPORT="no"
+    VDPAU_SUPPORT="no"
+  fi
+
   if listcontains "$GRAPHIC_DRIVERS" "i915"; then
     DRI_DRIVERS="$DRI_DRIVERS,i915"
     XORG_DRIVERS="$XORG_DRIVERS intel"
@@ -92,16 +106,6 @@ get_graphicdrivers() {
     VAAPI_SUPPORT="yes"
   fi
 
-  if listcontains "$GRAPHIC_DRIVERS" "vmware"; then
-    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga"
-    XORG_DRIVERS="$XORG_DRIVERS vmware"
-    COMPOSITE_SUPPORT="yes"
-  fi
-
-  if listcontains "$GRAPHIC_DRIVERS" "virtio"; then
-    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,virgl"
-  fi
-
   if listcontains "$GRAPHIC_DRIVERS" "vc4"; then
     GALLIUM_DRIVERS="$GALLIUM_DRIVERS,vc4"
     V4L2_SUPPORT="yes"
@@ -109,18 +113,14 @@ get_graphicdrivers() {
     VDPAU_SUPPORT="no"
   fi
 
-  if listcontains "$GRAPHIC_DRIVERS" "freedreno"; then
-    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,freedreno"
-    V4L2_SUPPORT="yes"
-    VAAPI_SUPPORT="no"
-    VDPAU_SUPPORT="no"
+  if listcontains "$GRAPHIC_DRIVERS" "virtio"; then
+    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,virgl"
   fi
 
-  if listcontains "$GRAPHIC_DRIVERS" "etnaviv"; then
-    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,etnaviv,imx"
-    V4L2_SUPPORT="yes"
-    VAAPI_SUPPORT="no"
-    VDPAU_SUPPORT="no"
+  if listcontains "$GRAPHIC_DRIVERS" "vmware"; then
+    GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga"
+    XORG_DRIVERS="$XORG_DRIVERS vmware"
+    COMPOSITE_SUPPORT="yes"
   fi
 
   # remove leading comma if present