Skip to contentSkip to conversation

libdrm: rebase testing patch for the latest version

PATCH New Denys Dmytriyenko 1 participant 1 message Mar 3, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libdrm: rebase testing patch for the latest version

From: Denys Dmytriyenko <[email protected]>

Cc Alejandro Hernandez <[email protected]>
---
 ...001-Add-option-to-run-a-test-indefinitely.patch | 34 ++++++++++------------
 .../recipes-graphics/drm/libdrm_%.bbappend         |  3 +-
 2 files changed, 17 insertions(+), 20 deletions(-)
meta-arago-distro/recipes-graphics/drm/libdrm/0001-Add-option-to-run-a-test-indefinitely.patch +16 -18
index 2ebd6d8..e7c8d09 100644
@@ -1,6 +1,6 @@
-From eed389c68118fd673a462d7ac6738a1fe3aec217 Mon Sep 17 00:00:00 2001
+From 6a16a6381082d870037aa4aedffa3f7d01406015 Mon Sep 17 00:00:00 2001
 From: Alejandro Hernandez <[email protected]>
-Date: Wed, 15 Mar 2017 14:25:20 -0400
+Date: Tue, 3 Mar 2020 09:52:06 -0500
 Subject: [PATCH] Add option to run a test indefinitely
 
 This patch adds option -t to the modetest cli. When this option is
@@ -10,16 +10,15 @@ was not able to run in ltp-ddt because ltp-ddt sends data to stdin
 when a test is run
 
 Signed-off-by: Alejandro Hernandez <[email protected]>
-Signed-off-by: Denys Dmytriyenko <[email protected]>
 ---
- tests/modetest/modetest.c | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
+ tests/modetest/modetest.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
-index 975dcbc..654ce89 100644
+index e66be660..9bd24acd 100644
 --- a/tests/modetest/modetest.c
 +++ b/tests/modetest/modetest.c
-@@ -1501,7 +1501,7 @@ static void clear_cursors(struct device *dev)
+@@ -1563,7 +1563,7 @@ static void clear_cursors(struct device *dev)
  		bo_destroy(dev->mode.cursor_bo);
  }
  
@@ -28,7 +27,7 @@ index 975dcbc..654ce89 100644
  {
  	uint32_t handles[4] = {0}, pitches[4] = {0}, offsets[4] = {0};
  	unsigned int other_fb_id;
-@@ -1570,7 +1570,7 @@ static void test_page_flip(struct device *dev, struct pipe_arg *pipes, unsigned
+@@ -1632,7 +1632,7 @@ static void test_page_flip(struct device *dev, struct pipe_arg *pipes, unsigned
  		fd_set fds;
  
  		FD_ZERO(&fds);
@@ -37,35 +36,34 @@ index 975dcbc..654ce89 100644
  		FD_SET(dev->fd, &fds);
  		ret = select(dev->fd + 1, &fds, NULL, NULL, &timeout);
  
-@@ -1818,7 +1818,7 @@ static int pipe_resolve_connectors(struct device *dev, struct pipe_arg *pipe)
+@@ -1890,7 +1890,7 @@ static int pipe_resolve_connectors(struct device *dev, struct pipe_arg *pipe)
  	return 0;
  }
  
--static char optstr[] = "acdD:efM:P:ps:Cvw:";
-+static char optstr[] = "acdD:efM:P:ps:Cvw:t";
+-static char optstr[] = "acdD:efF:M:P:ps:Cvw:";
++static char optstr[] = "acdD:efF:M:P:ps:Cvw:t";
  
  int main(int argc, char **argv)
  {
-@@ -1834,6 +1834,7 @@ int main(int argc, char **argv)
+@@ -1906,6 +1906,7 @@ int main(int argc, char **argv)
  	char *module = NULL;
  	unsigned int i;
  	unsigned int count = 0, plane_count = 0;
-+	int dont_stop= 0;
++	int dont_stop = 0;
  	unsigned int prop_count = 0;
  	struct pipe_arg *pipe_args = NULL;
  	struct plane_arg *plane_args = NULL;
-@@ -1924,6 +1925,10 @@ int main(int argc, char **argv)
+@@ -1999,6 +2000,9 @@ int main(int argc, char **argv)
  
  			prop_count++;
  			break;
-+                case 't':
++		case 't':
 +			dont_stop = 1;
-+			setvbuf(stdout, (char *)NULL, _IOLBF, 0);
 +			break;
  		default:
  			usage(argv[0]);
  			break;
-@@ -2075,7 +2080,7 @@ int main(int argc, char **argv)
+@@ -2150,7 +2154,7 @@ int main(int argc, char **argv)
  				set_cursors(&dev, pipe_args, count);
  
  			if (test_vsync)
@@ -75,5 +73,5 @@ index 975dcbc..654ce89 100644
  			if (drop_master)
  				drmDropMaster(dev.fd);
 -- 
-2.7.4
+2.17.1
 
meta-arago-distro/recipes-graphics/drm/libdrm_%.bbappend +1 -2
index 2624319..99d2fa7 100644
@@ -1,8 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-# file://0001-Add-option-to-run-a-test-indefinitely.patch
-
 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 \
 file://0001-libsync-add-support-for-pre-v4.7-kernels.patch \
Signature · 1 line
2.7.4