From patchwork Tue Jan 20 12:23:43 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Mader X-Patchwork-Id: 25870 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id F3542BDCBF for ; Tue, 20 Jan 2026 12:24:07 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 22EEF61FBF; Tue, 20 Jan 2026 13:24:07 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=collabora.com header.i=robert.mader@collabora.com header.b="EbCS+Ece"; dkim-atps=neutral Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 55A2D61A35 for ; Tue, 20 Jan 2026 13:24:05 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; t=1768911840; cv=none; d=zohomail.com; s=zohoarc; b=Rgxz3PSf941NrIiWjst1MA02p3w8RdwA7Ifh6v77oVwuYvu/aAak+126CT2K6dM1UFCm5uN4+vl7J1+8ruPCA8TQiXxHOITiAwP7+sfab90cLceXxvQSXJzYf7juPY+RHV2lVY63TPMoCWSLP4PAwl5iy6QBMQv8oP89UX0rBZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768911840; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZWT5oBnml50K6Fm+ocsguHWNgGl5nobzdBEbiYg2BcU=; b=K7lt5Xc12oP9XeTkgakR1azwRlu7KNoz+h+pNNK+CYqIi8fMxWkMv2I8BgwGLd1TYm9duh7E6KRuQkfjsSnOBwIr/SLgkum6xbaEa5QetGHs7d4Lp8o0fIa+8tm74gTsQY9iqkYfIwcit7US6DnEbSXvJkobC03upnU0tYiJjpI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=robert.mader@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1768911840; s=zohomail; d=collabora.com; i=robert.mader@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=ZWT5oBnml50K6Fm+ocsguHWNgGl5nobzdBEbiYg2BcU=; b=EbCS+EceZQYQgecCxE0u5+WHPJPWPteGdhDClmmqianNYd41WaP4q888om4WDinO CvPqlRF6V4eYOJepwBG/igquNnLZjAC9qt9hLUrkU+CBS93qiRVvWDVDOC02k9gt82o 1vz/MrqXdlQYOMhz4HCDbOOxKXO2qRus46QOxKdE= Received: by mx.zohomail.com with SMTPS id 17689118390971009.6650378051735; Tue, 20 Jan 2026 04:23:59 -0800 (PST) From: Robert Mader To: libcamera-devel@lists.libcamera.org Cc: Robert Mader , Bryan O'Donoghue , Milan Zamazal , =?utf-8?b?QmFybmFiw6FzIFDFkWN6?= =?utf-8?q?e?= , Laurent Pinchart Subject: [PATCH v3 1/2] egl: Use the Mesa surfaceless platform instead of GBM Date: Tue, 20 Jan 2026 13:23:43 +0100 Message-ID: <20260120122344.28283-1-robert.mader@collabora.com> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Mesa surfaceless platform appears to be a better fit for the use-case at hand: 1. Like GBM it is Mesa specific, so no change in supported setups is expected. If ever required, a fallback to the generic device platform could be added on top. 2. It leaves the complexity of selecting a renderer device to the driver, reducing code and dependencies. 3. It allows to use llvmpipe / software drivers without dri device, which can be useful on CI or debugging (with LIBGL_ALWAYS_SOFTWARE=1). Signed-off-by: Robert Mader Reviewed-by: Bryan O'Donoghue Tested-by: Bryan O'Donoghue # sm8250/rb5, x1e/Dell Insprion14p Reviewed-by: Milan Zamazal Tested-by: Milan Zamazal # TI AM69 Tested-by: Barnabás Pőcze # ThinkPad X1 Yoga Gen 7 + ov2740 Reviewed-by: Laurent Pinchart --- Changes in v3: - Minor commit message improvement - Use EGL_DEFAULT_DISPLAY instead of nullptr (no change in behavior) - Improve comment formating - Add Laurents R-B Changes in v2: - Add tags --- include/libcamera/internal/egl.h | 4 +--- src/libcamera/egl.cpp | 14 +++++++------- src/libcamera/software_isp/debayer_egl.cpp | 9 +++------ src/libcamera/software_isp/debayer_egl.h | 1 - 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/include/libcamera/internal/egl.h b/include/libcamera/internal/egl.h index f007f448a..630345ea7 100644 --- a/include/libcamera/internal/egl.h +++ b/include/libcamera/internal/egl.h @@ -16,8 +16,6 @@ #include #include -#include "libcamera/internal/gbm.h" - #define EGL_EGLEXT_PROTOTYPES #include #include @@ -96,7 +94,7 @@ public: eGL(); ~eGL(); - int initEGLContext(GBM *gbmContext); + int initEGLContext(); int createInputDMABufTexture2D(eGLImage &eglImage, int fd); int createOutputDMABufTexture2D(eGLImage &eglImage, int fd); diff --git a/src/libcamera/egl.cpp b/src/libcamera/egl.cpp index da563ee09..5b9bbf410 100644 --- a/src/libcamera/egl.cpp +++ b/src/libcamera/egl.cpp @@ -256,24 +256,22 @@ void eGL::createTexture2D(eGLImage &eglImage, GLint format, uint32_t width, uint /** * \brief Initialise the EGL context - * \param[in] gbmContext Pointer to initialised GBM context * - * Sets up the EGL display from the GBM device, creates an OpenGL ES 2.0 - * context, and retrieves function pointers for required extensions - * including: + * Sets up the EGL display, creates an OpenGL ES 2.0 context, and retrieves + * function pointers for required extensions including: * - eglCreateImageKHR / eglDestroyImageKHR * - glEGLImageTargetTexture2DOES * * \return 0 on success, or -ENODEV on failure */ -int eGL::initEGLContext(GBM *gbmContext) +int eGL::initEGLContext() { EGLint configAttribs[] = { EGL_RED_SIZE, 8, EGL_GREEN_SIZE, 8, EGL_BLUE_SIZE, 8, EGL_ALPHA_SIZE, 8, - EGL_SURFACE_TYPE, EGL_WINDOW_BIT, + EGL_SURFACE_TYPE, EGL_PBUFFER_BIT, EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, EGL_NONE }; @@ -291,7 +289,9 @@ int eGL::initEGLContext(GBM *gbmContext) goto fail; } - display_ = eglGetDisplay(gbmContext->device()); + display_ = eglGetPlatformDisplay(EGL_PLATFORM_SURFACELESS_MESA, + EGL_DEFAULT_DISPLAY, + nullptr); if (display_ == EGL_NO_DISPLAY) { LOG(eGL, Error) << "Unable to get EGL display"; goto fail; diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp index 9693d7252..37c44e8b1 100644 --- a/src/libcamera/software_isp/debayer_egl.cpp +++ b/src/libcamera/software_isp/debayer_egl.cpp @@ -141,8 +141,8 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm egl_.pushEnv(shaderEnv, "#extension GL_OES_EGL_image_external: enable"); /* - * Tell shaders how to re-order output taking account of how the - * pixels are actually stored by GBM + * Tell shaders how to re-order output taking account of how the pixels + * are actually stored by EGL. */ switch (outputFormat) { case formats::ARGB8888: @@ -586,10 +586,7 @@ int DebayerEGL::start() { GLint maxTextureImageUnits; - if (gbmSurface_.createDevice()) - return -ENODEV; - - if (egl_.initEGLContext(&gbmSurface_)) + if (egl_.initEGLContext()) return -ENODEV; glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &maxTextureImageUnits); diff --git a/src/libcamera/software_isp/debayer_egl.h b/src/libcamera/software_isp/debayer_egl.h index a5033bc63..cfbaf8e9d 100644 --- a/src/libcamera/software_isp/debayer_egl.h +++ b/src/libcamera/software_isp/debayer_egl.h @@ -113,7 +113,6 @@ private: Rectangle window_; std::unique_ptr stats_; eGL egl_; - GBM gbmSurface_; uint32_t width_; uint32_t height_; GLint glFormat_;