mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] libdrm: version bump 2.4.52 -> 2.4.53
@ 2014-04-13  8:18 Lucas Stach
  0 siblings, 0 replies; only message in thread
From: Lucas Stach @ 2014-04-13  8:18 UTC (permalink / raw)
  To: ptxdist

Lots more freedreno fixes.
Plus we can throw away our own patch, as it is
upstream now.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 ...01-modeprint-pretty-print-connector-names.patch | 64 ----------------------
 patches/libdrm-2.4.52/series                       |  4 --
 rules/libdrm.make                                  |  4 +-
 3 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 patches/libdrm-2.4.52/0001-modeprint-pretty-print-connector-names.patch
 delete mode 100644 patches/libdrm-2.4.52/series

diff --git a/patches/libdrm-2.4.52/0001-modeprint-pretty-print-connector-names.patch b/patches/libdrm-2.4.52/0001-modeprint-pretty-print-connector-names.patch
deleted file mode 100644
index 52bc03c3b281..000000000000
--- a/patches/libdrm-2.4.52/0001-modeprint-pretty-print-connector-names.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Lucas Stach <l.stach@pengutronix.de>
-Date: Fri, 17 Jan 2014 11:43:06 +0100
-Subject: [PATCH] modeprint: pretty print connector names
-
-Use same names as the kernel, makes it easier to identify
-connectors in the common case.
-
-Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
----
- tests/modeprint/modeprint.c | 28 +++++++++++++++++++++++++++-
- 1 file changed, 27 insertions(+), 1 deletion(-)
-
-diff --git a/tests/modeprint/modeprint.c b/tests/modeprint/modeprint.c
-index 545ff40a98d4..6f0d03905a46 100644
---- a/tests/modeprint/modeprint.c
-+++ b/tests/modeprint/modeprint.c
-@@ -41,6 +41,8 @@
- #include "xf86drm.h"
- #include "xf86drmMode.h"
- 
-+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-+
- int connectors;
- int full_props;
- int edid;
-@@ -140,13 +142,37 @@ int printProperty(int fd, drmModeResPtr res, drmModePropertyPtr props, uint64_t
- 	return 0;
- }
- 
-+static const char * const output_names[] = { "None",
-+					     "VGA",
-+					     "DVI-I",
-+					     "DVI-D",
-+					     "DVI-A",
-+					     "Composite",
-+					     "SVIDEO",
-+					     "LVDS",
-+					     "Component",
-+					     "DIN",
-+					     "DP",
-+					     "HDMI-A",
-+					     "HDMI-B",
-+					     "TV",
-+					     "eDP",
-+					     "Virtual",
-+					     "DSI",
-+};
-+
- int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uint32_t id)
- {
- 	int i = 0;
- 	struct drm_mode_modeinfo *mode = NULL;
- 	drmModePropertyPtr props;
- 
--	printf("Connector: %d-%d\n", connector->connector_type, connector->connector_type_id);
-+	if (connector->connector_type < ARRAY_SIZE(output_names))
-+		printf("Connector: %s-%d\n", output_names[connector->connector_type],
-+			connector->connector_type_id);
-+	else
-+		printf("Connector: %d-%d\n", connector->connector_type,
-+			connector->connector_type_id);
- 	printf("\tid             : %i\n", id);
- 	printf("\tencoder id     : %i\n", connector->encoder_id);
- 	printf("\tconn           : %s\n", getConnectionText(connector->connection));
diff --git a/patches/libdrm-2.4.52/series b/patches/libdrm-2.4.52/series
deleted file mode 100644
index 9940729949d5..000000000000
--- a/patches/libdrm-2.4.52/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-modeprint-pretty-print-connector-names.patch
-# 4f0e0cdf8cef84484a8d5999594ce6e9  - git-ptx-patches magic
diff --git a/rules/libdrm.make b/rules/libdrm.make
index cedf38c644f6..fc7b641047da 100644
--- a/rules/libdrm.make
+++ b/rules/libdrm.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm
 #
 # Paths and names
 #
-LIBDRM_VERSION	:= 2.4.52
-LIBDRM_MD5	:= cb3547ccb435be6d80df68840da6b2ee
+LIBDRM_VERSION	:= 2.4.53
+LIBDRM_MD5	:= 12e30247fb3caafc835e5f3f768c426a
 LIBDRM		:= libdrm-$(LIBDRM_VERSION)
 LIBDRM_SUFFIX	:= tar.gz
 LIBDRM_URL	:= http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX)
-- 
1.9.1


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-04-13  8:18 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-13  8:18 [ptxdist] [PATCH] libdrm: version bump 2.4.52 -> 2.4.53 Lucas Stach

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox