TILER: Make URBUF return the length of the buffer unregistered.

This is desired so that user-space components need not keep track
of the size of the buffer for unmapping.

Signed-off-by: Lajos Molnar <molnar@ti.com>
Signed-off-by: David Sin <davidsin@ti.com>

2 files changed, 7 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/include/mach/tiler.h b/arch/arm/mach-omap2/include/mach/tiler.h
index 7c62fe093a9..576b9344dc9 100644
--- a/arch/arm/mach-omap2/include/mach/tiler.h
+++ b/arch/arm/mach-omap2/include/mach/tiler.h
@@ -28,7 +28,7 @@
 #define TILIOC_UMBLK  _IOW('z', 104, struct tiler_block_info)
 #define TILIOC_QBUF  _IOWR('z', 105, struct tiler_buf_info)
 #define TILIOC_RBUF  _IOWR('z', 106, struct tiler_buf_info)
-#define TILIOC_URBUF  _IOW('z', 107, struct tiler_buf_info)
+#define TILIOC_URBUF _IOWR('z', 107, struct tiler_buf_info)
 #define TILIOC_QBLK  _IOWR('z', 108, struct tiler_block_info)
 #define TILIOC_PRBLK  _IOW('z', 109, struct tiler_block_info)
 #define TILIOC_URBLK  _IOW('z', 110, u32)
diff --git a/drivers/media/video/tiler/tiler-iface.c b/drivers/media/video/tiler/tiler-iface.c
index 33c3c61a036..c2b6e025030 100644
--- a/drivers/media/video/tiler/tiler-iface.c
+++ b/drivers/media/video/tiler/tiler-iface.c
@@ -459,11 +459,17 @@ static s32 tiler_ioctl(struct inode *ip, struct file *filp, u32 cmd,
                 list_for_each_entry(_b, &pi->bufs, by_pid) {
                         if (buf_info.offset == _b->buf_info.offset) {
                                 _m_unregister_buf(_b);
+                                buf_info.length = _b->buf_info.length;
                                 r = 0;
                                 break;
                         }
                 }
                 mutex_unlock(&mtx);
+
+                if (copy_to_user((void __user *)arg, &buf_info,
+                                        sizeof(_b->buf_info)))
+                        return -EFAULT;
+
                 return r;
                 break;
         case TILIOC_PRBLK: