From 4e6e30215ddbf6be3d5be90f64f726431701aca0 Mon Sep 17 00:00:00 2001 From: Yogesh Mohanmarimuthu Date: Sun, 17 Oct 2021 22:24:10 +0530 Subject: [PATCH] egl: add fd_display_gpu to struct dri2_egl_display fd opened on display gpu is saved in fd_display_gpu. It is later used to create dri screen on display gpu. Signed-off-by: Yogesh Mohanmarimuthu Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/egl/drivers/dri2/egl_dri2.h | 1 + src/egl/drivers/dri2/platform_android.c | 1 + src/egl/drivers/dri2/platform_device.c | 1 + src/egl/drivers/dri2/platform_drm.c | 1 + src/egl/drivers/dri2/platform_surfaceless.c | 1 + src/egl/drivers/dri2/platform_wayland.c | 1 + src/egl/drivers/dri2/platform_x11.c | 3 +++ 7 files changed, 9 insertions(+) diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 588803c..a1d77f5 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -244,6 +244,7 @@ struct dri2_egl_display const __DRIconfigOptionsExtension *configOptions; const __DRImutableRenderBufferDriverExtension *mutable_render_buffer; int fd; + int fd_display_gpu; /* dri2_initialize/dri2_terminate increment/decrement this count, so does * dri2_make_current (tracks if there are active contexts/surfaces). */ diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index af7b329..937a941 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -1676,6 +1676,7 @@ dri2_initialize_android(_EGLDisplay *disp) return _eglError(EGL_BAD_ALLOC, "eglInitialize"); dri2_dpy->fd = -1; + dri2_dpy->fd_display_gpu = -1; ret = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (const hw_module_t **)&dri2_dpy->gralloc); if (ret) { diff --git a/src/egl/drivers/dri2/platform_device.c b/src/egl/drivers/dri2/platform_device.c index bd16f3f..1181fb0 100644 --- a/src/egl/drivers/dri2/platform_device.c +++ b/src/egl/drivers/dri2/platform_device.c @@ -352,6 +352,7 @@ dri2_initialize_device(_EGLDisplay *disp) dev = disp->PlatformDisplay; dri2_dpy->fd = -1; + dri2_dpy->fd_display_gpu = -1; disp->Device = dev; disp->DriverData = (void *) dri2_dpy; err = "DRI2: failed to load driver"; diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index 45895a8..ce906e9 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -692,6 +692,7 @@ dri2_initialize_drm(_EGLDisplay *disp) return _eglError(EGL_BAD_ALLOC, "eglInitialize"); dri2_dpy->fd = -1; + dri2_dpy->fd_display_gpu = -1; disp->DriverData = (void *) dri2_dpy; gbm = disp->PlatformDisplay; diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c index df88c54..82d44e3 100644 --- a/src/egl/drivers/dri2/platform_surfaceless.c +++ b/src/egl/drivers/dri2/platform_surfaceless.c @@ -334,6 +334,7 @@ dri2_initialize_surfaceless(_EGLDisplay *disp) return _eglError(EGL_BAD_ALLOC, "eglInitialize"); dri2_dpy->fd = -1; + dri2_dpy->fd_display_gpu = -1; disp->DriverData = (void *) dri2_dpy; /* When ForceSoftware is false, we try the HW driver. When ForceSoftware diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 248d217..b55cbcb 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -2093,6 +2093,7 @@ dri2_initialize_wayland_drm(_EGLDisplay *disp) return _eglError(EGL_BAD_ALLOC, "eglInitialize"); dri2_dpy->fd = -1; + dri2_dpy->fd_display_gpu = -1; disp->DriverData = (void *) dri2_dpy; if (dri2_wl_formats_init(&dri2_dpy->formats) < 0) diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 6e050c0..93a7d6a 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1452,6 +1452,7 @@ dri2_initialize_x11_swrast(_EGLDisplay *disp) return _eglError(EGL_BAD_ALLOC, "eglInitialize"); dri2_dpy->fd = -1; + dri2_dpy->fd_display_gpu = -1; if (!dri2_get_xcb_connection(disp, dri2_dpy)) goto cleanup; @@ -1541,6 +1542,7 @@ dri2_initialize_x11_dri3(_EGLDisplay *disp) return _eglError(EGL_BAD_ALLOC, "eglInitialize"); dri2_dpy->fd = -1; + dri2_dpy->fd_display_gpu = -1; if (!dri2_get_xcb_connection(disp, dri2_dpy)) goto cleanup; @@ -1650,6 +1652,7 @@ dri2_initialize_x11_dri2(_EGLDisplay *disp) return _eglError(EGL_BAD_ALLOC, "eglInitialize"); dri2_dpy->fd = -1; + dri2_dpy->fd_display_gpu = -1; if (!dri2_get_xcb_connection(disp, dri2_dpy)) goto cleanup; -- 2.7.4