From 8d186efa08367005510159d1ddea711b91986a8c Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Wed, 21 Apr 2021 17:23:46 +0200
Subject: [PATCH] drm: Do not check egl extensions before setting them up

---
 src/plugins/platforms/drm/egl_gbm_backend.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/platforms/drm/egl_gbm_backend.cpp b/src/plugins/platforms/drm/egl_gbm_backend.cpp
index a02487b451..bc1ee737ee 100644
--- a/src/plugins/platforms/drm/egl_gbm_backend.cpp
+++ b/src/plugins/platforms/drm/egl_gbm_backend.cpp
@@ -86,10 +86,6 @@ bool EglGbmBackend::initializeEgl()
     // Use eglGetPlatformDisplayEXT() to get the display pointer
     // if the implementation supports it.
     if (display == EGL_NO_DISPLAY) {
-        if (!supportsSurfacelessContext()) {
-            setFailed("EGL_KHR_surfaceless_context extension is unavailable!");
-            return false;
-        }
         const bool hasMesaGBM = hasClientExtension(QByteArrayLiteral("EGL_MESA_platform_gbm"));
         const bool hasKHRGBM = hasClientExtension(QByteArrayLiteral("EGL_KHR_platform_gbm"));
         const GLenum platform = hasMesaGBM ? EGL_PLATFORM_GBM_MESA : EGL_PLATFORM_GBM_KHR;
@@ -125,6 +121,12 @@ void EglGbmBackend::init()
         setFailed("Could not initialize egl");
         return;
     }
+
+    if (!supportsSurfacelessContext()) {
+        setFailed("EGL_KHR_surfaceless_context extension is unavailable!");
+        return false;
+    }
+
     if (!initRenderingContext()) {
         setFailed("Could not initialize rendering context");
         return;