From b01df3a44ba79f0398bdb8a11552ec8eaff47ecc Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 6 Jan 2015 10:40:33 -0600
Subject: [PATCH] enable sgx
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patch.sh | 2 +-
...the-ping-pong-dma-tearing-issue-seen-.patch | 18 +++++++++---------
version.sh | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/patch.sh b/patch.sh
index 639af4beb..fe6aaaf1b 100644
--- a/patch.sh
+++ b/patch.sh
@@ -268,7 +268,7 @@ dt
fixes
beaglebone
-#sgx
+sgx
packaging_setup () {
cp -v "${DIR}/3rdparty/packaging/builddeb" "${DIR}/KERNEL/scripts/package"
diff --git a/patches/sgx/0003-drm-tilcdc-fix-the-ping-pong-dma-tearing-issue-seen-.patch b/patches/sgx/0003-drm-tilcdc-fix-the-ping-pong-dma-tearing-issue-seen-.patch
index bd2d18d4a..f7136e9ce 100644
--- a/patches/sgx/0003-drm-tilcdc-fix-the-ping-pong-dma-tearing-issue-seen-.patch
+++ b/patches/sgx/0003-drm-tilcdc-fix-the-ping-pong-dma-tearing-issue-seen-.patch
@@ -14,10 +14,10 @@ Signed-off-by: Darren Etheridge <detheridge@ti.com>
1 file changed, 31 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
-index a668172..48c4fdc 100644
+index c166b65..e4b8b75 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
-@@ -30,6 +30,8 @@ struct tilcdc_crtc {
+@@ -31,6 +31,8 @@ struct tilcdc_crtc {
int dpms;
wait_queue_head_t frame_done_wq;
bool frame_done;
@@ -26,7 +26,7 @@ index a668172..48c4fdc 100644
/* fb currently set to scanout 0/1: */
struct drm_framebuffer *scanout[2];
-@@ -102,10 +104,23 @@ static void update_scanout(struct drm_crtc *crtc)
+@@ -103,10 +105,23 @@ static void update_scanout(struct drm_crtc *crtc)
(crtc->mode.vdisplay * fb->pitches[0]);
if (tilcdc_crtc->dpms == DRM_MODE_DPMS_ON) {
@@ -53,7 +53,7 @@ index a668172..48c4fdc 100644
drm_vblank_get(dev, 0);
} else {
/* not enabled yet, so update registers immediately: */
-@@ -612,6 +627,7 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc)
+@@ -613,6 +628,7 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc)
struct drm_device *dev = crtc->dev;
struct tilcdc_drm_private *priv = dev->dev_private;
uint32_t stat = tilcdc_read_irqstatus(dev);
@@ -61,7 +61,7 @@ index a668172..48c4fdc 100644
if ((stat & LCDC_SYNC_LOST) && (stat & LCDC_FIFO_UNDERFLOW)) {
stop(crtc);
-@@ -627,11 +643,19 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc)
+@@ -628,11 +644,19 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc)
tilcdc_clear_irqstatus(dev, stat);
@@ -83,9 +83,9 @@ index a668172..48c4fdc 100644
drm_handle_vblank(dev, 0);
-@@ -705,6 +729,8 @@ struct drm_crtc *tilcdc_crtc_create(struct drm_device *dev)
- goto fail;
- }
+@@ -702,6 +726,8 @@ struct drm_crtc *tilcdc_crtc_create(struct drm_device *dev)
+ drm_flip_work_init(&tilcdc_crtc->unref_work,
+ "unref", unref_worker);
+ spin_lock_init(&tilcdc_crtc->irq_lock);
+
@@ -93,5 +93,5 @@ index a668172..48c4fdc 100644
if (ret < 0)
goto fail;
--
-2.0.1
+2.1.4
diff --git a/version.sh b/version.sh
index 24efcfd68..517cfd221 100644
--- a/version.sh
+++ b/version.sh
@@ -27,7 +27,7 @@ toolchain="gcc_linaro_gnueabihf_4_9"
#Kernel/Build
KERNEL_REL=3.19
KERNEL_TAG=${KERNEL_REL}-rc3
-BUILD=bone1
+BUILD=bone1.1
#v3.X-rcX + upto SHA
#KERNEL_SHA=""
--
GitLab