From 3a81dbb2504c2c54e5fdb757a56ca4f98b45d7c7 Mon Sep 17 00:00:00 2001
From: Luc Verhaegen <libv@codethink.co.uk>
Date: Fri, 1 Apr 2011 13:50:10 +0200
Subject: [PATCH 01/16] gpu: pvr: fix pdumpfs_stream_buffer_clear

Fix tmp[] filling loop so that size == sizeof(tmp) also functions
correctly.

Spotted-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
Signed-off-by: Luc Verhaegen <libv@codethink.co.uk>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
---
 pvr/pvr_pdumpfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pvr/pvr_pdumpfs.c b/pvr/pvr_pdumpfs.c
index 6050fd3..c1b7df5 100644
--- a/pvr/pvr_pdumpfs.c
+++ b/pvr/pvr_pdumpfs.c
@@ -786,7 +786,7 @@ pdumpfs_stream_buffer_clear(char __user *buf, size_t size)
 	if (size >= sizeof(tmp)) {
 		int i;
 
-		for (i = 0; (i  + sizeof(tmp)) < size; i += sizeof(tmp))
+		for (i = 0; (i  + sizeof(tmp)) <= size; i += sizeof(tmp))
 			if (copy_to_user(buf + i, tmp, sizeof(tmp)))
 				return -EFAULT;
 		return i;
-- 
2.39.5


From 3da17c84d6dcdb0357aa1f2fa175b86af1cef28e Mon Sep 17 00:00:00 2001
From: Imre Deak <imre.deak@nokia.com>
Date: Tue, 19 Apr 2011 19:57:42 +0300
Subject: [PATCH 02/16] gpu: pvr: fix missing return value warning when
 CONFIG_BUG=n

Although the behaviour after these functions return in a BUG() condition
is undefined, we could still make things somewhat more predictable by
returning the same value every time. Also this way we get rid of the
warning.

Signed-off-by: Imre Deak <imre.deak@nokia.com>
---
 pvr/pvr_debugfs.c | 2 ++
 pvr/sysconfig.c   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pvr/pvr_debugfs.c b/pvr/pvr_debugfs.c
index 9636d02..32ca6c3 100644
--- a/pvr/pvr_debugfs.c
+++ b/pvr/pvr_debugfs.c
@@ -109,6 +109,8 @@ static int pvr_debugfs_reset_wrapper(void *data, u64 val)
 		return pvr_debugfs_reset(data, val);
 
 	BUG();
+
+	return -EFAULT;
 }
 
 DEFINE_SIMPLE_ATTRIBUTE(pvr_debugfs_reset_fops, NULL,
diff --git a/pvr/sysconfig.c b/pvr/sysconfig.c
index 94f18f6..2a31b70 100644
--- a/pvr/sysconfig.c
+++ b/pvr/sysconfig.c
@@ -160,6 +160,8 @@ unsigned long sgx_get_max_freq(void)
 		}
 	}
 	BUG();
+
+	return 0;
 }
 
 #else
-- 
2.39.5


From 39828db15f6680fbe6beea814eea20fdf9314d97 Mon Sep 17 00:00:00 2001
From: Alex Crowther <alex.crowther@imgtec.com>
Date: Mon, 23 May 2011 12:46:17 +0100
Subject: [PATCH 03/16] gpu: pvr: V2: Find and fix all incorrect sync counter
 completion checks

Bugfix for a very rare buffer wrap issue on sync counters
though the use of the wrap safe sync_cnt_after_eq function

Fixes: NB#233069
Signed-off-by: Alex Crowther <alex.crowther@imgtec.com>
---
 pvr/sgxutils.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pvr/sgxutils.c b/pvr/sgxutils.c
index 860cbb6..b5e5b7d 100644
--- a/pvr/sgxutils.c
+++ b/pvr/sgxutils.c
@@ -644,16 +644,26 @@ enum PVRSRV_ERROR SGXUnregisterHWTransferContextKM(void *hHWTransferContext)
 	return PVRSRV_OK;
 }
 
+
+
+static inline int sync_cnt_after_eq(u32 c1, u32 c2)
+{
+	return (int)(c1 - c2) >= 0;
+}
+
+
+
 static inline IMG_BOOL SGX2DQuerySyncOpsComplete(
 				struct PVRSRV_KERNEL_SYNC_INFO *psSyncInfo,
 				u32 ui32ReadOpsPending, u32 ui32WriteOpsPending)
 {
 	struct PVRSRV_SYNC_DATA *psSyncData = psSyncInfo->psSyncData;
 
-	return (IMG_BOOL)((psSyncData->ui32ReadOpsComplete >=
-				ui32ReadOpsPending) &&
-			   (psSyncData->ui32WriteOpsComplete >=
-				ui32WriteOpsPending));
+	return (IMG_BOOL)(
+		sync_cnt_after_eq(
+			psSyncData->ui32ReadOpsComplete, ui32ReadOpsPending) &&
+		sync_cnt_after_eq(
+			psSyncData->ui32WriteOpsComplete, ui32WriteOpsPending));
 }
 
 enum PVRSRV_ERROR SGX2DQueryBlitsCompleteKM(
-- 
2.39.5


From 68eb886306bab51a43cb326ccafc0244f9f8e4e5 Mon Sep 17 00:00:00 2001
From: Luc Verhaegen <libv@codethink.co.uk>
Date: Wed, 18 May 2011 10:01:40 +0200
Subject: [PATCH 04/16] gpu: pvr: kick: check for duplicate src syncs

When duplicate syncs are present, we deadlock; so check and throw an error
message. Was already fixed in userspace as part of #253237, this now shores
up the kernel too.

Fixes: NB#254225

Signed-off-by: Luc Verhaegen <libv@codethink.co.uk>
---
 pvr/sgxkick.c | 45 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/pvr/sgxkick.c b/pvr/sgxkick.c
index 0a951e0..c3891a6 100644
--- a/pvr/sgxkick.c
+++ b/pvr/sgxkick.c
@@ -160,31 +160,50 @@ enum PVRSRV_ERROR SGXDoKickKM(void *hDevHandle, struct SGX_CCB_KICK *psCCBKick,
 		}
 	}
 
-	psTACmd->ui32NumSrcSyncs = psCCBKick->ui32NumSrcSyncs;
-	for (i = 0; i < SGX_MAX_SRC_SYNCS; i++) {
-		if (i >= psCCBKick->ui32NumSrcSyncs) {
-			pvr_trcmd_clear_syn(&ktrace->src_syn[i]);
-			continue;
+	/* check for duplicates while creating the new list */
+	psTACmd->ui32NumSrcSyncs = 0;
+	for (i = 0; ((i < SGX_MAX_SRC_SYNCS) &&
+		     (i < psCCBKick->ui32NumSrcSyncs)); i++) {
+		int j;
+
+		psSyncInfo = (struct PVRSRV_KERNEL_SYNC_INFO *)
+			psCCBKick->ahSrcKernelSyncInfo[i];
+
+		for (j = 0; j < i; j++) {
+			struct PVRSRV_KERNEL_SYNC_INFO *tmp =
+				psCCBKick->ahSrcKernelSyncInfo[j];
+			if (tmp->psSyncData == psSyncInfo->psSyncData) {
+				pr_err("%s: Duplicate SRC Sync detected: %p\n",
+				       __func__, tmp->psSyncData);
+				break;
+			}
 		}
+		if (j != i)
+			continue;
 
-		psSyncInfo =
-		    (struct PVRSRV_KERNEL_SYNC_INFO *)psCCBKick->
-		    ahSrcKernelSyncInfo[i];
+		/* beat the 80 char limit. */
+		j = psTACmd->ui32NumSrcSyncs;
 
-		psTACmd->asSrcSyncs[i].sWriteOpsCompleteDevVAddr =
+		psTACmd->asSrcSyncs[j].sWriteOpsCompleteDevVAddr =
 			psSyncInfo->sWriteOpsCompleteDevVAddr;
-		psTACmd->asSrcSyncs[i].sReadOpsCompleteDevVAddr =
+		psTACmd->asSrcSyncs[j].sReadOpsCompleteDevVAddr =
 			psSyncInfo->sReadOpsCompleteDevVAddr;
 
-		psTACmd->asSrcSyncs[i].ui32ReadOpsPendingVal =
+		psTACmd->asSrcSyncs[j].ui32ReadOpsPendingVal =
 			psSyncInfo->psSyncData->ui32ReadOpsPending++;
 
-		psTACmd->asSrcSyncs[i].ui32WriteOpsPendingVal =
+		psTACmd->asSrcSyncs[j].ui32WriteOpsPendingVal =
 			psSyncInfo->psSyncData->ui32WriteOpsPending;
 
-		pvr_trcmd_set_syn(&ktrace->src_syn[i], psSyncInfo);
+		pvr_trcmd_set_syn(&ktrace->src_syn[j], psSyncInfo);
+
+		psTACmd->ui32NumSrcSyncs++;
 	}
 
+	/* clear the remaining src syncs */
+	for (i = psTACmd->ui32NumSrcSyncs; i < SGX_MAX_SRC_SYNCS; i++)
+		pvr_trcmd_clear_syn(&ktrace->src_syn[i]);
+
 	if (psCCBKick->bFirstKickOrResume &&
 	    psCCBKick->ui32NumDstSyncObjects > 0) {
 		struct PVRSRV_KERNEL_MEM_INFO *psHWDstSyncListMemInfo =
-- 
2.39.5


From b929baebed31b165151dd3d528d1de7e16021d0e Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sat, 19 May 2012 18:07:57 +0300
Subject: [PATCH 05/16] merge in sgx-util.h from n900 tree

---
 pvr/omaplfb_displayclass.c | 39 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/pvr/omaplfb_displayclass.c b/pvr/omaplfb_displayclass.c
index 4348b2e..ae6cce4 100644
--- a/pvr/omaplfb_displayclass.c
+++ b/pvr/omaplfb_displayclass.c
@@ -33,7 +33,6 @@
 #include <linux/notifier.h>
 
 #include <asm/div64.h>
-#include <video/sgx-util.h>
 
 #include "img_defs.h"
 #include "servicesext.h"
@@ -48,6 +47,44 @@ static int fb_idx;
 
 static IMG_BOOL (*pfnGetPVRJTable)(struct PVRSRV_DC_DISP2SRV_KMJTABLE *);
 
+#define OMAPLFB_PAGE_SIZE 4096
+
+/* Greatest common divisor */
+static unsigned long gcd(unsigned long a, unsigned long b)
+{
+	unsigned long r;
+
+	if (a < b) {
+		r = a;
+		a = b;
+		b = r;
+	}
+
+	while ((r = a % b) != 0) {
+		a = b;
+		b = r;
+	}
+
+	return b;
+}
+
+/*
+ * Workout the smallest size that is aligned to both 4K (for the SGX)
+ * and line length (for the fbdev driver).
+ */
+static unsigned int sgx_buffer_align(unsigned stride, unsigned size)
+{
+	unsigned lcm;
+
+	if (!stride || !size)
+		return 0;
+
+	lcm = stride * OMAPLFB_PAGE_SIZE / gcd(stride,
+					       OMAPLFB_PAGE_SIZE);
+
+	return roundup(size, lcm);
+}
+
 static struct OMAPLFB_DEVINFO *GetAnchorPtr(void)
 {
 	return (struct OMAPLFB_DEVINFO *)gpvAnchor;
-- 
2.39.5


From 63ea98926d59650837225d264d56007983d73c48 Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sat, 19 May 2012 22:51:26 +0300
Subject: [PATCH 06/16] make driver standalone again

---
 pvr/module.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pvr/module.c b/pvr/module.c
index da8e944..df050af 100644
--- a/pvr/module.c
+++ b/pvr/module.c
@@ -227,6 +227,21 @@ static struct platform_driver pvr_driver = {
 	.shutdown	= pvr_shutdown,
 };
 
+static void pvr_dummy_release(struct device *dev)
+{
+}
+
+static struct sgx_platform_data pvr_pdata;
+
+static struct platform_device pvr_device = {
+	.name		= DRVNAME,
+	.id		= -1,
+	.dev		= {
+		.platform_data	= &pvr_pdata,
+		.release 	= pvr_dummy_release,
+	}
+};
+
 static int __init pvr_init(void)
 {
 	int error;
@@ -260,10 +275,17 @@ static int __init pvr_init(void)
 	if (error < 0)
 		goto err4;
 
+	pvr_pdata.fclock_max = 200000000;
+	error = platform_device_register(&pvr_device);
+	if (error < 0)
+		goto err5;
+
 	pvr_init_events();
 
 	return 0;
 
+err5:
+	platform_driver_unregister(&pvr_driver);
 err4:
 	PVRMMapCleanup();
 	LinuxBridgeDeInit();
@@ -284,6 +306,7 @@ static void __exit pvr_cleanup(void)
 	pvr_exit_events();
 
 	platform_driver_unregister(&pvr_driver);
+	platform_device_unregister(&pvr_device);
 
 	PVRMMapCleanup();
 	LinuxMMCleanup();
-- 
2.39.5


From 7a6a1afb6ce11e70a02825dda88360eb5a781dfc Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sat, 19 May 2012 22:52:27 +0300
Subject: [PATCH 07/16] remove use of features missing in mainline

---
 pvr/pvr_events.c | 8 ++++++--
 pvr/sysutils.c   | 9 +++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pvr/pvr_events.c b/pvr/pvr_events.c
index e5a7b1c..6b945df 100644
--- a/pvr/pvr_events.c
+++ b/pvr/pvr_events.c
@@ -96,6 +96,7 @@ int pvr_flip_event_req(struct PVRSRV_FILE_PRIVATE_DATA *priv,
 			 unsigned int overlay,
 			 enum pvr_sync_wait_seq_type type, u64 user_data)
 {
+#if 0
 	struct pvr_pending_flip_event *e;
 	struct timeval now;
 	unsigned long flags;
@@ -139,6 +140,9 @@ int pvr_flip_event_req(struct PVRSRV_FILE_PRIVATE_DATA *priv,
 	spin_unlock_irqrestore(&event_lock, flags);
 
 	return omap_dss_request_notify(e->dss_event, overlay);
+#else
+	return -EFAULT;
+#endif
 }
 
 static bool pvr_dequeue_event(struct PVRSRV_FILE_PRIVATE_DATA *priv,
@@ -333,10 +337,10 @@ void pvr_init_events(void)
 	INIT_LIST_HEAD(&flip_wait_list);
 
 	dss_nb.notifier_call = dss_notifier_callback;
-	omap_dss_register_notifier(&dss_nb);
+//	omap_dss_register_notifier(&dss_nb);
 }
 
 void pvr_exit_events(void)
 {
-	omap_dss_unregister_notifier(&dss_nb);
+//	omap_dss_unregister_notifier(&dss_nb);
 }
diff --git a/pvr/sysutils.c b/pvr/sysutils.c
index 6e8ceef..a568524 100644
--- a/pvr/sysutils.c
+++ b/pvr/sysutils.c
@@ -80,6 +80,7 @@ void SysGetSGXTimingInformation(struct SGX_TIMING_INFORMATION *psTimingInfo)
 	    SYS_SGX_ACTIVE_POWER_LATENCY_MS;
 }
 
+#if 0
 static int vdd2_post_func(struct notifier_block *n, unsigned long event,
 			  void *ptr)
 {
@@ -183,6 +184,10 @@ static void UnRegisterConstraintNotifications(struct SYS_SPECIFIC_DATA
 
 	clk_notifier_unregister(psSysSpecData->psSGX_FCK, &vdd2_pre_post);
 }
+#else
+#define RegisterConstraintNotifications(x)
+#define UnRegisterConstraintNotifications(x)
+#endif
 
 static struct device sgx_dev;
 static int sgx_clock_enabled;
@@ -285,7 +290,11 @@ static void sgx_lock_perf(struct work_struct *work)
 		high = 0;
 	}
 	if (high != bHigh) {
+#if 0
 		omap_pm_set_min_bus_tput(&sgx_dev, OCP_INITIATOR_AGENT, vdd2);
+#else
+		(void)sgx_dev;
+#endif
 		bHigh = high;
 	}
 
-- 
2.39.5


From 1ab3b0f22522b2b661241459fc4a0ec8f296dc8f Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sat, 19 May 2012 22:55:34 +0300
Subject: [PATCH 08/16] fix out-of-tree build and new kernel support

---
 Makefile                   |  6 +++++
 pvr/Makefile               | 46 +++++++++++++++++++++++++++++++++++++-
 pvr/omaplfb_displayclass.c |  5 +++++
 pvr/omaplfb_linux.c        |  6 +++++
 pvr/pvr_debugfs.c          |  1 +
 pvr/pvr_events.c           |  7 ++++++
 6 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..92787d4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+ifeq ($(MAKECMDGOALS),)
+MAKECMDGOALS = all
+endif
+
+$(MAKECMDGOALS):
+	make -C pvr $@
diff --git a/pvr/Makefile b/pvr/Makefile
index f253168..acdf1db 100644
--- a/pvr/Makefile
+++ b/pvr/Makefile
@@ -1,3 +1,47 @@
+CONFIG_PVR = m
+
+CONFIG_PVR_RELEASE = y
+CONFIG_PVR_DEBUG = n
+CONFIG_PVR_TIMING = n
+
+CONFIG_PVR_DEBUG_EXTRA = n
+CONFIG_PVR_DEBUG_PDUMP = n
+CONFIG_PVR_PDUMP_MODE_STANDARD = n
+CONFIG_PVR_PDUMP_MODE_FULL = n
+CONFIG_PVR_EDM_DEBUG = n
+CONFIG_NO_HARDWARE = n
+CONFIG_PVR_FORCE_CLOCKS_ON = n
+CONFIG_PVR_EXAMPLES = n
+CONFIG_PVR_TRACE_CMD = n
+
+ccflags-$(CONFIG_PVR_DEBUG) += -DCONFIG_PVR_DEBUG
+ccflags-$(CONFIG_PVR_DEBUG_EXTRA) += -DCONFIG_PVR_DEBUG_EXTRA
+ccflags-$(CONFIG_PVR_DEBUG_PDUMP) += -DCONFIG_PVR_DEBUG_PDUMP \
+	-DCONFIG_PVR_PDUMP_INITIAL_MAX_FRAME_COUNT=4
+ccflags-$(CONFIG_PVR_PDUMP_MODE_STANDARD) += -DCONFIG_PVR_PDUMP_MODE_STANDARD
+ccflags-$(CONFIG_PVR_PDUMP_MODE_FULL) += -DCONFIG_PVR_PDUMP_MODE_FULL
+ccflags-$(CONFIG_PVR_EDM_DEBUG) += -DCONFIG_PVR_EDM_DEBUG
+ccflags-$(CONFIG_PVR_EXAMPLES) += -DCONFIG_PVR_EXAMPLES
+ccflags-$(CONFIG_PVR_FORCE_CLOCKS_ON) += -DCONFIG_PVR_FORCE_CLOCKS_ON
+ccflags-$(CONFIG_PVR_NO_HARDWARE) += -DCONFIG_PVR_NO_HARDWARE
+ccflags-$(CONFIG_PVR_RELEASE) += -DCONFIG_PVR_RELEASE
+ccflags-$(CONFIG_PVR_TIMING) += -DCONFIG_PVR_TIMING
+ccflags-$(CONFIG_PVR_TOOLS) += -DCONFIG_PVR_TOOLS
+ccflags-$(CONFIG_PVR_TRACE_CMD) += -DCONFIG_PVR_TRACE_CMD \
+	-DCONFIG_PVR_TRACE_CMD_BUF_SHIFT=3
+
+ccflags-y += -I$(src)/../include
+
+ifeq ($(KERNELRELEASE),)
+all:
+	$(MAKE) -C $(KERNELDIR) M=`pwd` $*
+
+clean:
+	$(MAKE) -C $(KERNELDIR) M=`pwd` clean
+endif
+
+###
+
 obj-$(CONFIG_PVR)	+= omaplfb.o pvrsrvkm.o
 
 omaplfb-objs		:= omaplfb_displayclass.o omaplfb_linux.o
@@ -31,7 +75,7 @@ CBUILD			:= -O2						\
 			   -DPVR_BUILD_DIR="\"$(PVR_BUILD_DIR)\""	\
 			   -DPVR_BUILD_DATE="\"$(DATE)\""
 
-ccflags-y		+= $(CBUILD) -include $(srctree)/$(src)/pvrconfig.h
+ccflags-y		+= $(CBUILD) -include $(src)/pvrconfig.h
 ccflags-y		+= $(ccflags-m)
 
 
diff --git a/pvr/omaplfb_displayclass.c b/pvr/omaplfb_displayclass.c
index ae6cce4..b9d023b 100644
--- a/pvr/omaplfb_displayclass.c
+++ b/pvr/omaplfb_displayclass.c
@@ -39,6 +39,11 @@
 #include "kerneldisplay.h"
 #include "omaplfb.h"
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+#define acquire_console_sem console_lock
+#define release_console_sem console_unlock
+#endif
+
 static void *gpvAnchor;
 
 static int fb_idx;
diff --git a/pvr/omaplfb_linux.c b/pvr/omaplfb_linux.c
index 9ed02c5..b79a59e 100644
--- a/pvr/omaplfb_linux.c
+++ b/pvr/omaplfb_linux.c
@@ -43,7 +43,13 @@
 #include "omaplfb.h"
 #include "pvrmodule.h"
 
+#if   (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0))
+#include <video/omapdss.h>
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32))
 #include <plat/display.h>
+#else
+#include <mach/display.h>
+#endif
 
 MODULE_SUPPORTED_DEVICE(DEVNAME);
 
diff --git a/pvr/pvr_debugfs.c b/pvr/pvr_debugfs.c
index 32ca6c3..d1493fb 100644
--- a/pvr/pvr_debugfs.c
+++ b/pvr/pvr_debugfs.c
@@ -23,6 +23,7 @@
  *
  */
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/debugfs.h>
 #include <linux/vmalloc.h>
 #include <linux/mutex.h>
diff --git a/pvr/pvr_events.c b/pvr/pvr_events.c
index 6b945df..b2f6046 100644
--- a/pvr/pvr_events.c
+++ b/pvr/pvr_events.c
@@ -14,8 +14,15 @@
 #include <linux/fs.h>
 #include <linux/notifier.h>
 #include <linux/slab.h>
+#include <linux/version.h>
 
+#if   (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0))
+#include <video/omapdss.h>
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32))
 #include <plat/display.h>
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))
+#include <mach/display.h>
+#endif
 
 static spinlock_t event_lock;
 static struct list_head sync_wait_list;
-- 
2.39.5


From 046cdeba2b0eb0b54408bc2b9edfa36553afddd4 Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Mon, 21 May 2012 00:46:11 +0300
Subject: [PATCH 09/16] Revert "gpu: pvr: remove build time ABI dependency on
 the EDM trace option"

This reverts commit 07595a8ba9f04efa1ff92e5cc7f3b386a34fc510.
---
 pvr/bridged_sgx_bridge.c | 37 +++++++++++++++++++++----------------
 pvr/sgx_options.h        |  4 ++++
 pvr/sgxinfo.h            |  4 ++++
 pvr/sgxinfokm.h          |  3 ++-
 pvr/sgxinit.c            |  5 ++++-
 5 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/pvr/bridged_sgx_bridge.c b/pvr/bridged_sgx_bridge.c
