diff options
author | 2017-01-18 11:32:11 +0900 | |
---|---|---|
committer | 2017-01-18 11:32:43 +0900 | |
commit | 793d8d01d0377dad21f4e1a330f00d822eced086 (patch) | |
tree | 002df733dc532616ede3f90a6392ebc5ce0f316b /meta-rcar-gen2/recipes-graphics/wayland/weston/0002-Get-DMA-fd-on-bo.patch | |
parent | d53759600dc1e97ce47ba7b0f7958b105012386a (diff) | |
parent | 2420779506844c8b8cf2f50d8f08b622dc6468f6 (diff) |
Merge branch 'chinook_fixed' into chinook
This merge is needed to support cluster combination of AGL
CES2017 Demo.
Change-Id: Iad92027680273ac0ad931a916fe2c3cafa91d600
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Diffstat (limited to 'meta-rcar-gen2/recipes-graphics/wayland/weston/0002-Get-DMA-fd-on-bo.patch')
-rw-r--r-- | meta-rcar-gen2/recipes-graphics/wayland/weston/0002-Get-DMA-fd-on-bo.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta-rcar-gen2/recipes-graphics/wayland/weston/0002-Get-DMA-fd-on-bo.patch b/meta-rcar-gen2/recipes-graphics/wayland/weston/0002-Get-DMA-fd-on-bo.patch new file mode 100644 index 0000000..2683afe --- /dev/null +++ b/meta-rcar-gen2/recipes-graphics/wayland/weston/0002-Get-DMA-fd-on-bo.patch @@ -0,0 +1,33 @@ +From 6c320c1319f0ef0888d9a9be614c13e5756a3228 Mon Sep 17 00:00:00 2001 +From: Grigory Kletsko <grigory.kletsko@cogentembedded.com> +Date: Wed, 2 Nov 2016 17:16:29 +0300 +Subject: [PATCH 2/2] Get DMA fd on bo + +--- + src/compositor-drm.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/compositor-drm.c b/src/compositor-drm.c +index 09611a4..85c7d0a 100644 +--- a/src/compositor-drm.c ++++ b/src/compositor-drm.c +@@ -143,6 +143,7 @@ struct drm_fb { + struct drm_output *output; + uint32_t fb_id, stride, handle, size; + int fd; ++ int dmafd; + int is_client_buffer; + struct weston_buffer_reference buffer_ref; + +@@ -411,6 +412,8 @@ drm_fb_get_from_bo(struct gbm_bo *bo, + goto err_free; + } + ++ fb->dmafd = gbm_bo_get_fd(bo); ++ + gbm_bo_set_user_data(bo, fb, drm_fb_destroy_callback); + + return fb; +-- +2.7.4 + |