[meta-arago][master][PATCH] libdrm: Remove upstreamed patch

Ryan Eatmon <[email protected]>
Newsgroups org.yoctoproject.lists.meta-arago
Message-ID <[email protected]>
A form of this patch was recently upstreamed and oe-core is now pointing
to a version of libdrm that contains the patch.  We can drop this patch
from meta-arago-distro.

Signed-off-by: Ryan Eatmon <[email protected]>
---
 .../recipes-graphics/drm/libdrm-arago.inc     |  1 -
 ...p-fix-omap_bo_size-for-tiled-buffers.patch | 38 -------------------
 2 files changed, 39 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-graphics/drm/libdrm/0001-omap-fix-omap_bo_size-for-tiled-buffers.patch

diff --git a/meta-arago-distro/recipes-graphics/drm/libdrm-arago.inc b/meta-arago-distro/recipes-graphics/drm/libdrm-arago.inc
index 80c607ca..5b64677a 100644
--- a/meta-arago-distro/recipes-graphics/drm/libdrm-arago.inc
+++ b/meta-arago-distro/recipes-graphics/drm/libdrm-arago.inc
@@ -2,7 +2,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/libdrm:"
 
 SRC_URI += " \
 file://0001-Add-option-to-run-a-test-indefinitely.patch \
-file://0001-omap-fix-omap_bo_size-for-tiled-buffers.patch \
 file://0002-omap-add-OMAP_BO-flags-to-affect-buffer-allocation.patch \
 "
 
diff --git a/meta-arago-distro/recipes-graphics/drm/libdrm/0001-omap-fix-omap_bo_size-for-tiled-buffers.patch b/meta-arago-distro/recipes-graphics/drm/libdrm/0001-omap-fix-omap_bo_size-for-tiled-buffers.patch
deleted file mode 100644
index 3f47243d..00000000
--- a/meta-arago-distro/recipes-graphics/drm/libdrm/0001-omap-fix-omap_bo_size-for-tiled-buffers.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 999fa7f4c79f9502b4f9d9e6d380f82bf839a250 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <[email protected]>
-Date: Thu, 18 May 2017 12:18:28 +0300
-Subject: [PATCH] omap: fix omap_bo_size for tiled buffers
-
-The buffer size is calculated using pixels, not bytes as it should. The
-result is often correct, though, as the stride is aligned to page size,
-but there are still many cases where the size ends up being wrong.
-
-Fix this by not calculating the size at all, as in that case
-DRM_OMAP_GEM_INFO ioctl is used to get the correct size from the kernel.
-This is better in any case as then the userspace library doesn't need to
-know how the tiled buffers need to be aligned.
-
-Upstream-Status: Pending
-Signed-off-by: Tomi Valkeinen <[email protected]>
----
- omap/omap_drm.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/omap/omap_drm.c b/omap/omap_drm.c
-index 42d35ef..06221b7 100644
---- a/omap/omap_drm.c
-+++ b/omap/omap_drm.c
-@@ -207,11 +207,9 @@ static struct omap_bo * omap_bo_new_impl(struct omap_device *dev,
- 	bo = bo_from_handle(dev, req.handle);
- 	pthread_mutex_unlock(&table_lock);
- 
--	if (flags & OMAP_BO_TILED) {
--		bo->size = round_up(size.tiled.width, PAGE_SIZE) * size.tiled.height;
--	} else {
-+	/* for tiled buffers we get the size with DRM_OMAP_GEM_INFO later */
-+	if (!(flags & OMAP_BO_TILED))
- 		bo->size = size.bytes;
--	}
- 
- 	return bo;
- 
-- 
2.43.0
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.