Emil,
If I understand you correctly, you're proposing to add the ability to use
the kms_swrast driver in platform_x11.c (the host is a standard Ubuntu box
for the emulator use case, not CrOS) alongside swrast.
In that case, we would need to:
1) Have a dri2_initialize_x11_kms_swrast function that's called when some
environment variable is set instead of dri2_initialize_x11_swrast.
2) dri2_initialize_x11_kms_swrast would need access to the host card fd
(dri_kms_init_screen requires this) and call dri2_load_driver instead of
dri2_load_driver_swrast .
3) Use dri2_loader_extensions instead of swrast_loader_extensions,
dri2_x11_display_vtbl instead dri2_x11_swrast_display_vtbl etc.
I'm having trouble getting this to work, and I was wondering if what I'm
trying to do is what you want. Attached is the patch I'm trying (it
compiles, but will crash your display).
Regarding the issues with the emulator, I filed a bug based your comments
and the emulator team has started looking at it (see
https://android-review.googlesource.com/#/c/418541/).
On Tue, Jun 20, 2017 at 1:19 AM, Emil Velikov <emil.l.veli...@gmail.com>
wrote:
> On 19 June 2017 at 20:46, Chad Versace <chadvers...@chromium.org> wrote:
> > On Thu 15 Jun 2017, Gurchetan Singh wrote:
> >> Emil, would you be fine with leaving the image extension in dri2.c but
> still
> >> adding it as a drisw extension? That solution would look like:
> >>
> >> [1]https://patchwork.freedesktop.org/patch/154807/
> >
> > Observations:
> > - src/gallium/state_trackers/dri/dri2.c:dri2ImageExtension
> advertises v15 of __DRI_IMAGE.
> > - egl_dri2.c requires only v1 of __DRI_IMAGE. Maybe a higher version
> > is required in practive, but the egl_dri2.c code checks only for
> v1.
> >
> > Questions:
> > 1. All functions implemented in dri2.c:dri2ImageExtensions, do they
> > under swrast? Honest question, because I'm no expert on
> > gallium.
> >
> > If question #1 is true, then I see no problem with your latest plan. But
> > maybe Emil does.
> >
> > If question #1 is false, it should be straightforward to implement in
> > drisw.c the small subset of __DRI_IMAGE functions required for v1.
>
> While I haven't checked how much [or well] DRI_IMAGE works with
> swrast, there's no need to actually add it there.
> An alternative is to add kms_swrast support for EGL like we already do
> for GBM, as mentioned earlier [1].
>
> Gents, keep in mind that:
> - one cannot pull DRM specifics (dri2.c) code within drisw.c, and
> - DRI_IMAGE pulls DRM specifics, hence adding it into drisw.c is
> again a no-go :-\
>
> FWIW the above architectural split applies for classic drivers as
> well. swrast_dri.so simply cannot depend on anything DRM related.
>
> -Emil
>
> [1] https://lists.freedesktop.org/archives/mesa-dev/2017-June/159519.html
>
From cf984192dba114a91630f5d9fb6cf46061e64d68 Mon Sep 17 00:00:00 2001
From: Gurchetan Singh <gurchetansi...@chromium.org>
Date: Mon, 19 Jun 2017 16:09:09 -0700
Subject: [PATCH] egl/dri2: Add kms_swrast in platform_x11
---
src/egl/drivers/dri2/platform_x11.c | 100 +++++++++++++++++++-----------------
1 file changed, 53 insertions(+), 47 deletions(-)
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index 95e560a32a..19e4b0c5ca 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -1224,52 +1224,6 @@ disconnect:
return _eglError(EGL_BAD_ALLOC, msg);
}
-static EGLBoolean
-dri2_initialize_x11_swrast(_EGLDriver *drv, _EGLDisplay *disp)
-{
- struct dri2_egl_display *dri2_dpy;
-
- dri2_dpy = calloc(1, sizeof *dri2_dpy);
- if (!dri2_dpy)
- return _eglError(EGL_BAD_ALLOC, "eglInitialize");
-
- dri2_dpy->fd = -1;
- if (!dri2_get_xcb_connection(drv, disp, dri2_dpy))
- goto cleanup;
-
- /*
- * Every hardware driver_name is set using strdup. Doing the same in
- * here will allow is to simply free the memory at dri2_terminate().
- */
- dri2_dpy->driver_name = strdup("swrast");
- if (!dri2_load_driver_swrast(disp))
- goto cleanup;
-
- dri2_dpy->loader_extensions = swrast_loader_extensions;
-
- if (!dri2_create_screen(disp))
- goto cleanup;
-
- if (!dri2_setup_extensions(disp))
- goto cleanup;
-
- dri2_setup_screen(disp);
-
- if (!dri2_x11_add_configs_for_visuals(dri2_dpy, disp, true))
- goto cleanup;
-
- /* Fill vtbl last to prevent accidentally calling virtual function during
- * initialization.
- */
- dri2_dpy->vtbl = &dri2_x11_swrast_display_vtbl;
-
- return EGL_TRUE;
-
- cleanup:
- dri2_display_destroy(disp);
- return EGL_FALSE;
-}
-
static void
dri2_x11_setup_swap_interval(struct dri2_egl_display *dri2_dpy)
{
@@ -1422,6 +1376,58 @@ static const __DRIextension *dri2_loader_extensions[] = {
NULL,
};
+static EGLBoolean
+dri2_initialize_x11_kms_swrast(_EGLDriver *drv, _EGLDisplay *disp)
+{
+ struct dri2_egl_display *dri2_dpy;
+
+ dri2_dpy = calloc(1, sizeof *dri2_dpy);
+ if (!dri2_dpy)
+ return _eglError(EGL_BAD_ALLOC, "eglInitialize");
+
+ dri2_dpy->fd = -1;
+ if (!dri2_get_xcb_connection(drv, disp, dri2_dpy))
+ goto cleanup;
+
+ /*
+ * Every hardware driver_name is set using strdup. Doing the same in
+ * here will allow is to simply free the memory at dri2_terminate().
+ */
+ dri2_dpy->driver_name = strdup("kms_swrast");
+ dri2_dpy->fd = loader_open_device("/dev/dri/card0");;
+ if (!dri2_load_driver(disp))
+ goto cleanup;
+
+ if (dri2_dpy->dri2_minor >= 1)
+ dri2_dpy->loader_extensions = dri2_loader_extensions;
+ else
+ dri2_dpy->loader_extensions = dri2_loader_extensions_old;
+
+ if (!dri2_create_screen(disp))
+ goto cleanup;
+
+ if (!dri2_setup_extensions(disp))
+ goto cleanup;
+
+ dri2_setup_screen(disp);
+
+ if (!dri2_x11_add_configs_for_visuals(dri2_dpy, disp, true))
+ goto cleanup;
+
+ /* Fill vtbl last to prevent accidentally calling virtual function during
+ * initialization.
+ */
+ dri2_dpy->vtbl = &dri2_x11_display_vtbl;
+
+ _eglLog(_EGL_INFO, "Using DRI2");
+
+ return EGL_TRUE;
+
+ cleanup:
+ dri2_display_destroy(disp);
+ return EGL_FALSE;
+}
+
static EGLBoolean
dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp)
{
@@ -1500,7 +1506,7 @@ dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp)
}
if (!initialized)
- initialized = dri2_initialize_x11_swrast(drv, disp);
+ initialized = dri2_initialize_x11_kms_swrast(drv, disp);
return initialized;
}
--
2.13.1.611.g7e3b11ae1-goog
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
