From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lelnx193.ext.ti.com (lelnx193.ext.ti.com [198.47.27.77]) by arago-project.org (Postfix) with ESMTPS id 2EE5C52A1F for ; Thu, 16 Mar 2017 14:49:25 +0000 (UTC) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id v2GEnPnM029919 for ; Thu, 16 Mar 2017 09:49:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1489675765; bh=K/Svt5bQzSjN568J8AScbQzVvszDrG0rlom/7ZrBZ0M=; h=Date:From:To:CC:Subject:References:In-Reply-To; b=Dkw0rSRNw7EJ9vIn9QDURBWUZtL4Umyc4aeR53/mAEJXEl22iCIBacwigtmx+mltx Hi36s21AXu01PPqWk5vSUc5iTigXh2aw5wUoBBRFJIz0Bkhbvp3Kz6rgrEhdbaufmY xiEZ7mB8ojkfHvWW0MSlmMS3UjbY5B3jaRi2QbY4= Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v2GEnODg016132 for ; Thu, 16 Mar 2017 09:49:24 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.294.0; Thu, 16 Mar 2017 09:49:24 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id v2GEnOFu025863; Thu, 16 Mar 2017 09:49:24 -0500 Date: Thu, 16 Mar 2017 10:49:24 -0400 From: Denys Dmytriyenko To: Karthik Ramanan Message-ID: <20170316144923.GA14484@edge> References: <1489665224-95346-1-git-send-email-a0393906@ti.com> MIME-Version: 1.0 In-Reply-To: <1489665224-95346-1-git-send-email-a0393906@ti.com> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: meta-arago@arago-project.org Subject: Re: [morty] kmscube: cleanup and include bug fix for HDMI X-BeenThere: meta-arago@arago-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Arago metadata layer for TI SDKs - OE-Core/Yocto compatible List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Mar 2017 14:49:25 -0000 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline Looks good, thanks. On Thu, Mar 16, 2017 at 05:23:42PM +0530, Karthik Ramanan wrote: > All local patches merged to git repository > > Signed-off-by: Karthik Ramanan > --- > ...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 > -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 > ---- > - 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 > -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 > ---- > - 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; jcount_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 \ > " You can also drop SRC_URI_append as it's empty now. > S = "${WORKDIR}/git" > -- > 1.9.1 > > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago