From 7689aa28cdb18844f093942f084fddc91d25bc1e Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 21 Jun 2014 12:44:30 +0100 Subject: [PATCH] targets/gbm: convert to static/shared pipe-driver Move the gbm "target" code to the state-tracker, similar to other - dri, omx, vdpau... ST. v2: Drop inclusion of the wrapper winsys and softpipe/llvmpipe. Cc: Chia-I Wu Signed-off-by: Emil Velikov --- src/gallium/state_trackers/gbm/Makefile.am | 10 +- src/gallium/state_trackers/gbm/gbm_drm.c | 65 ++++++++++-- .../state_trackers/gbm/gbm_gallium_drmint.h | 11 +-- src/gallium/targets/gbm/Makefile.am | 110 +++++++++++++++++---- src/gallium/targets/gbm/gbm.c | 84 ---------------- src/gallium/targets/gbm/target.c | 1 + 6 files changed, 160 insertions(+), 121 deletions(-) delete mode 100644 src/gallium/targets/gbm/gbm.c create mode 100644 src/gallium/targets/gbm/target.c diff --git a/src/gallium/state_trackers/gbm/Makefile.am b/src/gallium/state_trackers/gbm/Makefile.am index 0e532fd..4d9f3fe 100644 --- a/src/gallium/state_trackers/gbm/Makefile.am +++ b/src/gallium/state_trackers/gbm/Makefile.am @@ -26,9 +26,17 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ $(GALLIUM_CFLAGS) \ $(VISIBILITY_CFLAGS) + AM_CPPFLAGS = \ -I$(top_srcdir)/src/gbm/main \ - -I$(top_srcdir)/include + $(GALLIUM_PIPE_LOADER_DEFINES) \ + -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" + +if HAVE_GALLIUM_STATIC_TARGETS +AM_CPPFLAGS += \ + -DGALLIUM_STATIC_TARGETS=1 +endif + if HAVE_EGL_PLATFORM_WAYLAND AM_CFLAGS += $(WAYLAND_CFLAGS) AM_CPPFLAGS += -DHAVE_WAYLAND_PLATFORM diff --git a/src/gallium/state_trackers/gbm/gbm_drm.c b/src/gallium/state_trackers/gbm/gbm_drm.c index fa84276..bfd48a0 100644 --- a/src/gallium/state_trackers/gbm/gbm_drm.c +++ b/src/gallium/state_trackers/gbm/gbm_drm.c @@ -28,6 +28,7 @@ #include "util/u_memory.h" #include "util/u_inlines.h" +#include "pipe-loader/pipe_loader.h" #include "state_tracker/drm_driver.h" #include @@ -223,17 +224,40 @@ gbm_gallium_drm_destroy(struct gbm_device *gbm) { struct gbm_gallium_drm_device *gdrm = gbm_gallium_drm_device(gbm); - gallium_screen_destroy(gdrm); - FREE(gdrm); + free(gdrm->base.driver_name); + gdrm->screen->destroy(gdrm->screen); +#if !GALLIUM_STATIC_TARGETS + pipe_loader_release(&gdrm->dev, 1); +#endif + free(gdrm); } -struct gbm_device * +#if !GALLIUM_STATIC_TARGETS +#ifdef HAVE_PIPE_LOADER_DRM +static const char * +get_library_search_path(void) +{ + const char *search_path = NULL; + + /* don't allow setuid apps to use GBM_BACKENDS_PATH */ + if (geteuid() == getuid()) + search_path = getenv("GBM_BACKENDS_PATH"); + if (search_path == NULL) + search_path = PIPE_SEARCH_DIR; + + return search_path; +} +#endif +#endif + +static struct gbm_device * gbm_gallium_drm_device_create(int fd) { struct gbm_gallium_drm_device *gdrm; - int ret; gdrm = calloc(1, sizeof *gdrm); + if (!gdrm) + return NULL; gdrm->base.base.fd = fd; gdrm->base.base.bo_create = gbm_gallium_drm_bo_create; @@ -245,11 +269,34 @@ gbm_gallium_drm_device_create(int fd) gdrm->base.type = GBM_DRM_DRIVER_TYPE_GALLIUM; gdrm->base.base.name = "drm"; - ret = gallium_screen_create(gdrm); - if (ret) { - free(gdrm); - return NULL; - } +#if GALLIUM_STATIC_TARGETS + gdrm->screen = dd_create_screen(gdrm->base.base.fd); +#else +#ifdef HAVE_PIPE_LOADER_DRM + if (pipe_loader_drm_probe_fd(&gdrm->dev, gdrm->base.base.fd, true)) + gdrm->screen = pipe_loader_create_screen(gdrm->dev, + get_library_search_path()); +#endif /* HAVE_PIPE_LOADER_DRM */ +#endif + + if (gdrm->screen == NULL) + goto out_no_screen; + gdrm->base.driver_name = strdup(gdrm->dev->driver_name); return &gdrm->base.base; + +out_no_screen: + debug_printf("failed to load driver: %s\n", gdrm->dev->driver_name); +#if !GALLIUM_STATIC_TARGETS + if (gdrm->dev) + pipe_loader_release(&gdrm->dev, 1); +#endif + free(gdrm); + return NULL; } + + +GBM_EXPORT struct gbm_backend gbm_backend = { + .backend_name = "gallium_drm", + .create_device = gbm_gallium_drm_device_create, +}; diff --git a/src/gallium/state_trackers/gbm/gbm_gallium_drmint.h b/src/gallium/state_trackers/gbm/gbm_gallium_drmint.h index 4534dd8..8b05ef9 100644 --- a/src/gallium/state_trackers/gbm/gbm_gallium_drmint.h +++ b/src/gallium/state_trackers/gbm/gbm_gallium_drmint.h @@ -38,7 +38,7 @@ struct gbm_gallium_drm_device { struct gbm_drm_device base; struct pipe_screen *screen; - void *driver; + struct pipe_loader_device *dev; struct pipe_resource *(*lookup_egl_image)(void *data, void *egl_image); @@ -64,13 +64,4 @@ gbm_gallium_drm_bo(struct gbm_bo *bo) return (struct gbm_gallium_drm_bo *) bo; } -struct gbm_device * -gbm_gallium_drm_device_create(int fd); - -int -gallium_screen_create(struct gbm_gallium_drm_device *gdrm); - -void -gallium_screen_destroy(struct gbm_gallium_drm_device *gdrm); - #endif diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index 6f2a792..2345ce3 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -22,32 +22,18 @@ include $(top_srcdir)/src/gallium/Automake.inc -gbmdir = $(libdir)/gbm - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/gallium/state_trackers/gbm \ - -I$(top_srcdir)/src/gbm/main \ - -I$(top_srcdir)/src/gallium/winsys \ - $(GALLIUM_PIPE_LOADER_DEFINES) \ - -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" - AM_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(VISIBILITY_CFLAGS) \ - $(LIBDRM_CFLAGS) + $(GALLIUM_TARGET_CFLAGS) +gbmdir = $(libdir)/gbm gbm_LTLIBRARIES = gbm_gallium_drm.la nodist_EXTRA_gbm_gallium_drm_la_SOURCES = dummy.cpp -gbm_gallium_drm_la_SOURCES = gbm.c +gbm_gallium_drm_la_SOURCES = gbm_gallium_drm_la_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \ $(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ - $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \ $(LIBDRM_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) @@ -63,6 +49,96 @@ gbm_gallium_drm_la_LDFLAGS += \ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/gbm/gbm.sym endif +if HAVE_GALLIUM_STATIC_TARGETS + +STATIC_TARGET_CPPFLAGS = +STATIC_TARGET_LIB_DEPS = \ + $(top_builddir)/src/loader/libloader.la + +if HAVE_GALLIUM_I915 +STATIC_TARGET_CPPFLAGS += -DGALLIUM_I915 +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ + $(top_builddir)/src/gallium/drivers/i915/libi915.la \ + $(INTEL_LIBS) +endif + +if HAVE_GALLIUM_ILO +STATIC_TARGET_CPPFLAGS += -DGALLIUM_ILO +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \ + $(top_builddir)/src/gallium/drivers/ilo/libilo.la \ + $(INTEL_LIBS) +endif + +if HAVE_GALLIUM_NOUVEAU +STATIC_TARGET_CPPFLAGS += -DGALLIUM_NOUVEAU +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ + $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \ + $(NOUVEAU_LIBS) +endif + +if NEED_RADEON_DRM_WINSYS +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la +endif + +if HAVE_GALLIUM_RADEON_COMMON +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/radeon/libradeon.la +endif + +if HAVE_GALLIUM_R300 +STATIC_TARGET_CPPFLAGS += -DGALLIUM_R300 +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/r300/libr300.la \ + $(top_builddir)/src/gallium/drivers/r300/libr300-helper.la \ + $(RADEON_LIBS) +endif + +if HAVE_GALLIUM_R600 +STATIC_TARGET_CPPFLAGS += -DGALLIUM_R600 +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/r600/libr600.la \ + $(RADEON_LIBS) +endif + +if HAVE_GALLIUM_RADEONSI +STATIC_TARGET_CPPFLAGS += -DGALLIUM_RADEONSI +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ + $(RADEON_LIBS) +endif + +if HAVE_GALLIUM_SVGA +STATIC_TARGET_CPPFLAGS += -DGALLIUM_VMWGFX +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \ + $(top_builddir)/src/gallium/drivers/svga/libsvga.la +endif + +if HAVE_GALLIUM_FREEDRENO +STATIC_TARGET_CPPFLAGS += -DGALLIUM_FREEDRENO +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \ + $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \ + $(FREEDRENO_LIBS) + +endif + +gbm_gallium_drm_la_SOURCES += target.c +gbm_gallium_drm_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) +gbm_gallium_drm_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) + +else # HAVE_GALLIUM_STATIC_TARGETS +gbm_gallium_drm_la_LIBADD += \ + $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \ + $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \ + $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) + +endif # HAVE_GALLIUM_STATIC_TARGETS + if HAVE_MESA_LLVM gbm_gallium_drm_la_LIBADD += $(LLVM_LIBS) gbm_gallium_drm_la_LDFLAGS += $(LLVM_LDFLAGS) diff --git a/src/gallium/targets/gbm/gbm.c b/src/gallium/targets/gbm/gbm.c deleted file mode 100644 index 160cbb8..0000000 --- a/src/gallium/targets/gbm/gbm.c +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright © 2011 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Authors: - * Benjamin Franzke - */ - -#include "gbm_gallium_drmint.h" - -#include "util/u_memory.h" -#include "util/u_inlines.h" -#include "pipe-loader/pipe_loader.h" - -static const char * -get_library_search_path(void) -{ - const char *search_path = NULL; - - /* don't allow setuid apps to use GBM_BACKENDS_PATH */ - if (geteuid() == getuid()) - search_path = getenv("GBM_BACKENDS_PATH"); - if (search_path == NULL) - search_path = PIPE_SEARCH_DIR; - - return search_path; -} - -int -gallium_screen_create(struct gbm_gallium_drm_device *gdrm) -{ - struct pipe_loader_device *dev; - int ret = 0; - -#ifdef HAVE_PIPE_LOADER_DRM - ret = pipe_loader_drm_probe_fd(&dev, gdrm->base.base.fd, true); -#endif /* HAVE_PIPE_LOADER_DRM */ - - if (!ret) - return -1; - - gdrm->screen = pipe_loader_create_screen(dev, get_library_search_path()); - if (gdrm->screen == NULL) { - debug_printf("failed to load driver: %s\n", gdrm->base.driver_name); - pipe_loader_release(&dev, 1); - return -1; - }; - - gdrm->driver = dev; - gdrm->base.driver_name = strdup(dev->driver_name); - return 0; -} - -void -gallium_screen_destroy(struct gbm_gallium_drm_device *gdrm) -{ - FREE(gdrm->base.driver_name); - gdrm->screen->destroy(gdrm->screen); - pipe_loader_release((struct pipe_loader_device **)&gdrm->driver, 1); -} - -GBM_EXPORT struct gbm_backend gbm_backend = { - .backend_name = "gallium_drm", - .create_device = gbm_gallium_drm_device_create, -}; diff --git a/src/gallium/targets/gbm/target.c b/src/gallium/targets/gbm/target.c new file mode 100644 index 0000000..fde4a4a --- /dev/null +++ b/src/gallium/targets/gbm/target.c @@ -0,0 +1 @@ +#include "target-helpers/inline_drm_helper.h" -- 2.7.4