All of lore.kernel.org
 help / color / mirror / Atom feed
* [morty] kmscube: cleanup and include bug fix for HDMI
@ 2017-03-16 11:53 Karthik Ramanan
  2017-03-16 11:53 ` [morty] glsdk-example-apps: Include fix for HDMI testcases Karthik Ramanan
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Karthik Ramanan @ 2017-03-16 11:53 UTC (permalink / raw)
  To: meta-arago

All local patches merged to git repository

Signed-off-by: Karthik Ramanan <a0393906@ti.com>
---
 ...001-kmscube.c-init_drm-enable-AM3-support.patch | 28 --------
 ...nit_drm-select-the-current-CRTC-display-m.patch | 76 ----------------------
 .../recipes-graphics/kmscube/kmscube_1.0.0.bb      |  6 +-
 3 files changed, 2 insertions(+), 108 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-graphics/kmscube/kmscube/0001-kmscube.c-init_drm-enable-AM3-support.patch
 delete mode 100644 meta-arago-extras/recipes-graphics/kmscube/kmscube/0001-kmscube.c-init_drm-select-the-current-CRTC-display-m.patch

diff --git a/meta-arago-extras/recipes-graphics/kmscube/kmscube/0001-kmscube.c-init_drm-enable-AM3-support.patch b/meta-arago-extras/recipes-graphics/kmscube/kmscube/0001-kmscube.c-init_drm-enable-AM3-support.patch
deleted file mode 100644
index 64b7b04..0000000
--- a/meta-arago-extras/recipes-graphics/kmscube/kmscube/0001-kmscube.c-init_drm-enable-AM3-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 82a3cc3ddec96fba7204f5ecab0890801a0b54b4 Mon Sep 17 00:00:00 2001
-From: Eric Ruei <e-ruei1@ti.com>
-Date: Thu, 25 Feb 2016 09:49:24 -0500
-Subject: [PATCH] kmscube.c: init_drm(): enable AM3 support
-
-Enable AM3 support by adding "tilcdc" to the modules list.
-
-Signed-off-by: Eric Ruei <e-ruei1@ti.com>
----
- kmscube.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kmscube.c b/kmscube.c
-index 5a18c32..919b3e7 100644
---- a/kmscube.c
-+++ b/kmscube.c
-@@ -84,7 +84,7 @@ struct drm_fb {
- static int init_drm(void)
- {
- 	static const char *modules[] = {
--			"omapdrm", "i915", "radeon", "nouveau", "vmwgfx", "exynos"
-+			"omapdrm", "tilcdc", "i915", "radeon", "nouveau", "vmwgfx", "exynos"
- 	};
- 	drmModeRes *resources;
- 	drmModeConnector *connector = NULL;
--- 
-1.9.1
-
diff --git a/meta-arago-extras/recipes-graphics/kmscube/kmscube/0001-kmscube.c-init_drm-select-the-current-CRTC-display-m.patch b/meta-arago-extras/recipes-graphics/kmscube/kmscube/0001-kmscube.c-init_drm-select-the-current-CRTC-display-m.patch
deleted file mode 100644
index e6db0a3..0000000
--- a/meta-arago-extras/recipes-graphics/kmscube/kmscube/0001-kmscube.c-init_drm-select-the-current-CRTC-display-m.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From c2fd69466fcf1de1d20ee437470b40584964b32d Mon Sep 17 00:00:00 2001
-From: Eric Ruei <e-ruei1@ti.com>
-Date: Thu, 10 Dec 2015 12:41:15 -0500
-Subject: [PATCH] kmscube.c: init_drm(): select the current CRTC display mode
- is valid
-
-Signed-off-by: Eric Ruei <e-ruei1@ti.com>
----
- kmscube.c | 35 ++++++++++++++++++++++++++++++++---
- 1 file changed, 32 insertions(+), 3 deletions(-)
-
-diff --git a/kmscube.c b/kmscube.c
-index 5a18c32..51a2c28 100644
---- a/kmscube.c
-+++ b/kmscube.c
-@@ -89,6 +89,8 @@ static int init_drm(void)
- 	drmModeRes *resources;
- 	drmModeConnector *connector = NULL;
- 	drmModeEncoder *encoder = NULL;
-+	drmModeCrtc *crtc = NULL;
-+
- 	int i, j;
- 	uint32_t maxRes, curRes;
- 
-@@ -119,10 +121,8 @@ static int init_drm(void)
- 	for (i = 0; i < resources->count_connectors; i++) {
- 		connector = drmModeGetConnector(drm.fd, resources->connectors[i]);
- 		if (connector->connection == DRM_MODE_CONNECTED) {
--			/* choose the first supported mode */
--			drm.mode[drm.ndisp] = &connector->modes[0];
--			drm.connector_id[drm.ndisp] = connector->connector_id;
- 
-+			/* find the matched encoders */
- 			for (j=0; j<resources->count_encoders; j++) {
- 				encoder = drmModeGetEncoder(drm.fd, resources->encoders[j]);
- 				if (encoder->encoder_id == connector->encoder_id)
-@@ -137,6 +137,35 @@ static int init_drm(void)
- 				return -1;
- 			}
- 
-+			/* choose the current or first supported mode */
-+			crtc = drmModeGetCrtc(drm.fd, encoder->crtc_id);
-+			for (j = 0; j < connector->count_modes; j++)
-+			{
-+				if (crtc->mode_valid)
-+				{
-+					if ((connector->modes[j].hdisplay == crtc->width) &&
-+					(connector->modes[j].vdisplay == crtc->height))
-+					{
-+						drm.mode[drm.ndisp] = &connector->modes[j];
-+						break;
-+					}
-+				}
-+				else
-+				{
-+					if ((connector->modes[j].hdisplay == crtc->x) &&
-+					   (connector->modes[j].vdisplay == crtc->y))
-+					{
-+						drm.mode[drm.ndisp] = &connector->modes[j];
-+						break;
-+					}
-+				}
-+			}
-+
-+			if(j >= connector->count_modes)
-+				drm.mode[drm.ndisp] = &connector->modes[0];
-+
-+			drm.connector_id[drm.ndisp] = connector->connector_id;
-+
- 			drm.encoder[drm.ndisp]  = (uint32_t) encoder;
- 			drm.crtc_id[drm.ndisp] = encoder->crtc_id;
- 			drm.connectors[drm.ndisp] = connector;
--- 
-1.9.1
-
-
diff --git a/meta-arago-extras/recipes-graphics/kmscube/kmscube_1.0.0.bb b/meta-arago-extras/recipes-graphics/kmscube/kmscube_1.0.0.bb
index 1e9a8bf..220cc75 100644
--- a/meta-arago-extras/recipes-graphics/kmscube/kmscube_1.0.0.bb
+++ b/meta-arago-extras/recipes-graphics/kmscube/kmscube_1.0.0.bb
@@ -10,14 +10,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit autotools pkgconfig
 
-PR = "r5"
-SRCREV = "1c8a0d26c5b1918432fd94d2ac9894b3dcdb2814"
+PR = "r7"
+SRCREV = "0fa27a594fd3290644f5666eac62dc570f26f866"
 
 SRC_URI = "git://git.ti.com/glsdk/kmscube.git;protocol=git"
 
 SRC_URI_append = " \
-    file://0001-kmscube.c-init_drm-select-the-current-CRTC-display-m.patch \
-    file://0001-kmscube.c-init_drm-enable-AM3-support.patch \
 "
 
 S = "${WORKDIR}/git"
-- 
1.9.1



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2017-03-16 14:50 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-16 11:53 [morty] kmscube: cleanup and include bug fix for HDMI Karthik Ramanan
2017-03-16 11:53 ` [morty] glsdk-example-apps: Include fix for HDMI testcases Karthik Ramanan
2017-03-16 14:50   ` Denys Dmytriyenko
2017-03-16 11:53 ` [morty] omapdrmtest: Update SRCREV and remove local patch Karthik Ramanan
2017-03-16 14:50   ` Denys Dmytriyenko
2017-03-16 14:49 ` [morty] kmscube: cleanup and include bug fix for HDMI Denys Dmytriyenko

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.