From patchwork Sat Jan 12 13:22:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1023904 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ACyJDNYV"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43cL4r0jcmz9sD4 for ; Sun, 13 Jan 2019 00:22:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 36F0686254; Sat, 12 Jan 2019 13:22:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fQ5GMrfJ8+lF; Sat, 12 Jan 2019 13:22:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 229D085C0B; Sat, 12 Jan 2019 13:22:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 655351BF5AE for ; Sat, 12 Jan 2019 13:22:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 62477821E2 for ; Sat, 12 Jan 2019 13:22:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nBkQYH3lUGbR for ; Sat, 12 Jan 2019 13:22:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 4DA65820C3 for ; Sat, 12 Jan 2019 13:22:27 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id b16so14373395ior.1 for ; Sat, 12 Jan 2019 05:22:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=zyH+6x5eCzBu3r3KXzpoDqJR3Vx3hlwst4i+Zc94ds8=; b=ACyJDNYVB3claLIas8TQkreMiSaJzbPlk5AU/bLOrJYwUzaNCRrES0OhwhJCW5RNzA fozIb5ZV1isxZtoqo2XspBy4jfzrfR9f+CIRx2AB9u+iq/Dygq/sGFIHzdKrY4owqmda 6SkKhBtaMA7TR29ZeAdrUW12jmEM0VOyUvsILy5a1Mk5vTtbffA/kYvTm9rDxaPW78JJ lunNKF9lP7xCMGJFFuXyR7N5/5YJk0neQJIEU7byyFT1xmBgOGbtYsSwGfuJuOXZubal Ol/N0afuDNUaNuH07M9O/vxK9mXAzZBMI6Azwsi94qy9Um4ZRW2gOaHplm6kyrJPMMqe 3wnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=zyH+6x5eCzBu3r3KXzpoDqJR3Vx3hlwst4i+Zc94ds8=; b=qdbGaLn35T4FBjVxiNti2mJXd8XmbeUG0scHzhmMfH9oiyhGqoTgXppq3W5QcJa4eM jWn+q4kJkXUtOlZELkusvIcG5/T6f4dlUdOQavYHKH4hORhVJ5qhS6HgadYux/8Epe4D FWJvcKqKh9SWIP0vTllMy7ZgN4JB+eeOu9bbtJvpi94vQx1ELCHa8xNEgpeyfO4G1l8V H/abM6c2SUCJhts+wLTdu1jGcfsF4xWx8KjWMBZJfsPiDuBvsI2fzekTu1PuLhFvhH/r ZIqivQDbBw5w6KCBrw3PIhtq6TbInn2iasYXhOSOtGvPzeYpSkOyUi8eUx9jECfswfw6 K88A== X-Gm-Message-State: AJcUukd4cxNNwlR588NQhfijQ5Dop7mFOMTTDnbAv60QzzL2IazeHyI7 afH2Bgjs+VmhNTcQDCWUZDgQBlnk X-Google-Smtp-Source: ALg8bN7vGdvYdLqxXLh3rjqIWGnE2VhDlDlMoNJgU2wiHIDaN/MIM0/aAU5zezWcysl+pwVxky9Xzw== X-Received: by 2002:a5d:8747:: with SMTP id k7mr2929944iol.279.1547299346153; Sat, 12 Jan 2019 05:22:26 -0800 (PST) Received: from dragon.Home (71-218-4-112.hlrn.qwest.net. [71.218.4.112]) by smtp.gmail.com with ESMTPSA id j8sm2585442itb.30.2019.01.12.05.22.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 12 Jan 2019 05:22:25 -0800 (PST) From: james.hilliard1@gmail.com To: buildroot@buildroot.org Date: Sat, 12 Jan 2019 21:22:15 +0800 Message-Id: <1547299337-2266-1-git-send-email-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH 1/3] package/libva: backport Add pointer to struct wl_interface for driver to use X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , James Hilliard MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: James Hilliard This is needed by libva-intel-driver when using wayland. Signed-off-by: James Hilliard --- ...-to-struct-wl_interface-for-driver-to-use.patch | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 package/libva/0001-Add-pointer-to-struct-wl_interface-for-driver-to-use.patch diff --git a/package/libva/0001-Add-pointer-to-struct-wl_interface-for-driver-to-use.patch b/package/libva/0001-Add-pointer-to-struct-wl_interface-for-driver-to-use.patch new file mode 100644 index 0000000..21f419b --- /dev/null +++ b/package/libva/0001-Add-pointer-to-struct-wl_interface-for-driver-to-use.patch @@ -0,0 +1,73 @@ +From 62bad1239d8ea1bb269ca69d3469aa267f57cdec Mon Sep 17 00:00:00 2001 +From: Haihao Xiang +Date: Fri, 7 Dec 2018 13:25:41 +0800 +Subject: [PATCH 1/1] Add pointer to struct wl_interface for driver to use + +See https://github.com/intel/intel-vaapi-driver/issues/419 for the +information + +Note: don't export the interface symbol in case others may reuse it. + +Signed-off-by: Haihao Xiang +[james.hilliard1@gmail.com: backport from upstream commit +62bad1239d8ea1bb269ca69d3469aa267f57cdec] +Signed-off-by: James Hilliard +--- + va/wayland/va_backend_wayland.h | 10 +++++++++- + va/wayland/va_wayland_drm.c | 4 ++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/va/wayland/va_backend_wayland.h b/va/wayland/va_backend_wayland.h +index 9e5740a..906d4bf 100644 +--- a/va/wayland/va_backend_wayland.h ++++ b/va/wayland/va_backend_wayland.h +@@ -64,8 +64,16 @@ struct VADriverVTableWayland { + /** \brief Indicate whether buffer sharing with prime fd is supported. */ + unsigned int has_prime_sharing; + ++ /** ++ * Pointer to an implementation of struct wl_interface ++ * ++ * It is set by libva-wayland when a context is created, then the backend ++ * driver may reuse it. ++ */ ++ const void *wl_interface; ++ + /** \brief Reserved bytes for future use, must be zero */ +- unsigned long reserved[8]; ++ unsigned long reserved[7]; + }; + + #endif /* VA_BACKEND_WAYLAND_H */ +diff --git a/va/wayland/va_wayland_drm.c b/va/wayland/va_wayland_drm.c +index 8e22695..4cd3f6c 100644 +--- a/va/wayland/va_wayland_drm.c ++++ b/va/wayland/va_wayland_drm.c +@@ -136,6 +136,7 @@ va_wayland_drm_destroy(VADisplayContextP pDisplayContext) + struct VADriverVTableWayland *vtable = ctx->vtable_wayland; + + vtable->has_prime_sharing = 0; ++ vtable->wl_interface = NULL; + + wl_drm_ctx->is_authenticated = 0; + +@@ -222,6 +223,8 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext) + struct VADriverVTableWayland *vtable = ctx->vtable_wayland; + struct wl_display *wrapped_display = NULL; + ++ vtable->wl_interface = NULL; ++ + wl_drm_ctx = malloc(sizeof(*wl_drm_ctx)); + if (!wl_drm_ctx) { + va_wayland_error("could not allocate wl_drm_ctx"); +@@ -300,6 +303,7 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext) + goto end; + } + ++ vtable->wl_interface = &wl_drm_interface; + result = true; + + end: +-- +2.7.4 +