meta-agl-bsp/meta-ti/recipes-arago/gstreamer/gstreamer1.0-plugins-bad/0002-kmssink-remove-DCE-dependencies.patch

   1 From 68936c7fb864440bb4d2ab737a651888ac7c253a Mon Sep 17 00:00:00 2001
   2 From: Eric Ruei <e-ruei1@ti.com>
   3 Date: Fri, 17 Mar 2017 10:42:32 -0400
   4 Subject: [PATCH 2/3] kmssink: remove DCE dependencies
   5
   6 Replace DCE related API calls to libdrm and omapdrm API calls
   7 to decouple DCE from kmssink
   8
   9 Signed-off-by: Eric Ruei <e-ruei1@ti.com>
  10 ---
  11  configure.ac         |  1 -
  12  sys/kms/Makefile.am  |  2 --
  13  sys/kms/gstkmssink.c | 17 +++++++++++++----
  14  3 files changed, 13 insertions(+), 7 deletions(-)
  15
  16 diff --git a/configure.ac b/configure.ac
  17 index f93d52d..a6f93a5 100644
  18 --- a/configure.ac
  19 +++ b/configure.ac
  20 @@ -2321,7 +2321,6 @@ dnl *** kms ***
  21  translit(dnm, m, l) AM_CONDITIONAL(USE_KMS, true)
  22  AG_GST_CHECK_FEATURE(KMS, [kmssink], kms, [
  23  PKG_CHECK_MODULES([DRM], [libdrm libdrm_omap], HAVE_KMS=yes, HAVE_KMS=no)
  24 -PKG_CHECK_MODULES(LIBDCE, [libdce >= 1.0.0], HAVE_KMS=yes, HAVE_KMS=no)
  25  AC_SUBST(DRM_CFLAGS)
  26  AC_SUBST(DRM_LIBS)
  27  ])
  28 diff --git a/sys/kms/Makefile.am b/sys/kms/Makefile.am
  29 index 6d56073..cc7353e 100644
  30 --- a/sys/kms/Makefile.am
  31 +++ b/sys/kms/Makefile.am
  32 @@ -9,7 +9,6 @@ libgstkmssink_la_CFLAGS = \
  33         $(GST_PLUGINS_BAD_CFLAGS) \
  34         $(GST_PLUGINS_BASE_CFLAGS) \
  35         $(GST_BASE_CFLAGS) \
  36 -       $(LIBDCE_CFLAGS) \
  37         $(GST_CFLAGS) \
  38         $(DRM_CFLAGS)
  39
  40 @@ -17,7 +16,6 @@ libgstkmssink_la_LIBADD = \
  41         $(GST_PLUGINS_BASE_LIBS) \
  42         $(GST_BASE_LIBS) \
  43         $(GST_LIBS) \
  44 -       $(LIBDCE_LIBS) \
  45         $(DRM_LIBS) \
  46         -lgstvideo-$(GST_API_VERSION) \
  47         $(top_builddir)/gst-libs/gst/drm/libgstdrm-$(GST_API_VERSION).la
  48 diff --git a/sys/kms/gstkmssink.c b/sys/kms/gstkmssink.c
  49 index 17e6407..9795bdf 100644
  50 --- a/sys/kms/gstkmssink.c
  51 +++ b/sys/kms/gstkmssink.c
  52 @@ -31,7 +31,6 @@
  53  #include "gstkmssink.h"
  54  #include "gstkmsbufferpriv.h"
  55
  56 -#include <libdce.h>
  57  #include <omap_drm.h>
  58  #include <omap_drmif.h>
  59  #include <xf86drmMode.h>
  60 @@ -516,13 +515,18 @@ gst_kms_sink_start (GstBaseSink * bsink)
  61
  62    sink = GST_KMS_SINK (bsink);
  63
  64 -  drm_dev = dce_init ();
  65 +  drm_fd = open("/dev/dri/card0", O_RDWR | O_CLOEXEC);
  66 +  if(drm_fd == NULL)
  67 +    goto drm_failed;
  68 +  else {
  69 +    drm_dev = omap_device_new(drm_fd);
  70 +  }
  71 +
  72    if (drm_dev == NULL)
  73      goto device_failed;
  74    else {
  75 +    sink->fd = drm_fd;
  76      sink->dev = drm_dev;
  77 -    sink->fd = dce_get_fd ();
  78 -    drm_fd = dce_get_fd ();
  79    }
  80
  81    sink->resources = drmModeGetResources (sink->fd);
  82 @@ -539,6 +543,11 @@ fail:
  83    gst_kms_sink_reset (sink);
  84    return FALSE;
  85
  86 +drm_failed:
  87 +  GST_ELEMENT_ERROR (sink, RESOURCE, FAILED,
  88 +      (NULL), ("drmOpen failed"));
  89 +  goto fail;
  90 +
  91  device_failed:
  92    GST_ELEMENT_ERROR (sink, RESOURCE, FAILED,
  93        (NULL), ("omap_device_new failed"));
  94 --
  95 1.9.1
  96