index 14f0aad..06db387 100644
--- a/pvr/bridged_sgx_bridge.c
+++ b/pvr/bridged_sgx_bridge.c
@@ -550,7 +550,6 @@ int SGXDevInitPart2BW(u32 ui32BridgeID,
 	IMG_BOOL bLookupFailed = IMG_FALSE;
 	IMG_BOOL bReleaseFailed = IMG_FALSE;
 	void *hDummy;
-	void **edm_mi;
 	u32 i;
 
 	PVRSRV_BRIDGE_ASSERT_CMD(ui32BridgeID, PVRSRV_BRIDGE_SGX_DEVINITPART2);
@@ -609,12 +608,13 @@ int SGXDevInitPart2BW(u32 ui32BridgeID,
 				    PVRSRV_HANDLE_TYPE_MEM_INFO);
 	bLookupFailed |= (IMG_BOOL) (eError != PVRSRV_OK);
 
-	edm_mi = &psSGXDevInitPart2IN->sInitInfo.hKernelEDMStatusBufferMemInfo;
-	if (*edm_mi) {
-		eError = PVRSRVLookupHandle(psPerProc->psHandleBase, &hDummy,
-					  *edm_mi, PVRSRV_HANDLE_TYPE_MEM_INFO);
-		bLookupFailed |= eError != PVRSRV_OK;
-	}
+#if defined(PVRSRV_USSE_EDM_STATUS_DEBUG)
+	eError = PVRSRVLookupHandle(psPerProc->psHandleBase, &hDummy,
+				    psSGXDevInitPart2IN->sInitInfo.
+					    hKernelEDMStatusBufferMemInfo,
+				    PVRSRV_HANDLE_TYPE_MEM_INFO);
+	bLookupFailed |= (IMG_BOOL) (eError != PVRSRV_OK);
+#endif
 
 	for (i = 0; i < SGX_MAX_INIT_MEM_HANDLES; i++) {
 		void *hHandle =
@@ -692,12 +692,15 @@ int SGXDevInitPart2BW(u32 ui32BridgeID,
 					      PVRSRV_HANDLE_TYPE_MEM_INFO);
 	bReleaseFailed |= (IMG_BOOL)(eError != PVRSRV_OK);
 
-	if (*edm_mi) {
-		eError = PVRSRVLookupAndReleaseHandle(psPerProc->psHandleBase,
-					      edm_mi, *edm_mi,
+#if defined(PVRSRV_USSE_EDM_STATUS_DEBUG)
+	eError = PVRSRVLookupAndReleaseHandle(psPerProc->psHandleBase,
+					      &psSGXDevInitPart2IN->sInitInfo.
+						  hKernelEDMStatusBufferMemInfo,
+					      psSGXDevInitPart2IN->sInitInfo.
+						  hKernelEDMStatusBufferMemInfo,
 					      PVRSRV_HANDLE_TYPE_MEM_INFO);
-		bReleaseFailed |= eError != PVRSRV_OK;
-	}
+	bReleaseFailed |= (IMG_BOOL)(eError != PVRSRV_OK);
+#endif
 
 	for (i = 0; i < SGX_MAX_INIT_MEM_HANDLES; i++) {
 		void **phHandle =
@@ -756,10 +759,12 @@ int SGXDevInitPart2BW(u32 ui32BridgeID,
 						hKernelHWPerfCBMemInfo);
 	bDissociateFailed |= (IMG_BOOL) (eError != PVRSRV_OK);
 
-	if (*edm_mi) {
-		eError = PVRSRVDissociateDeviceMemKM(hDevCookieInt, *edm_mi);
-		bDissociateFailed |= eError != PVRSRV_OK;
-	}
+#if defined(PVRSRV_USSE_EDM_STATUS_DEBUG)
+	eError = PVRSRVDissociateDeviceMemKM(hDevCookieInt,
+					psSGXDevInitPart2IN->sInitInfo.
+						hKernelEDMStatusBufferMemInfo);
+	bDissociateFailed |= (IMG_BOOL) (eError != PVRSRV_OK);
+#endif
 
 	for (i = 0; i < SGX_MAX_INIT_MEM_HANDLES; i++) {
 		void *hHandle =
diff --git a/pvr/sgx_options.h b/pvr/sgx_options.h
index 858c1e9..67402fe 100644
--- a/pvr/sgx_options.h
+++ b/pvr/sgx_options.h
@@ -38,8 +38,12 @@
 #define OPTIONS_BIT1					0x0
 #endif
 
+#if defined(PVRSRV_USSE_EDM_STATUS_DEBUG) || defined(INTERNAL_TEST)
 #define PVRSRV_USSE_EDM_STATUS_DEBUG_SET_OFFSET		OPTIONS_BIT2
 #define OPTIONS_BIT2					(0x1 << 2)
+#else
+#define OPTIONS_BIT2					0x0
+#endif
 
 #define SUPPORT_HW_RECOVERY_SET_OFFSET			OPTIONS_BIT3
 #define OPTIONS_BIT3					(0x1 << 3)
diff --git a/pvr/sgxinfo.h b/pvr/sgxinfo.h
index 8310244..3e6d0d0 100644
--- a/pvr/sgxinfo.h
+++ b/pvr/sgxinfo.h
@@ -56,7 +56,9 @@ struct SGX_BRIDGE_INIT_INFO {
 	u32 ui32HostKickAddress;
 	u32 ui32GetMiscInfoAddress;
 	void *hKernelHWPerfCBMemInfo;
+#if defined(PVRSRV_USSE_EDM_STATUS_DEBUG)
 	void *hKernelEDMStatusBufferMemInfo;
+#endif
 
 	u32 ui32EDMTaskReg0;
 	u32 ui32EDMTaskReg1;
@@ -197,8 +199,10 @@ struct SGXMKIF_HOST_CTL {
 
 	u32 ui32HWPerfFlags;
 
+#if defined(PVRSRV_USSE_EDM_STATUS_DEBUG)
 	/* !< See SGXMK_STATUS_BUFFER */
 	struct IMG_DEV_VIRTADDR sEDMStatusBuffer;
+#endif
 
 	/*< to count time wraps in the Timer task */
 	u32 ui32TimeWraps;
diff --git a/pvr/sgxinfokm.h b/pvr/sgxinfokm.h
index 2517e04..52efbbe 100644
--- a/pvr/sgxinfokm.h
+++ b/pvr/sgxinfokm.h
@@ -99,9 +99,10 @@ struct PVRSRV_SGXDEV_INFO {
 	struct PVRSRV_SGXDEV_DIFF_INFO sDiffInfo;
 	u32 ui32HWGroupRequested;
 	u32 ui32HWReset;
-
+#ifdef PVRSRV_USSE_EDM_STATUS_DEBUG
 	/*!< Meminfo for EDM status buffer */
 	struct PVRSRV_KERNEL_MEM_INFO *psKernelEDMStatusBufferMemInfo;
+#endif
 
 	u32 ui32ClientRefCount;
 
diff --git a/pvr/sgxinit.c b/pvr/sgxinit.c
index 3cd70ec..7b932f5 100644
--- a/pvr/sgxinit.c
+++ b/pvr/sgxinit.c
@@ -134,8 +134,11 @@ static enum PVRSRV_ERROR InitDevInfo(struct PVRSRV_PER_PROCESS_DATA *psPerProc,
 
 	psDevInfo->psKernelHWPerfCBMemInfo =
 	    (struct PVRSRV_KERNEL_MEM_INFO *)psInitInfo->hKernelHWPerfCBMemInfo;
+#ifdef PVRSRV_USSE_EDM_STATUS_DEBUG
 	psDevInfo->psKernelEDMStatusBufferMemInfo =
-				    psInitInfo->hKernelEDMStatusBufferMemInfo;
+	    (struct PVRSRV_KERNEL_MEM_INFO *)psInitInfo->
+						  hKernelEDMStatusBufferMemInfo;
+#endif
 
 	eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
 			    sizeof(struct PVRSRV_SGX_CCB_INFO),
-- 
2.39.5


From 777269388c1d7afd05d7175976e7e444a068449c Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sun, 20 May 2012 02:36:56 +0300
Subject: [PATCH 10/16] try to make ABI compatible with TI
 1.4.14.2616/4_00_00_01 release

---
 pvr/bridged_pvr_bridge.c |  5 ++++-
 pvr/bridged_sgx_bridge.c | 14 ++++++++++++--
 pvr/pvr_bridge.h         |  6 +++++-
 pvr/sgx_bridge.h         |  4 +++-
 pvr/sgxapi_km.h          |  4 ++++
 pvr/sgxinit.c            |  5 ++++-
 6 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/pvr/bridged_pvr_bridge.c b/pvr/bridged_pvr_bridge.c
index 49f39c0..b89f9a0 100644
--- a/pvr/bridged_pvr_bridge.c
+++ b/pvr/bridged_pvr_bridge.c
@@ -681,6 +681,7 @@ static int PVRSRVUnmapDeviceMemoryBW(u32 ui32BridgeID,
 	return 0;
 }
 
+#if 0
 static int FlushCacheDRI(u32 ui32Type, u32 ui32Virt, u32 ui32Length)
 {
 	switch (ui32Type) {
@@ -740,6 +741,7 @@ static int PVRSRVCacheFlushDRIBW(u32 ui32BridgeID,
 
 	return 0;
 }
+#endif
 
 static int PVRSRVMapDeviceClassMemoryBW(u32 ui32BridgeID,
 	   struct PVRSRV_BRIDGE_IN_MAP_DEVICECLASS_MEMORY *psMapDevClassMemIN,
@@ -2717,10 +2719,11 @@ static int bridged_ioctl(struct file *filp, u32 cmd, void *in, void *out,
 	case PVRSRV_BRIDGE_RELEASE_MMAP_DATA:
 		err = PVRMMapReleaseMMapDataBW(cmd, in, out, per_proc);
 		break;
+#if 0
 	case PVRSRV_BRIDGE_CACHE_FLUSH_DRM:
 		err = PVRSRVCacheFlushDRIBW(cmd, in, out, per_proc);
 		break;
-
+#endif
 	case PVRSRV_BRIDGE_PROCESS_SIMISR_EVENT:
 	case PVRSRV_BRIDGE_REGISTER_SIM_PROCESS:
 	case PVRSRV_BRIDGE_UNREGISTER_SIM_PROCESS:
diff --git a/pvr/bridged_sgx_bridge.c b/pvr/bridged_sgx_bridge.c
index 06db387..126fdb9 100644
--- a/pvr/bridged_sgx_bridge.c
+++ b/pvr/bridged_sgx_bridge.c
@@ -1052,7 +1052,12 @@ int SGX2DQueryBlitsCompleteBW(struct file *filp, u32 ui32BridgeID,
 				       (long)ps2DQueryBltsCompleteIN->
 						       hKernSyncInfo,
 				       ps2DQueryBltsCompleteIN->type,
-				       ps2DQueryBltsCompleteIN->user_data))
+#if 0
+				       ps2DQueryBltsCompleteIN->user_data
+#else
+				       0
+#endif
+					   ))
 			psRetOUT->eError = PVRSRV_ERROR_OUT_OF_MEMORY;
 
 		return 0;
@@ -1072,7 +1077,12 @@ int SGX2DQueryBlitsCompleteBW(struct file *filp, u32 ui32BridgeID,
 	if (ps2DQueryBltsCompleteIN->type == _PVR_SYNC_WAIT_EVENT) {
 		if (pvr_sync_event_req(priv,
 				(struct PVRSRV_KERNEL_SYNC_INFO *)pvSyncInfo,
-				ps2DQueryBltsCompleteIN->user_data))
+#if 0
+				ps2DQueryBltsCompleteIN->user_data
+#else
+				0
+#endif
+				))
 			psRetOUT->eError = PVRSRV_ERROR_OUT_OF_MEMORY;
 		else
 			trace_query_cmd(psPerProc,
diff --git a/pvr/pvr_bridge.h b/pvr/pvr_bridge.h
index 22dd20f..da1a2d4 100644
--- a/pvr/pvr_bridge.h
+++ b/pvr/pvr_bridge.h
@@ -101,11 +101,15 @@
 		PVRSRV_IOWR(PVRSRV_BRIDGE_CORE_CMD_FIRST+26)
 #define PVRSRV_BRIDGE_RELEASE_MMAP_DATA				\
 		PVRSRV_IOWR(PVRSRV_BRIDGE_CORE_CMD_FIRST+27)
+#if 0
 #define PVRSRV_BRIDGE_CACHE_FLUSH_DRM				\
 		PVRSRV_IOWR(PVRSRV_BRIDGE_CORE_CMD_FIRST+28)
 #define PVRSRV_BRIDGE_CORE_CMD_LAST				\
 		(PVRSRV_BRIDGE_CORE_CMD_FIRST+28)
-
+#else
+#define PVRSRV_BRIDGE_CORE_CMD_LAST				\
+		(PVRSRV_BRIDGE_CORE_CMD_FIRST+27)
+#endif
 #define PVRSRV_BRIDGE_SIM_CMD_FIRST				\
 		(PVRSRV_BRIDGE_CORE_CMD_LAST+1)
 #define PVRSRV_BRIDGE_PROCESS_SIMISR_EVENT			\
diff --git a/pvr/sgx_bridge.h b/pvr/sgx_bridge.h
index 1bb3209..d06e3e1 100644
--- a/pvr/sgx_bridge.h
+++ b/pvr/sgx_bridge.h
@@ -228,8 +228,8 @@ struct PVRSRV_BRIDGE_IN_SGXDEVINITPART2 {
 };
 
 enum pvr_sync_wait_seq_type {
+	_PVR_SYNC_WAIT_NONBLOCK = 0,
 	_PVR_SYNC_WAIT_BLOCK,
-	_PVR_SYNC_WAIT_NONBLOCK,
 	_PVR_SYNC_WAIT_EVENT,
 	_PVR_SYNC_WAIT_FLIP,
 	_PVR_SYNC_WAIT_UPDATE,
@@ -239,7 +239,9 @@ struct PVRSRV_BRIDGE_IN_2DQUERYBLTSCOMPLETE {
 	u32 ui32BridgeFlags;
 	void *hDevCookie;
 	void *hKernSyncInfo;
+#if 0
 	u64 user_data;
+#endif
 	enum pvr_sync_wait_seq_type type;
 };
 
diff --git a/pvr/sgxapi_km.h b/pvr/sgxapi_km.h
index 39ec960..7e6c82b 100644
--- a/pvr/sgxapi_km.h
+++ b/pvr/sgxapi_km.h
@@ -51,7 +51,11 @@
 #define SGX_MAX_HEAP_ID					10
 
 #define SGX_MAX_TA_STATUS_VALS				32
+#if 0
 #define SGX_MAX_3D_STATUS_VALS				4
+#else
+#define SGX_MAX_3D_STATUS_VALS				2
+#endif
 
 #define SGX_MAX_SRC_SYNCS				4
 
diff --git a/pvr/sgxinit.c b/pvr/sgxinit.c
index 7b932f5..28ded53 100644
--- a/pvr/sgxinit.c
+++ b/pvr/sgxinit.c
@@ -1300,7 +1300,8 @@ enum PVRSRV_ERROR SGXDevInitCompatCheck(struct PVRSRV_DEVICE_NODE *psDeviceNode)
 	if ((psSGXFeatures->ui32DDKVersion !=
 	     ((PVRVERSION_MAJ << 16) | (PVRVERSION_MIN << 8) |
 	      PVRVERSION_BRANCH)) ||
-	     (psSGXFeatures->ui32DDKBuild != PVRVERSION_BUILD)) {
+	     (psSGXFeatures->ui32DDKBuild != PVRVERSION_BUILD &&
+	      psSGXFeatures->ui32DDKBuild != 2616)) {
 		pr_err("pvr: incompatible driver DDK revision (%d)"
 			"/device DDK revision (%d).\n",
 			 PVRVERSION_BUILD, psSGXFeatures->ui32DDKBuild);
@@ -1314,8 +1315,10 @@ enum PVRSRV_ERROR SGXDevInitCompatCheck(struct PVRSRV_DEVICE_NODE *psDeviceNode)
 
 	opts = psSGXFeatures->ui32BuildOptions;
 	opt_mismatch = opts ^ SGX_BUILD_OPTIONS;
+#if 0
 	/* we support the ABIs both with and without EDM tracing option */
 	opt_mismatch &= ~PVRSRV_USSE_EDM_STATUS_DEBUG_SET_OFFSET;
+#endif
 	if (opt_mismatch) {
 		if (SGX_BUILD_OPTIONS & opt_mismatch)
 			pr_err("pvr: mismatch in driver and microkernel build "
-- 
2.39.5


From 5867a7d8179db0e2c40b5e2f3eaa73534c613f02 Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sun, 20 May 2012 19:51:23 +0300
Subject: [PATCH 11/16] support multibuffering with panning

it seems performance goes down to ~50% for some things without
multibuffering, weird..
---
 pvr/omaplfb.h              |  1 +
 pvr/omaplfb_displayclass.c | 48 ++++++++++++++++++++++++++++++++++++++
 pvr/omaplfb_linux.c        |  1 +
 3 files changed, 50 insertions(+)

diff --git a/pvr/omaplfb.h b/pvr/omaplfb.h
index 34e7a6d..72bffdb 100644
--- a/pvr/omaplfb.h
+++ b/pvr/omaplfb.h
@@ -107,6 +107,7 @@ struct OMAPLFB_DEVINFO {
 	struct IMG_DEV_VIRTADDR sDisplayDevVAddr;
 	struct fb_info *psLINFBInfo;
 	struct notifier_block sLINNotifBlock;
+	struct fb_var_screeninfo local_var;
 };
 
 #define	OMAPLFB_PAGE_SIZE 4096
diff --git a/pvr/omaplfb_displayclass.c b/pvr/omaplfb_displayclass.c
index b9d023b..5fffc42 100644
--- a/pvr/omaplfb_displayclass.c
+++ b/pvr/omaplfb_displayclass.c
@@ -386,6 +386,25 @@ static enum PVRSRV_ERROR CreateDCSwapChain(void *hDevice, u32 ui32Flags,
 
 	*phSwapChain = (void *) psSwapChain;
 
+	i = psDevInfo->sFBInfo.ui32RoundedBufferSize * ui32BufferCount /
+		psDevInfo->sFBInfo.ui32ByteStride;
+	DEBUG_PRINTK((KERN_INFO DRIVER_PREFIX "%s: yres %u\n", __func__, i));
+
+	/* tell userspace that some amount of virtual res is used */
+	if (psDevInfo->psLINFBInfo->var.yres_virtual < i) {
+		int ret;
+
+		acquire_console_sem();
+		psDevInfo->psLINFBInfo->var.yres_virtual = i;
+		ret = fb_set_var(psDevInfo->psLINFBInfo,
+			&psDevInfo->psLINFBInfo->var);
+		release_console_sem();
+		if (ret)
+			printk(KERN_WARNING DRIVER_PREFIX
+			       ": fb_set_var failed (%d)", ret);
+	}
+	psDevInfo->local_var = psDevInfo->psLINFBInfo->var;
+
 	return PVRSRV_OK;
 
 ErrorFreeBuffer:
@@ -417,6 +436,12 @@ static enum PVRSRV_ERROR DestroyDCSwapChain(void *hDevice, void *hSwapChain)
 
 	psDevInfo->psSwapChain = NULL;
 
+	acquire_console_sem();
+	psDevInfo->local_var.yoffset = 0;
+	psDevInfo->psLINFBInfo->fbops->fb_pan_display(
+		&psDevInfo->local_var, psDevInfo->psLINFBInfo);
+	release_console_sem();
+
 	OMAPLFBFreeKernelMem(psSwapChain->psBuffer);
 	OMAPLFBFreeKernelMem(psSwapChain);
 
@@ -492,6 +517,7 @@ static IMG_BOOL ProcessFlip(void *hCmdCookie, u32 ui32DataSize, void *pvData)
 	struct OMAPLFB_DEVINFO *psDevInfo;
 	struct OMAPLFB_BUFFER *psBuffer;
 	struct OMAPLFB_SWAPCHAIN *psSwapChain;
+	struct fb_info *fbi;
 
 	if (!hCmdCookie || !pvData)
 		return IMG_FALSE;
@@ -503,10 +529,19 @@ static IMG_BOOL ProcessFlip(void *hCmdCookie, u32 ui32DataSize, void *pvData)
 		return IMG_FALSE;
 
 	psDevInfo = (struct OMAPLFB_DEVINFO *)psFlipCmd->hExtDevice;
+	fbi = psDevInfo->psLINFBInfo;
 
 	psBuffer = (struct OMAPLFB_BUFFER *)psFlipCmd->hExtBuffer;
 	psSwapChain = (struct OMAPLFB_SWAPCHAIN *)psFlipCmd->hExtSwapChain;
 
+	psDevInfo->local_var.yoffset =
+		(psBuffer->sCPUVAddr - psDevInfo->sFBInfo.sCPUVAddr)
+		 / psDevInfo->sFBInfo.ui32ByteStride;
+
+	acquire_console_sem();
+	fbi->fbops->fb_pan_display(&psDevInfo->local_var, fbi);
+	release_console_sem();
+
 	psSwapChain->psPVRJTable->pfnPVRSRVCmdComplete(hCmdCookie, IMG_TRUE);
 
 	return IMG_TRUE;
@@ -573,6 +608,7 @@ static void SetDevinfo(struct OMAPLFB_DEVINFO *psDevInfo)
 	psPVRFBInfo->ui32ByteStride = psLINFBInfo->fix.line_length;
 	psPVRFBInfo->ui32FBSize = FBSize;
 
+#if 0
 	/* Try double buffering */
 	psPVRFBInfo->ui32Height = psLINFBInfo->var.yres_virtual >> 1;
 	psPVRFBInfo->ui32BufferSize = psPVRFBInfo->ui32ByteStride *
@@ -590,6 +626,18 @@ static void SetDevinfo(struct OMAPLFB_DEVINFO *psDevInfo)
 			sgx_buffer_align(psPVRFBInfo->ui32ByteStride,
 					 psPVRFBInfo->ui32BufferSize);
 	}
+#else
+	psPVRFBInfo->ui32Height = psLINFBInfo->var.yres;
+	psPVRFBInfo->ui32BufferSize = psPVRFBInfo->ui32ByteStride *
+		psPVRFBInfo->ui32Height;
+	psPVRFBInfo->ui32RoundedBufferSize =
+		sgx_buffer_align(psPVRFBInfo->ui32ByteStride,
+				 psPVRFBInfo->ui32BufferSize);
+
+	DEBUG_PRINTK((KERN_INFO DRIVER_PREFIX
+		      ": buffer size: %u, rounded %u\n", psPVRFBInfo->ui32BufferSize,
+			  psPVRFBInfo->ui32RoundedBufferSize));
+#endif
 
 	CalcSwapChainSize(psDevInfo);
 
diff --git a/pvr/omaplfb_linux.c b/pvr/omaplfb_linux.c
index b79a59e..c297bbc 100644
--- a/pvr/omaplfb_linux.c
+++ b/pvr/omaplfb_linux.c
@@ -32,6 +32,7 @@
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
+#include <linux/fb.h>
 
 #include <linux/platform_device.h>
 
-- 
2.39.5


From 227a3f2adb753847faba0a926ed7b75c70811826 Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Wed, 23 May 2012 02:34:10 +0300
Subject: [PATCH 12/16] stop removing nonexistent proc entry

---
 pvr/mmap.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pvr/mmap.c b/pvr/mmap.c
index 1c094aa..4c55e19 100644
--- a/pvr/mmap.c
+++ b/pvr/mmap.c
@@ -911,7 +911,9 @@ void PVRMMapCleanup(void)
 	}
 	PVR_ASSERT(list_empty((&g_sMMapAreaList)));
 
+#if defined(DEBUG_LINUX_MMAP_AREAS)
 	RemoveProcEntry("mmap");
+#endif
 
 	if (g_psMemmapCache) {
 		kmem_cache_destroy(g_psMemmapCache);
-- 
2.39.5


From cb0a07679533181d0d86ca2709f168b73d85cf62 Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sat, 2 Mar 2013 03:06:46 +0200
Subject: [PATCH 13/16] update for newer kernel DMA code

---
 pvr/mm.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pvr/mm.c b/pvr/mm.c
index c0a92f2..bad8f1c 100644
--- a/pvr/mm.c
+++ b/pvr/mm.c
@@ -1140,9 +1140,6 @@ static void inv_cache_vmalloc(const struct LinuxMemArea *mem_area)
 	u32 pg_ofs;
 	u32 vaddr, vaddr_end;
 
-	extern void ___dma_single_dev_to_cpu(const void *, size_t,
-			                enum dma_data_direction);
-
 	vaddr = (u32)mem_area->uData.sVmalloc.pvVmallocAddress;
 	vaddr_end = vaddr + mem_area->ui32ByteSize;
 	pg_cnt = (PAGE_ALIGN(vaddr_end) - (vaddr & PAGE_MASK)) / PAGE_SIZE;
@@ -1153,7 +1150,7 @@ static void inv_cache_vmalloc(const struct LinuxMemArea *mem_area)
 		pg_ofs = vaddr & ~PAGE_MASK;
 		kaddr += pg_ofs;
 		chunk = min_t(ssize_t, vaddr_end - vaddr, PAGE_SIZE - pg_ofs);
-		___dma_single_dev_to_cpu(kaddr, chunk, DMA_FROM_DEVICE);
+		dmac_map_area(kaddr, chunk, DMA_FROM_DEVICE);
 		vaddr += chunk;
 	}
 }
@@ -1163,13 +1160,10 @@ static void inv_cache_page_list(const struct LinuxMemArea *mem_area)
 	u32 pg_cnt;
 	struct page **pg_list;
 
-	extern void ___dma_single_dev_to_cpu(const void *, size_t,
-			                enum dma_data_direction);
-
 	pg_cnt = RANGE_TO_PAGES(mem_area->ui32ByteSize);
 	pg_list = mem_area->uData.sPageList.pvPageList;
 	while (pg_cnt--)
-		___dma_single_dev_to_cpu(page_address(*pg_list++), PAGE_SIZE,
+		dmac_map_area(page_address(*pg_list++), PAGE_SIZE,
 				DMA_FROM_DEVICE);
 }
 
-- 
2.39.5


From c58ea6ed3e4835d40a9167af3bc99e18fefac48a Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Fri, 4 Jul 2014 00:47:08 +0300
Subject: [PATCH 14/16] add bc_cat from TI

---
 pvr/Makefile |   3 +-
 pvr/bc_cat.c | 788 +++++++++++++++++++++++++++++++++++++++++++++++++++
 pvr/bc_cat.h |  84 ++++++
 3 files changed, 874 insertions(+), 1 deletion(-)
 create mode 100644 pvr/bc_cat.c
 create mode 100644 pvr/bc_cat.h

diff --git a/pvr/Makefile b/pvr/Makefile
index acdf1db..23face6 100644
--- a/pvr/Makefile
+++ b/pvr/Makefile
@@ -42,7 +42,7 @@ endif
 
 ###
 
-obj-$(CONFIG_PVR)	+= omaplfb.o pvrsrvkm.o
+obj-$(CONFIG_PVR)	+= omaplfb.o pvrsrvkm.o # bufferclass_ti.o
 
 omaplfb-objs		:= omaplfb_displayclass.o omaplfb_linux.o
 
@@ -69,6 +69,7 @@ obj-$(CONFIG_PVR_EXAMPLES) += bc_example.o
 bc_example-objs		:= bufferclass_example.o bufferclass_example_linux.o \
 			   bufferclass_example_private.o
 
+bufferclass_ti-objs	:= bc_cat.o
 
 DATE			:= $(shell date "+%a %B %d %Z %Y" )
 CBUILD			:= -O2						\
diff --git a/pvr/bc_cat.c b/pvr/bc_cat.c
new file mode 100644
index 0000000..2c338ff
--- /dev/null
+++ b/pvr/bc_cat.c
@@ -0,0 +1,788 @@
+/**********************************************************************
+ *
+ * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright(c) 2008 Imagination Technologies Ltd. All rights reserved.
+ * 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope it will be useful but, except 
+ * as otherwise stated in writing, without any warranty; without even the 
+ * implied warranty of merchantability or fitness for a particular purpose. 
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * The full GNU General Public License is included in this distribution in
+ * the file called "COPYING".
+ *
+ * Contact Information:
+ * Imagination Technologies Ltd. <gpl-support@imgtec.com>
+ * Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK 
+ *
+ ******************************************************************************/
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+#include <img_defs.h>
+#include <servicesext.h>
+#include <kernelbuffer.h>
+#include "bc_cat.h"
+
+#include <linux/dma-mapping.h>
+
+#define DEVNAME             "bccat"
+#define DRVNAME             DEVNAME
+#define DEVICE_COUNT        10
+
+MODULE_SUPPORTED_DEVICE(DEVNAME);
+
+#define unref__ __attribute__ ((unused))
+
+typedef struct BC_CAT_BUFFER_TAG
+{
+    IMG_UINT32                   ui32Size;
+    IMG_HANDLE                   hMemHandle;
+    IMG_SYS_PHYADDR              sSysAddr;
+    IMG_SYS_PHYADDR              sPageAlignSysAddr;
+    IMG_CPU_VIRTADDR             sCPUVAddr;
+    PVRSRV_SYNC_DATA            *psSyncData;
+    struct BC_CAT_BUFFER_TAG    *psNext;
+} BC_CAT_BUFFER;
+
+
+typedef struct BC_CAT_DEVINFO_TAG
+{
+    int                       ref;
+    IMG_UINT32                ui32DeviceID;
+    BC_CAT_BUFFER            *psSystemBuffer;
+    BUFFER_INFO               sBufferInfo;
+    IMG_UINT32                ui32NumBuffers;
+    PVRSRV_BC_BUFFER2SRV_KMJTABLE    sPVRJTable;
+    PVRSRV_BC_SRV2BUFFER_KMJTABLE    sBCJTable;
+    IMG_HANDLE                hPVRServices;
+    IMG_UINT32                ui32RefCount;
+    enum BC_memory            buf_type;
+} BC_CAT_DEVINFO;
+
+
+extern IMG_IMPORT IMG_BOOL PVRGetBufferClassJTable(
+                    PVRSRV_BC_BUFFER2SRV_KMJTABLE *psJTable);
+
+static int bc_open(struct inode *i, struct file *f);
+static int bc_release(struct inode *i, struct file *f);
+static int bc_ioctl(struct inode *inode, struct file *file,
+                    unsigned int cmd, unsigned long arg);
+static int bc_mmap(struct file *filp, struct vm_area_struct *vma);
+
+static int BC_CreateBuffers(int id, bc_buf_params_t *p);
+static PVRSRV_ERROR BC_DestroyBuffers(int id);
+static PVRSRV_ERROR BC_Register(int id);
+static PVRSRV_ERROR BC_Unregister(int id);
+
+static PVRSRV_ERROR BCOpenPVRServices(IMG_HANDLE *phPVRServices);
+static PVRSRV_ERROR BCClosePVRServices(IMG_HANDLE hPVRServices);
+
+static IMG_VOID *BCAllocKernelMem(IMG_UINT32 ui32Size);
+static IMG_VOID BCFreeKernelMem(IMG_VOID *pvMem);
+
+static PVRSRV_ERROR BCAllocContigMemory(IMG_UINT32 ui32Size,
+                               IMG_HANDLE * phMemHandle,
+                               IMG_CPU_VIRTADDR *pLinAddr,
+                               IMG_CPU_PHYADDR *pPhysAddr);
+static IMG_VOID BCFreeContigMemory(IMG_UINT32 ui32Size, 
+                          IMG_HANDLE hMemHandle,
+                          IMG_CPU_VIRTADDR LinAddr, 
+                          IMG_CPU_PHYADDR PhysAddr);
+
+static IMG_SYS_PHYADDR CpuPAddrToSysPAddrBC(IMG_CPU_PHYADDR cpu_paddr);
+static IMG_CPU_PHYADDR SysPAddrToCpuPAddrBC(IMG_SYS_PHYADDR sys_paddr);
+
+static PVRSRV_ERROR BCGetLibFuncAddr(IMG_HANDLE hExtDrv,
+                                     IMG_CHAR *szFunctionName,
+                                     PFN_BC_GET_PVRJTABLE *ppfnFuncTable);
+static BC_CAT_DEVINFO * GetAnchorPtr(int id);
+
+
+static int major;
+static struct class *bc_class;
+static IMG_VOID *device[DEVICE_COUNT] = { 0 };
+static PFN_BC_GET_PVRJTABLE pfnGetPVRJTable = IMG_NULL;
+static int width_align;
+
+static struct file_operations bc_cat_fops = {
+    .open =  bc_open,
+    .release = bc_release,
+    .ioctl = bc_ioctl,
+    .mmap =  bc_mmap,
+};
+
+
+/*****************************************************************************
+ * func implementation
+ * **************************************************************************/
+
+#define file_to_id(file)  (iminor(file->f_path.dentry->d_inode))
+
+static BC_CAT_DEVINFO * GetAnchorPtr(int id)
+{
+    return (BC_CAT_DEVINFO *)device[id];
+}
+
+static IMG_VOID SetAnchorPtr(int id, BC_CAT_DEVINFO *psDevInfo)
+{
+    device[id] = (IMG_VOID*)psDevInfo;
+}
+
+
+#if 0
+static PVRSRV_ERROR OpenBCDevice(IMG_HANDLE *phDevice)
+{
+    BC_CAT_DEVINFO *psDevInfo;
+
+    psDevInfo = GetAnchorPtr(id);
+    *phDevice = (IMG_HANDLE)psDevInfo;
+
+    return PVRSRV_OK;
+}
+#else
+
+#define OPEN_FXN(id)                   \
+static PVRSRV_ERROR OpenBCDevice##id(IMG_HANDLE *phDevice)\
+{                                      \
+    BC_CAT_DEVINFO *psDevInfo;           \
+    psDevInfo = GetAnchorPtr (id);       \
+    *phDevice = (IMG_HANDLE) psDevInfo;  \
+    return PVRSRV_OK;                    \
+}
+
+OPEN_FXN(0)
+OPEN_FXN(1)
+OPEN_FXN(2)
+OPEN_FXN(3)
+OPEN_FXN(4)
+OPEN_FXN(5)
+OPEN_FXN(6)
+OPEN_FXN(7)
+OPEN_FXN(8)
+OPEN_FXN(9)
+#endif
+
+static PVRSRV_ERROR CloseBCDevice(IMG_HANDLE hDevice)
+{
+    PVR_UNREFERENCED_PARAMETER(hDevice);
+
+    return PVRSRV_OK;
+}
+
+static PVRSRV_ERROR GetBCBuffer(IMG_HANDLE            hDevice,
+                                IMG_UINT32            ui32BufferNumber,
+                                PVRSRV_SYNC_DATA    *psSyncData,
+                                IMG_HANDLE            *phBuffer)
+{
+    BC_CAT_DEVINFO    *psDevInfo;
+
+    if (!hDevice || !phBuffer)
+        return PVRSRV_ERROR_INVALID_PARAMS;
+
+    psDevInfo = (BC_CAT_DEVINFO*)hDevice;
+
+    if (ui32BufferNumber < psDevInfo->sBufferInfo.ui32BufferCount)  {
+        psDevInfo->psSystemBuffer[ui32BufferNumber].psSyncData = psSyncData;
+        *phBuffer = (IMG_HANDLE)&psDevInfo->psSystemBuffer[ui32BufferNumber];
+    } else {
+        return PVRSRV_ERROR_INVALID_PARAMS;
+    }
+
+    return PVRSRV_OK;
+}
+
+
+static PVRSRV_ERROR GetBCInfo(IMG_HANDLE hDevice, BUFFER_INFO *psBCInfo)
+{
+    BC_CAT_DEVINFO    *psDevInfo;
+
+    if (!hDevice || !psBCInfo)
+        return PVRSRV_ERROR_INVALID_PARAMS;
+
+    psDevInfo = (BC_CAT_DEVINFO*)hDevice;
+    *psBCInfo = psDevInfo->sBufferInfo;
+
+    return PVRSRV_OK;
+}
+
+
+static PVRSRV_ERROR GetBCBufferAddr(IMG_HANDLE        hDevice,
+                                    IMG_HANDLE        hBuffer,
+                                    IMG_SYS_PHYADDR    **ppsSysAddr,
+                                    IMG_UINT32        *pui32ByteSize,
+                                    IMG_VOID        **ppvCpuVAddr,
+                                    IMG_HANDLE        *phOSMapInfo,
+                                    IMG_BOOL        *pbIsContiguous)
+{
+    BC_CAT_BUFFER *psBuffer;
+
+    if (!hDevice || !hBuffer || !ppsSysAddr || !pui32ByteSize)
+        return PVRSRV_ERROR_INVALID_PARAMS;
+
+    psBuffer = (BC_CAT_BUFFER *) hBuffer;
+    *ppsSysAddr = &psBuffer->sPageAlignSysAddr;
+    *ppvCpuVAddr = psBuffer->sCPUVAddr;
+    *pui32ByteSize = psBuffer->ui32Size;
+
+    *phOSMapInfo = IMG_NULL;
+    *pbIsContiguous = IMG_TRUE;
+
+    return PVRSRV_OK;
+}
+
+
+static int BC_CreateBuffers(int id, bc_buf_params_t *p)
+{
+    BC_CAT_DEVINFO  *psDevInfo;
+    IMG_CPU_PHYADDR  paddr;
+    IMG_UINT32       i, stride, size;
+    PVRSRV_PIXEL_FORMAT pixel_fmt;
+
+    if (p->count <= 0)
+        return -EINVAL;
+
+    if (p->width <= 1  || p->width % width_align || p->height <= 1)
+        return -EINVAL;
+
+    switch (p->fourcc) {
+    case BC_PIX_FMT_NV12:
+        pixel_fmt = PVRSRV_PIXEL_FORMAT_NV12;
+        stride = p->width;
+        break;
+    case BC_PIX_FMT_UYVY:
+        pixel_fmt = PVRSRV_PIXEL_FORMAT_FOURCC_ORG_UYVY;
+        stride = p->width << 1;
+        break;
+    case BC_PIX_FMT_RGB565:
+        pixel_fmt = PVRSRV_PIXEL_FORMAT_RGB565;
+        stride = p->width << 1;
+        break;
+    case BC_PIX_FMT_YUYV:
+        pixel_fmt = PVRSRV_PIXEL_FORMAT_FOURCC_ORG_YUYV;
+        stride = p->width << 1;
+        break;
+    default:
+        return -EINVAL;
+        break;
+    }
+
+    if (p->type != BC_MEMORY_MMAP && p->type != BC_MEMORY_USERPTR)
+        return -EINVAL;
+
+    if ((psDevInfo = GetAnchorPtr(id)) == IMG_NULL)
+        return -ENODEV;
+
+    if (psDevInfo->ui32NumBuffers)
+        BC_DestroyBuffers(id);
+
+    psDevInfo->buf_type = p->type;
+    psDevInfo->psSystemBuffer =
+            BCAllocKernelMem(sizeof(BC_CAT_BUFFER) * p->count);
+
+    if (!psDevInfo->psSystemBuffer)
+        return -ENOMEM;
+
+    memset(psDevInfo->psSystemBuffer, 0, sizeof(BC_CAT_BUFFER) * p->count);
+
+    size = p->height * stride;
+    if (pixel_fmt == PVRSRV_PIXEL_FORMAT_NV12)
+        size += (stride >> 1) * (p->height >> 1) << 1;
+
+    for (i=0; i < p->count; i++) {
+        if (psDevInfo->buf_type == BC_MEMORY_MMAP) {
+            if (BCAllocContigMemory(size,
+                                  &psDevInfo->psSystemBuffer[i].hMemHandle,
+                                  &psDevInfo->psSystemBuffer[i].sCPUVAddr,
+                                  &paddr) != PVRSRV_OK)
+                /*TODO should free() and return failure*/
+                break;
+
+            psDevInfo->psSystemBuffer[i].sSysAddr = CpuPAddrToSysPAddrBC(paddr);
+            psDevInfo->psSystemBuffer[i].sPageAlignSysAddr.uiAddr =
+                    psDevInfo->psSystemBuffer[i].sSysAddr.uiAddr & 0xFFFFF000;
+        }
+        psDevInfo->ui32NumBuffers++;
+        psDevInfo->psSystemBuffer[i].ui32Size = size;
+        psDevInfo->psSystemBuffer[i].psSyncData = IMG_NULL;
+    }
+    p->count = psDevInfo->ui32NumBuffers;
+
+    psDevInfo->sBufferInfo.ui32BufferCount = psDevInfo->ui32NumBuffers;
+    psDevInfo->sBufferInfo.pixelformat = pixel_fmt;
+    psDevInfo->sBufferInfo.ui32Width = p->width;
+    psDevInfo->sBufferInfo.ui32Height = p->height;
+    psDevInfo->sBufferInfo.ui32ByteStride = stride;    
+    psDevInfo->sBufferInfo.ui32BufferDeviceID = id;
+    psDevInfo->sBufferInfo.ui32Flags = PVRSRV_BC_FLAGS_YUVCSC_FULL_RANGE |
+                                       PVRSRV_BC_FLAGS_YUVCSC_BT601;
+    return 0;
+}
+
+
+static PVRSRV_ERROR BC_DestroyBuffers(int id)
+{
+    BC_CAT_DEVINFO *psDevInfo;
+    IMG_UINT32 i;
+    
+    if ((psDevInfo = GetAnchorPtr(id)) == IMG_NULL)
+        return PVRSRV_ERROR_DEVICE_REGISTER_FAILED;
+    
+    if (!psDevInfo->ui32NumBuffers)
+        return PVRSRV_OK;
+
+    if (psDevInfo->buf_type == BC_MEMORY_MMAP)
+        for (i = 0; i < psDevInfo->ui32NumBuffers; i++) {
+            BCFreeContigMemory(psDevInfo->psSystemBuffer[i].ui32Size,
+                    psDevInfo->psSystemBuffer[i].hMemHandle,
+                    psDevInfo->psSystemBuffer[i].sCPUVAddr,
+                    SysPAddrToCpuPAddrBC(psDevInfo->psSystemBuffer[i].sSysAddr));
+        }
+
+    BCFreeKernelMem(psDevInfo->psSystemBuffer);
+    
+    psDevInfo->ui32NumBuffers = 0;
+    psDevInfo->sBufferInfo.pixelformat = PVRSRV_PIXEL_FORMAT_UNKNOWN;
+    psDevInfo->sBufferInfo.ui32Width = 0;
+    psDevInfo->sBufferInfo.ui32Height = 0;
+    psDevInfo->sBufferInfo.ui32ByteStride = 0;    
+    psDevInfo->sBufferInfo.ui32BufferDeviceID = id;
+    psDevInfo->sBufferInfo.ui32Flags = 0;
+    psDevInfo->sBufferInfo.ui32BufferCount = psDevInfo->ui32NumBuffers;
+
+    return PVRSRV_OK;
+}
+
+
+static PVRSRV_ERROR BC_Register(id)
+{
+    BC_CAT_DEVINFO  *psDevInfo;
+    
+    psDevInfo = GetAnchorPtr(id);
+
+    if (psDevInfo) {
+        psDevInfo->ui32RefCount++;
+        return PVRSRV_OK;
+    }
+
+    psDevInfo = (BC_CAT_DEVINFO *)BCAllocKernelMem(sizeof(BC_CAT_DEVINFO));
+
+    if (!psDevInfo)
+        return PVRSRV_ERROR_OUT_OF_MEMORY;
+    
+    psDevInfo->ref = 0;
+    psDevInfo->ui32RefCount = 0;
+    SetAnchorPtr(id, (IMG_VOID*)psDevInfo);
+
+    if (BCOpenPVRServices(&psDevInfo->hPVRServices) != PVRSRV_OK)
+        return PVRSRV_ERROR_INIT_FAILURE;
+
+    if (BCGetLibFuncAddr(psDevInfo->hPVRServices, "PVRGetBufferClassJTable",
+                         &pfnGetPVRJTable) != PVRSRV_OK)
+        return PVRSRV_ERROR_INIT_FAILURE;
+    
+    if (!(*pfnGetPVRJTable)(&psDevInfo->sPVRJTable))
+        return PVRSRV_ERROR_INIT_FAILURE;
+
+    psDevInfo->ui32NumBuffers = 0;
+
+    psDevInfo->sBufferInfo.pixelformat = PVRSRV_PIXEL_FORMAT_UNKNOWN;
+    psDevInfo->sBufferInfo.ui32Width = 0;
+    psDevInfo->sBufferInfo.ui32Height = 0;
+    psDevInfo->sBufferInfo.ui32ByteStride = 0;    
+    psDevInfo->sBufferInfo.ui32BufferDeviceID = id;
+    psDevInfo->sBufferInfo.ui32Flags = 0;
+    psDevInfo->sBufferInfo.ui32BufferCount = psDevInfo->ui32NumBuffers;
+
+    psDevInfo->sBCJTable.ui32TableSize = sizeof(PVRSRV_BC_SRV2BUFFER_KMJTABLE);
+#if 0
+    psDevInfo->sBCJTable.pfnOpenBCDevice = OpenBCDevice;
+#else
+    if (id == 0) {
+        psDevInfo->sBCJTable.pfnOpenBCDevice = OpenBCDevice0;
+    } else if (id == 1) {
+        psDevInfo->sBCJTable.pfnOpenBCDevice = OpenBCDevice1;
+    } else if (id == 2) {
+        psDevInfo->sBCJTable.pfnOpenBCDevice = OpenBCDevice2;
+    } else if (id == 3) {
+        psDevInfo->sBCJTable.pfnOpenBCDevice = OpenBCDevice3;
+    } else if (id == 4) {
+        psDevInfo->sBCJTable.pfnOpenBCDevice = OpenBCDevice4;
+    } else if (id == 5) {
+        psDevInfo->sBCJTable.pfnOpenBCDevice = OpenBCDevice5;
+    } else if (id == 6) {
+        psDevInfo->sBCJTable.pfnOpenBCDevice = OpenBCDevice6;
+    } else if (id == 7) {
+        psDevInfo->sBCJTable.pfnOpenBCDevice = OpenBCDevice7;
+    } else if (id == 8) {
+        psDevInfo->sBCJTable.pfnOpenBCDevice = OpenBCDevice8;
+    } else if (id == 9) {
+        psDevInfo->sBCJTable.pfnOpenBCDevice = OpenBCDevice9;
+    } else {
+        printk("bad device id: %d\n", id);
+        return PVRSRV_ERROR_DEVICE_REGISTER_FAILED;
+    }
+#endif
+    psDevInfo->sBCJTable.pfnCloseBCDevice = CloseBCDevice;
+    psDevInfo->sBCJTable.pfnGetBCBuffer = GetBCBuffer;
+    psDevInfo->sBCJTable.pfnGetBCInfo = GetBCInfo;
+    psDevInfo->sBCJTable.pfnGetBufferAddr = GetBCBufferAddr;
+    
+    if (psDevInfo->sPVRJTable.pfnPVRSRVRegisterBCDevice(
+                &psDevInfo->sBCJTable,
+                &psDevInfo->ui32DeviceID) != PVRSRV_OK)
+        return PVRSRV_ERROR_DEVICE_REGISTER_FAILED;
+
+    psDevInfo->ui32RefCount++;
+    
+    return PVRSRV_OK;
+}
+
+
+static PVRSRV_ERROR BC_Unregister(int id)
+{
+    BC_CAT_DEVINFO *psDevInfo;
+    PVRSRV_BC_BUFFER2SRV_KMJTABLE *psJTable;
+    
+    if ((psDevInfo = GetAnchorPtr(id)) == IMG_NULL)
+        return PVRSRV_ERROR_DEVICE_REGISTER_FAILED;
+    
+    psDevInfo->ui32RefCount--;
+
+    if (psDevInfo->ui32RefCount)
+        return PVRSRV_ERROR_RETRY;
+
+    psJTable = &psDevInfo->sPVRJTable;
+    
+    if (psJTable->pfnPVRSRVRemoveBCDevice(psDevInfo->ui32DeviceID) != PVRSRV_OK)
+        return PVRSRV_ERROR_GENERIC;
+
+    if (BCClosePVRServices(psDevInfo->hPVRServices) != PVRSRV_OK) {
+        psDevInfo->hPVRServices = IMG_NULL;
+        return PVRSRV_ERROR_GENERIC;
+    }
+
+    BCFreeKernelMem(psDevInfo);
+    SetAnchorPtr(id, IMG_NULL);
+    
+    return PVRSRV_OK;
+}
+
+
+static int __init bc_cat_init(void)
+{
+    struct device *bc_dev;
+    int id;
+
+    /* texture buffer width should be multiple of 8 for OMAP3 ES3.x,
+     * or 32 for ES2.x */
+    width_align = omap_rev_lt_3_0() ? 32 : 8;
+    
+    major = register_chrdev(0, DEVNAME, &bc_cat_fops);
+
+    if (major <= 0) {
+        printk(KERN_ERR DRVNAME ": unable to get major number\n");
+        goto ExitDisable;
+    }
+
+    bc_class = class_create(THIS_MODULE, DEVNAME);
+
+    if (IS_ERR(bc_class)) {
+       printk(KERN_ERR DRVNAME ": upable to create device class\n");
+       goto ExitUnregister;
+    }
+
+    for (id = 0; id < DEVICE_COUNT; id++) {
+        bc_dev = device_create(bc_class, NULL, MKDEV(major, id), NULL,
+                               DEVNAME "%d", id);
+
+        if (IS_ERR(bc_dev)) {
+           printk(KERN_ERR DRVNAME ": unable to create device %d\n", id);
+           goto ExitDestroyClass;
+        }
+
+        if (BC_Register(id) != PVRSRV_OK) {
+            printk (KERN_ERR DRVNAME ": can't register BC service %d\n", id);
+            if (id > 0) {
+                /* lets live with the drivers that we were able to create soi
+                 * far, even though it isn't as many as we'd like
+                 */
+                 break;
+            }
+            goto ExitUnregister;
+        }
+    }
+
+    return 0;
+
+ExitDestroyClass:
+    class_destroy(bc_class);
+ExitUnregister:
+    unregister_chrdev(major, DEVNAME);
+ExitDisable:
+    return -EBUSY;
+} 
+
+static void __exit bc_cat_cleanup(void)
+{    
+    int id;
+
+    for (id = 0; id < DEVICE_COUNT; id++) {
+        if (BC_DestroyBuffers(id) != PVRSRV_OK) {
+            printk(KERN_ERR DRVNAME ": can't free texture buffers\n");
+            return;
+        }
+        if (BC_Unregister(id) != PVRSRV_OK) {
+            printk(KERN_ERR DRVNAME ": can't un-register BC service\n");
+            return;
+        }
+        device_destroy(bc_class, MKDEV(major, id));
+    }
+    class_destroy(bc_class);
+    unregister_chrdev(major, DEVNAME);
+} 
+
+
+static IMG_VOID *BCAllocKernelMem(IMG_UINT32 ui32Size)
+{
+    return kmalloc(ui32Size, GFP_KERNEL);
+}
+
+static IMG_VOID BCFreeKernelMem(IMG_VOID *pvMem)
+{
+    kfree(pvMem);
+}
+
+static PVRSRV_ERROR BCAllocContigMemory(IMG_UINT32 ui32Size,
+                                 IMG_HANDLE unref__ *phMemHandle, 
+                                 IMG_CPU_VIRTADDR *pLinAddr, 
+                                 IMG_CPU_PHYADDR *pPhysAddr)
+{
+    IMG_VOID *pvLinAddr;
+    gfp_t mask = GFP_KERNEL;
+    
+    pvLinAddr = alloc_pages_exact(ui32Size, mask);
+/*    printk("pvLinAddr=%p, ui32Size=%ld\n", pvLinAddr, ui32Size);*/
+    
+    if (pvLinAddr == IMG_NULL)
+        return PVRSRV_ERROR_OUT_OF_MEMORY;
+
+    pPhysAddr->uiAddr = virt_to_phys(pvLinAddr);
+
+    *pLinAddr = pvLinAddr;
+
+    return PVRSRV_OK;
+}
+
+static IMG_VOID BCFreeContigMemory(IMG_UINT32 ui32Size,
+                        IMG_HANDLE unref__ hMemHandle, 
+                        IMG_CPU_VIRTADDR LinAddr, 
+                        IMG_CPU_PHYADDR PhysAddr)
+{
+    free_pages_exact(LinAddr, ui32Size);
+}
+
+static IMG_SYS_PHYADDR CpuPAddrToSysPAddrBC(IMG_CPU_PHYADDR cpu_paddr)
+{
+    IMG_SYS_PHYADDR sys_paddr;
+    
+    sys_paddr.uiAddr = cpu_paddr.uiAddr;
+    return sys_paddr;
+}
+
+static IMG_CPU_PHYADDR SysPAddrToCpuPAddrBC(IMG_SYS_PHYADDR sys_paddr)
+{
+    IMG_CPU_PHYADDR cpu_paddr;
+    
+    cpu_paddr.uiAddr = sys_paddr.uiAddr;
+    return cpu_paddr;
+}
+
+static PVRSRV_ERROR BCOpenPVRServices (IMG_HANDLE *phPVRServices)
+{
+    *phPVRServices = 0;
+    return PVRSRV_OK;
+}
+
+
+static PVRSRV_ERROR BCClosePVRServices (IMG_HANDLE unref__ hPVRServices)
+{
+    return PVRSRV_OK;
+}
+
+static PVRSRV_ERROR BCGetLibFuncAddr(IMG_HANDLE unref__ hExtDrv,
+                              IMG_CHAR *szFunctionName,
+                              PFN_BC_GET_PVRJTABLE *ppfnFuncTable)
+{
+    if (strcmp("PVRGetBufferClassJTable", szFunctionName) != 0)
+        return PVRSRV_ERROR_INVALID_PARAMS;
+
+    *ppfnFuncTable = PVRGetBufferClassJTable;
+    return PVRSRV_OK;
+}
+
+
+static int bc_open(struct inode *i, struct file *f)
+{
+    BC_CAT_DEVINFO *devinfo;
+    int id = file_to_id(f);
+
+    if ((devinfo = GetAnchorPtr(id)) == IMG_NULL) {
+        printk("no device %d\n", id);
+        return -ENODEV;
+    }
+
+    if (devinfo->ref) {
+        printk("device %d busy\n", id);
+        return -EBUSY;
+    }
+
+    devinfo->ref++;
+    return 0;
+}
+
+
+static int bc_release(struct inode *i, struct file *f)
+{
+    BC_CAT_DEVINFO *devinfo;
+    int id = file_to_id(f);
+
+    if ((devinfo = GetAnchorPtr(id)) == IMG_NULL)
+        return -ENODEV;
+
+    if (devinfo->ref)
+        devinfo->ref--;
+    return 0;
+}
+
+
+static int bc_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+#if defined(DEBUG)
+    printk("bc_mmap: vma->vm_start = %#lx\n", vma->vm_start);
+    printk("bc_mmap: vma->vm_pgoff = %#lx\n", vma->vm_pgoff);
+    printk("bc_mmap: size          = %#lx\n", vma->vm_end - vma->vm_start);
+#endif
+
+    /*FIXME check start & size*/
+    if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
+                        vma->vm_end - vma->vm_start,
+                        vma->vm_page_prot)) {
+        printk("bc_mmap: failed remap_pfn_range\n");
+        return -EAGAIN;
+    }
+    return 0;
+}
+
+static int bc_ioctl(struct inode *inode, struct file *file,
+                    unsigned int cmd, unsigned long arg)
+{
+    BC_CAT_DEVINFO *devinfo;
+    int id = file_to_id (file);
+
+    if ((devinfo = GetAnchorPtr(id)) == IMG_NULL)
+        return -ENODEV;
+
+    switch(_IOC_NR(cmd)) {
+        case _IOC_NR(BCIOGET_BUFFERCOUNT):
+        {    
+            BCIO_package *params = (BCIO_package *)arg;
+
+            if (!access_ok(VERIFY_WRITE, params, sizeof(BCIO_package)))
+                return -EFAULT;
+
+            params->output = devinfo->sBufferInfo.ui32BufferCount;
+            break;
+        }
+        case _IOC_NR(BCIOGET_BUFFERPHYADDR):
+        {
+            int idx;
+            BCIO_package *params = (BCIO_package *)arg;
+
+            if (!access_ok(VERIFY_WRITE, params, sizeof(BCIO_package)))
+                return -EFAULT;
+
+            idx = params->input;
+            if (idx < 0 || idx > devinfo->ui32NumBuffers) {
+                printk(KERN_ERR DRVNAME
+                        ": BCIOGET_BUFFERADDR - idx out of range\n");
+                return -EINVAL;
+            }
+            params->output = devinfo->psSystemBuffer[idx].sSysAddr.uiAddr;
+            break;
+        }
+        case _IOC_NR(BCIOGET_BUFFERIDX):
+        {
+            int idx;
+            BC_CAT_BUFFER  *buffer;
+            BCIO_package *params = (BCIO_package *)arg;
+
+            if (!access_ok(VERIFY_WRITE, params, sizeof(BCIO_package)))
+                return -EFAULT;
+
+            for (idx = 0; idx < devinfo->ui32NumBuffers; idx++) {
+                buffer = &devinfo->psSystemBuffer[idx];
+
+                if (params->input == (int)buffer->sSysAddr.uiAddr) {
+                    params->output = idx;
+                    return 0;
+                }
+            }
+            printk(KERN_ERR DRVNAME ": BCIOGET_BUFFERIDX- buffer not found\n");
+            return -EINVAL;
+            break;
+        }
+        case _IOC_NR(BCIOREQ_BUFFERS):
+        {
+            bc_buf_params_t *p = (bc_buf_params_t *) arg;
+            
+            if (!access_ok(VERIFY_WRITE, p, sizeof(bc_buf_params_t)))
+                return -EFAULT;
+
+            return BC_CreateBuffers(id, p);
+            break;
+        }
+        case _IOC_NR(BCIOSET_BUFFERPHYADDR):
+        {
+            bc_buf_ptr_t p;
+            IMG_CPU_PHYADDR img_pa;
+
+            if (copy_from_user(&p, (void __user *)arg, sizeof(p)))
+                return -EFAULT;
+
+            if (p.index >= devinfo->ui32NumBuffers || !p.pa)
+                return -EINVAL;
+            
+            /*TODO check buffer size*/
+
+            img_pa.uiAddr = p.pa;
+
+            devinfo->psSystemBuffer[p.index].sCPUVAddr = phys_to_virt(p.pa);
+            devinfo->psSystemBuffer[p.index].sSysAddr =
+                    CpuPAddrToSysPAddrBC(img_pa);
+            devinfo->psSystemBuffer[p.index].sPageAlignSysAddr.uiAddr =
+                    devinfo->psSystemBuffer[p.index].sSysAddr.uiAddr &
+                    0xFFFFF000;
+            break;
+        }
+        default:
+            return -EFAULT;
+    }
+    return 0;
+}
+
+module_init(bc_cat_init);
+module_exit(bc_cat_cleanup);
+
+MODULE_LICENSE("GPL v2");
diff --git a/pvr/bc_cat.h b/pvr/bc_cat.h
new file mode 100644
index 0000000..3ca0b69
--- /dev/null
+++ b/pvr/bc_cat.h
@@ -0,0 +1,84 @@
+/**********************************************************************
+ *
+ * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright(c) 2008 Imagination Technologies Ltd. All rights reserved.
+ * 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope it will be useful but, except 
+ * as otherwise stated in writing, without any warranty; without even the 
+ * implied warranty of merchantability or fitness for a particular purpose. 
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * The full GNU General Public License is included in this distribution in
+ * the file called "COPYING".
+ *
+ * Contact Information:
+ * Imagination Technologies Ltd. <gpl-support@imgtec.com>
+ * Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK 
+ *
+ ******************************************************************************/
+
+#ifndef __BC_CAT_H__
+#define __BC_CAT_H__
+
+#include <linux/ioctl.h>
+
+#define BC_FOURCC(a,b,c,d) \
+    ((unsigned long) ((a) | (b)<<8 | (c)<<16 | (d)<<24))
+
+#define BC_PIX_FMT_NV12     BC_FOURCC('N', 'V', '1', '2') /*YUV 4:2:0*/
+#define BC_PIX_FMT_UYVY     BC_FOURCC('U', 'Y', 'V', 'Y') /*YUV 4:2:2*/
+#define BC_PIX_FMT_YUYV     BC_FOURCC('Y', 'U', 'Y', 'V') /*YUV 4:2:2*/
+#define BC_PIX_FMT_RGB565   BC_FOURCC('R', 'G', 'B', 'P') /*RGB 5:6:5*/
+
+enum BC_memory {
+    BC_MEMORY_MMAP          = 1,
+    BC_MEMORY_USERPTR       = 2,
+};
+
+typedef struct BCIO_package_TAG {
+    int input;
+    int output;
+}BCIO_package;
+
+/* 
+ * the following types are tested for fourcc in struct bc_buf_params_t
+ *   NV12
+ *   UYVY
+ *   RGB565 - not tested yet
+ *   YUYV
+ */
+typedef struct bc_buf_params {
+    int count;              /*number of buffers, [in/out]*/
+    int width;              /*buffer width in pixel, multiple of 8 or 32*/
+    int height;             /*buffer height in pixel*/
+    unsigned int fourcc;    /*buffer pixel format*/
+    enum BC_memory type;
+} bc_buf_params_t;
+
+typedef struct bc_buf_ptr {
+    unsigned int index;
+    int size;
+    unsigned long pa;
+} bc_buf_ptr_t;
+
+#define BCIO_GID                    'g'
+#define BC_IOWR(INDEX)            _IOWR(BCIO_GID, INDEX, BCIO_package)
+
+#define BCIOGET_BUFFERCOUNT       BC_IOWR(0)  /*obsolete, since BCIOREQ_BUFFERS
+                                                return the number of buffers*/
+#define BCIOGET_BUFFERPHYADDR     BC_IOWR(1)  /*get physical address by index*/
+#define BCIOGET_BUFFERIDX         BC_IOWR(2)  /*get index by physical address*/
+
+#define BCIOREQ_BUFFERS           BC_IOWR(3)
+#define BCIOSET_BUFFERPHYADDR     BC_IOWR(4)
+
+#endif 
+
-- 
2.39.5


From ca95fc993da24c2f68fa88a713d41c4214000707 Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Fri, 4 Jul 2014 00:47:08 +0300
Subject: [PATCH 15/16] port bc_cat to this driver

---
 pvr/Makefile |  2 +-
 pvr/bc_cat.c | 58 +++++++++++++++++++++++++++-------------------------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/pvr/Makefile b/pvr/Makefile
index 23face6..11420de 100644
--- a/pvr/Makefile
+++ b/pvr/Makefile
@@ -42,7 +42,7 @@ endif
 
 ###
 
-obj-$(CONFIG_PVR)	+= omaplfb.o pvrsrvkm.o # bufferclass_ti.o
+obj-$(CONFIG_PVR)	+= omaplfb.o pvrsrvkm.o bufferclass_ti.o
 
 omaplfb-objs		:= omaplfb_displayclass.o omaplfb_linux.o
 
diff --git a/pvr/bc_cat.c b/pvr/bc_cat.c
index 2c338ff..53de981 100644
--- a/pvr/bc_cat.c
+++ b/pvr/bc_cat.c
@@ -28,15 +28,37 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/fs.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <img_defs.h>
-#include <servicesext.h>
-#include <kernelbuffer.h>
+#include "img_defs.h"
+#include "img_types.h"
+#include "servicesext.h"
+#include "kernelbuffer.h"
 #include "bc_cat.h"
 
 #include <linux/dma-mapping.h>
 
+#ifndef IMG_NULL
+#define IMG_IMPORT
+#define IMG_NULL        0
+typedef unsigned int    IMG_UINT32,     *IMG_PUINT32;
+typedef char            IMG_CHAR,       *IMG_PCHAR;
+typedef void            IMG_VOID, *IMG_PVOID;
+typedef IMG_PVOID       IMG_HANDLE;
+
+typedef IMG_PVOID       IMG_CPU_VIRTADDR;
+
+typedef struct IMG_SYS_PHYADDR IMG_SYS_PHYADDR;
+typedef struct IMG_CPU_PHYADDR IMG_CPU_PHYADDR;
+typedef struct BUFFER_INFO BUFFER_INFO;
+typedef struct PVRSRV_SYNC_DATA PVRSRV_SYNC_DATA;
+typedef struct PVRSRV_BC_BUFFER2SRV_KMJTABLE PVRSRV_BC_BUFFER2SRV_KMJTABLE;
+typedef struct PVRSRV_BC_SRV2BUFFER_KMJTABLE PVRSRV_BC_SRV2BUFFER_KMJTABLE;
+typedef enum PVRSRV_ERROR PVRSRV_ERROR;
+typedef enum PVRSRV_PIXEL_FORMAT PVRSRV_PIXEL_FORMAT;
+#endif
+
 #define DEVNAME             "bccat"
 #define DRVNAME             DEVNAME
 #define DEVICE_COUNT        10
@@ -77,7 +99,7 @@ extern IMG_IMPORT IMG_BOOL PVRGetBufferClassJTable(
 
 static int bc_open(struct inode *i, struct file *f);
 static int bc_release(struct inode *i, struct file *f);
-static int bc_ioctl(struct inode *inode, struct file *file,
+static long bc_ioctl(struct file *file,
                     unsigned int cmd, unsigned long arg);
 static int bc_mmap(struct file *filp, struct vm_area_struct *vma);
 
@@ -104,22 +126,18 @@ static IMG_VOID BCFreeContigMemory(IMG_UINT32 ui32Size,
 static IMG_SYS_PHYADDR CpuPAddrToSysPAddrBC(IMG_CPU_PHYADDR cpu_paddr);
 static IMG_CPU_PHYADDR SysPAddrToCpuPAddrBC(IMG_SYS_PHYADDR sys_paddr);
 
-static PVRSRV_ERROR BCGetLibFuncAddr(IMG_HANDLE hExtDrv,
-                                     IMG_CHAR *szFunctionName,
-                                     PFN_BC_GET_PVRJTABLE *ppfnFuncTable);
 static BC_CAT_DEVINFO * GetAnchorPtr(int id);
 
 
 static int major;
 static struct class *bc_class;
 static IMG_VOID *device[DEVICE_COUNT] = { 0 };
-static PFN_BC_GET_PVRJTABLE pfnGetPVRJTable = IMG_NULL;
 static int width_align;
 
 static struct file_operations bc_cat_fops = {
     .open =  bc_open,
     .release = bc_release,
-    .ioctl = bc_ioctl,
+    .unlocked_ioctl = bc_ioctl,
     .mmap =  bc_mmap,
 };
 
@@ -388,11 +406,7 @@ static PVRSRV_ERROR BC_Register(id)
     if (BCOpenPVRServices(&psDevInfo->hPVRServices) != PVRSRV_OK)
         return PVRSRV_ERROR_INIT_FAILURE;
 
-    if (BCGetLibFuncAddr(psDevInfo->hPVRServices, "PVRGetBufferClassJTable",
-                         &pfnGetPVRJTable) != PVRSRV_OK)
-        return PVRSRV_ERROR_INIT_FAILURE;
-    
-    if (!(*pfnGetPVRJTable)(&psDevInfo->sPVRJTable))
+    if (!PVRGetBufferClassJTable(&psDevInfo->sPVRJTable))
         return PVRSRV_ERROR_INIT_FAILURE;
 
     psDevInfo->ui32NumBuffers = 0;
@@ -487,7 +501,7 @@ static int __init bc_cat_init(void)
 
     /* texture buffer width should be multiple of 8 for OMAP3 ES3.x,
      * or 32 for ES2.x */
-    width_align = omap_rev_lt_3_0() ? 32 : 8;
+    width_align = (cpu_is_omap3530() && omap_rev() < OMAP3430_REV_ES3_0) ? 32 : 8;
     
     major = register_chrdev(0, DEVNAME, &bc_cat_fops);
 
@@ -621,18 +635,6 @@ static PVRSRV_ERROR BCClosePVRServices (IMG_HANDLE unref__ hPVRServices)
     return PVRSRV_OK;
 }
 
-static PVRSRV_ERROR BCGetLibFuncAddr(IMG_HANDLE unref__ hExtDrv,
-                              IMG_CHAR *szFunctionName,
-                              PFN_BC_GET_PVRJTABLE *ppfnFuncTable)
-{
-    if (strcmp("PVRGetBufferClassJTable", szFunctionName) != 0)
-        return PVRSRV_ERROR_INVALID_PARAMS;
-
-    *ppfnFuncTable = PVRGetBufferClassJTable;
-    return PVRSRV_OK;
-}
-
-
 static int bc_open(struct inode *i, struct file *f)
 {
     BC_CAT_DEVINFO *devinfo;
@@ -685,7 +687,7 @@ static int bc_mmap(struct file *filp, struct vm_area_struct *vma)
     return 0;
 }
 
-static int bc_ioctl(struct inode *inode, struct file *file,
+static long bc_ioctl(struct file *file,
                     unsigned int cmd, unsigned long arg)
 {
     BC_CAT_DEVINFO *devinfo;
-- 
2.39.5


From 1ec5b45797ba374e2d076c815d7a9896f04bf297 Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Fri, 4 Jul 2014 00:47:08 +0300
Subject: [PATCH 16/16] fixes for bc_cat

---
 Makefile          |  2 +-
 pvr/bc_cat.c      | 42 ++++++++++++++++++++++--------------------
 pvr/deviceclass.c | 14 ++++++++++++--
 pvr/sysinfo.h     |  2 +-
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index 92787d4..4783eff 100644
--- a/Makefile
+++ b/Makefile
@@ -3,4 +3,4 @@ MAKECMDGOALS = all
 endif
 
 $(MAKECMDGOALS):
-	make -C pvr $@
+	$(MAKE) -C pvr $@
diff --git a/pvr/bc_cat.c b/pvr/bc_cat.c
index 53de981..698c1b3 100644
--- a/pvr/bc_cat.c
+++ b/pvr/bc_cat.c
@@ -369,6 +369,7 @@ static PVRSRV_ERROR BC_DestroyBuffers(int id)
         }
 
     BCFreeKernelMem(psDevInfo->psSystemBuffer);
+    psDevInfo->psSystemBuffer = NULL;
     
     psDevInfo->ui32NumBuffers = 0;
     psDevInfo->sBufferInfo.pixelformat = PVRSRV_PIXEL_FORMAT_UNKNOWN;
@@ -497,7 +498,7 @@ static PVRSRV_ERROR BC_Unregister(int id)
 static int __init bc_cat_init(void)
 {
     struct device *bc_dev;
-    int id;
+    int id = 0;
 
     /* texture buffer width should be multiple of 8 for OMAP3 ES3.x,
      * or 32 for ES2.x */
@@ -511,9 +512,8 @@ static int __init bc_cat_init(void)
     }
 
     bc_class = class_create(THIS_MODULE, DEVNAME);
-
     if (IS_ERR(bc_class)) {
-       printk(KERN_ERR DRVNAME ": upable to create device class\n");
+       printk(KERN_ERR DRVNAME ": unable to create device class\n");
        goto ExitUnregister;
     }
 
@@ -529,18 +529,23 @@ static int __init bc_cat_init(void)
         if (BC_Register(id) != PVRSRV_OK) {
             printk (KERN_ERR DRVNAME ": can't register BC service %d\n", id);
             if (id > 0) {
-                /* lets live with the drivers that we were able to create soi
+                /* let's live with the drivers that we were able to create so
                  * far, even though it isn't as many as we'd like
                  */
+                 device_destroy(bc_class, MKDEV(major, id));
                  break;
             }
-            goto ExitUnregister;
+            goto ExitDestroyClass;
         }
     }
 
     return 0;
 
 ExitDestroyClass:
+    for (; id >= 0; id--) {
+        BC_Unregister(id);
+        device_destroy(bc_class, MKDEV(major, id));
+    }
     class_destroy(bc_class);
 ExitUnregister:
     unregister_chrdev(major, DEVNAME);
@@ -554,12 +559,10 @@ static void __exit bc_cat_cleanup(void)
 
     for (id = 0; id < DEVICE_COUNT; id++) {
         if (BC_DestroyBuffers(id) != PVRSRV_OK) {
-            printk(KERN_ERR DRVNAME ": can't free texture buffers\n");
-            return;
+            printk(KERN_ERR DRVNAME ": can't free texture buffers, dev %d\n", id);
         }
         if (BC_Unregister(id) != PVRSRV_OK) {
-            printk(KERN_ERR DRVNAME ": can't un-register BC service\n");
-            return;
+            printk(KERN_ERR DRVNAME ": can't un-register BC service, dev %d\n", id);
         }
         device_destroy(bc_class, MKDEV(major, id));
     }
@@ -583,17 +586,16 @@ static PVRSRV_ERROR BCAllocContigMemory(IMG_UINT32 ui32Size,
                                  IMG_CPU_VIRTADDR *pLinAddr, 
                                  IMG_CPU_PHYADDR *pPhysAddr)
 {
-    IMG_VOID *pvLinAddr;
-    gfp_t mask = GFP_KERNEL;
-    
-    pvLinAddr = alloc_pages_exact(ui32Size, mask);
-/*    printk("pvLinAddr=%p, ui32Size=%ld\n", pvLinAddr, ui32Size);*/
-    
-    if (pvLinAddr == IMG_NULL)
-        return PVRSRV_ERROR_OUT_OF_MEMORY;
+    dma_addr_t dma;
+    void *pvLinAddr;
 
-    pPhysAddr->uiAddr = virt_to_phys(pvLinAddr);
+    pvLinAddr = dma_alloc_coherent(NULL, ui32Size, &dma, GFP_KERNEL);
+    if (pvLinAddr == NULL)
+    {
+            return PVRSRV_ERROR_OUT_OF_MEMORY;
+    }
 
+    pPhysAddr->uiAddr = dma;
     *pLinAddr = pvLinAddr;
 
     return PVRSRV_OK;
@@ -604,7 +606,7 @@ static IMG_VOID BCFreeContigMemory(IMG_UINT32 ui32Size,
                         IMG_CPU_VIRTADDR LinAddr, 
                         IMG_CPU_PHYADDR PhysAddr)
 {
-    free_pages_exact(LinAddr, ui32Size);
+    dma_free_coherent(NULL, ui32Size, LinAddr, (dma_addr_t)PhysAddr.uiAddr);
 }
 
 static IMG_SYS_PHYADDR CpuPAddrToSysPAddrBC(IMG_CPU_PHYADDR cpu_paddr)
@@ -716,7 +718,7 @@ static long bc_ioctl(struct file *file,
                 return -EFAULT;
 
             idx = params->input;
-            if (idx < 0 || idx > devinfo->ui32NumBuffers) {
+            if (idx < 0 || idx >= devinfo->ui32NumBuffers) {
                 printk(KERN_ERR DRVNAME
                         ": BCIOGET_BUFFERADDR - idx out of range\n");
                 return -EINVAL;
diff --git a/pvr/deviceclass.c b/pvr/deviceclass.c
index d7f3f21..2f50679 100644
--- a/pvr/deviceclass.c
+++ b/pvr/deviceclass.c
@@ -196,7 +196,12 @@ static enum PVRSRV_ERROR PVRSRVRegisterDCDeviceKM(
 	psDeviceNode->sDevId.eDeviceClass = PVRSRV_DEVICE_CLASS_DISPLAY;
 	psDeviceNode->psSysData = psSysData;
 
-	AllocateDeviceID(psSysData, &psDeviceNode->sDevId.ui32DeviceIndex);
+	if (AllocateDeviceID(psSysData,
+			&psDeviceNode->sDevId.ui32DeviceIndex) != PVRSRV_OK) {
+		PVR_DPF(PVR_DBG_ERROR,
+			"PVRSRVRegisterDCDeviceKM: Failed deviceId alloc");
+		goto ErrorExit;
+	}
 	psDCInfo->ui32DeviceID = psDeviceNode->sDevId.ui32DeviceIndex;
 	if (pui32DeviceID)
 		*pui32DeviceID = psDeviceNode->sDevId.ui32DeviceIndex;
@@ -341,7 +346,12 @@ static enum PVRSRV_ERROR PVRSRVRegisterBCDeviceKM(
 	psDeviceNode->sDevId.eDeviceClass = PVRSRV_DEVICE_CLASS_BUFFER;
 	psDeviceNode->psSysData = psSysData;
 
-	AllocateDeviceID(psSysData, &psDeviceNode->sDevId.ui32DeviceIndex);
+	if (AllocateDeviceID(psSysData,
+			&psDeviceNode->sDevId.ui32DeviceIndex) != PVRSRV_OK) {
+		PVR_DPF(PVR_DBG_ERROR,
+			"PVRSRVRegisterBCDeviceKM: Failed deviceId alloc");
+		goto ErrorExit;
+	}
 	psBCInfo->ui32DeviceID = psDeviceNode->sDevId.ui32DeviceIndex;
 	if (pui32DeviceID)
 		*pui32DeviceID = psDeviceNode->sDevId.ui32DeviceIndex;
diff --git a/pvr/sysinfo.h b/pvr/sysinfo.h
index 2af219d..643959c 100644
--- a/pvr/sysinfo.h
+++ b/pvr/sysinfo.h
@@ -35,7 +35,7 @@ enum SYS_DEVICE_TYPE {
 	SYS_DEVICE_FORCE_I16			= 0x7fff
 };
 
-#define SYS_DEVICE_COUNT			3
+#define SYS_DEVICE_COUNT			15
 
 #define PRM_REG32(offset)			(offset)
 #define CM_REG32(offset)			(offset)
-- 
2.39.5