video: dc: remove old FLIP ioctl support

TEGRA_DC_EXT_FLIP4 ioctl supports all functionalities that older
FLIP ioctls support and more. All clients have move to using FLIP4
ioctl so remove support for old FLIP ioctls to reduce maintenance
overhead and improve code coverage.

TDS-2099

Change-Id: Ib327f60b5ca0d4f9550363cf7f6a8b09b0a1b27e
Signed-off-by: Ujwal Patel <ujwalp@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1532584
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 3 insertions, 239 deletions

diff --git a/drivers/video/tegra/dc/ext/dev.c b/drivers/video/tegra/dc/ext/dev.c
index 0edf51e6b..176eb7242 100644
--- a/drivers/video/tegra/dc/ext/dev.c
+++ b/drivers/video/tegra/dc/ext/dev.c
@@ -83,9 +83,6 @@ struct tegra_dc_ext_flip_2_32 {
         __u16 dirty_rect[4]; /* x,y,w,h for partial screen update. 0 ignores */
 };
 
-#define TEGRA_DC_EXT_FLIP2_32 \
-                _IOWR('D', 0x0E, struct tegra_dc_ext_flip_2_32)
-
 #define TEGRA_DC_EXT_SET_PROPOSED_BW32 \
                 _IOR('D', 0x13, struct tegra_dc_ext_flip_2_32)
 
@@ -2441,22 +2438,6 @@ static int dev_cpy_from_usr_compat(
         }
         return 0;
 }
-
-static int dev_cpy_to_usr_compat(void *outptr, u32 usr_win_size,
-                struct tegra_dc_ext_flip_windowattr_v2 *inptr, u32 win_num)
-{
-        int i = 0;
-        u8 *dstptr;
-
-        for (i = 0; i < win_num; i++) {
-                dstptr  = (u8 *)outptr + (usr_win_size * i);
-
-                if (copy_to_user(compat_ptr((uintptr_t)dstptr),
-                        &inptr[i], usr_win_size))
-                        return -EFAULT;
-        }
-        return 0;
-}
 #endif
 
 static int dev_cpy_from_usr(struct tegra_dc_ext_flip_windowattr_v2 *outptr,
@@ -2703,189 +2684,6 @@ static long tegra_dc_ioctl(struct file *filp, unsigned int cmd,
         case TEGRA_DC_EXT_SET_WINMASK:
                 return tegra_dc_ext_set_winmask(user, arg);
 
-        case TEGRA_DC_EXT_FLIP:
-        {
-                int ret;
-                int win_num, i;
-                struct tegra_dc_ext_flip args;
-                struct tegra_dc_ext_flip_windowattr_v2 *win;
-                /* Keeping window attribute size as version1 for old
-                 *  legacy applications
-                 */
-                u32 usr_win_size = sizeof(struct tegra_dc_ext_flip_windowattr);
-
-                if (copy_from_user(&args, user_arg, sizeof(args)))
-                        return -EFAULT;
-
-                win_num = TEGRA_DC_EXT_FLIP_N_WINDOWS;
-                win = kzalloc(sizeof(*win) * win_num, GFP_KERNEL);
-                if (!win)
-                        return -EFAULT;
-
-                for (i = 0; i < win_num; i++)
-                        memcpy(&win[i], &args.win[i], usr_win_size);
-
-                ret = tegra_dc_ext_flip(user, win,
-                        TEGRA_DC_EXT_FLIP_N_WINDOWS,
-                        &args.post_syncpt_id, &args.post_syncpt_val, NULL,
-                        NULL, 0, NULL, 0, NULL);
-
-                for (i = 0; i < win_num; i++)
-                        memcpy(&args.win[i], &win[i], usr_win_size);
-
-                if (copy_to_user(user_arg, &args, sizeof(args))) {
-                        kfree(win);
-                        return -EFAULT;
-                }
-
-                kfree(win);
-                return ret;
-        }
-
-#ifdef CONFIG_COMPAT
-        case TEGRA_DC_EXT_FLIP2_32:
-        {
-                int ret;
-                int win_num;
-                struct tegra_dc_ext_flip_2_32 args;
-                struct tegra_dc_ext_flip_windowattr_v2 *win;
-
-                /* Keeping window attribute size as version1 for old
-                 *  legacy applications
-                 */
-                u32 usr_win_size = sizeof(struct tegra_dc_ext_flip_windowattr);
-
-                if (copy_from_user(&args, user_arg, sizeof(args)))
-                        return -EFAULT;
-
-                win_num = args.win_num;
-                win = kzalloc(sizeof(*win) * win_num, GFP_KERNEL);
-
-                if (dev_cpy_from_usr_compat(win, (void *)(uintptr_t)args.win,
-                                        usr_win_size, win_num)) {
-                        kfree(win);
-                        return -EFAULT;
-                }
-
-                ret = tegra_dc_ext_flip(user, win, win_num,
-                        &args.post_syncpt_id, &args.post_syncpt_val, NULL,
-                        args.dirty_rect, 0, NULL, 0, NULL);
-
-                if (dev_cpy_to_usr_compat((void *)(uintptr_t)args.win,
-                                usr_win_size, win, win_num)) {
-                        kfree(win);
-                        return -EFAULT;
-                }
-
-                if (copy_to_user(user_arg, &args, sizeof(args))) {
-                        kfree(win);
-                        return -EFAULT;
-                }
-
-                kfree(win);
-                return ret;
-        }
-
-#endif
-        case TEGRA_DC_EXT_FLIP2:
-        {
-                int ret;
-                int win_num;
-                struct tegra_dc_ext_flip_2 args;
-                struct tegra_dc_ext_flip_windowattr_v2 *win;
-
-                /* Keeping window attribute size as version1 for old
-                 *  legacy applications
-                 */
-                u32 usr_win_size = sizeof(struct tegra_dc_ext_flip_windowattr);
-
-                if (copy_from_user(&args, user_arg, sizeof(args)))
-                        return -EFAULT;
-
-                win_num = args.win_num;
-                win = kzalloc(sizeof(*win) * win_num, GFP_KERNEL);
-
-                if (dev_cpy_from_usr(win, (void *)args.win,
-                                        usr_win_size, win_num)) {
-                        kfree(win);
-                        return -EFAULT;
-                }
-
-                ret = tegra_dc_ext_flip(user, win, win_num,
-                        &args.post_syncpt_id, &args.post_syncpt_val, NULL,
-                        args.dirty_rect, 0, NULL, 0, NULL);
-
-                if (dev_cpy_to_usr((void *)args.win, usr_win_size,
-                                        win, win_num)) {
-                        kfree(win);
-                        return -EFAULT;
-                }
-
-                if (copy_to_user(user_arg, &args, sizeof(args))) {
-                        kfree(win);
-                        return -EFAULT;
-                }
-
-                kfree(win);
-                return ret;
-        }
-
-        case TEGRA_DC_EXT_FLIP3:
-        {
-                int ret;
-                int win_num;
-                struct tegra_dc_ext_flip_3 args;
-                struct tegra_dc_ext_flip_windowattr_v2 *win;
-                bool bypass;
-
-                u32 usr_win_size = sizeof(struct tegra_dc_ext_flip_windowattr);
-
-                if (copy_from_user(&args, user_arg, sizeof(args)))
-                        return -EFAULT;
-
-                bypass = !!(args.flags & TEGRA_DC_EXT_FLIP_HEAD_FLAG_YUVBYPASS);
-
-#ifndef CONFIG_TEGRA_NVDISPLAY
-                if (!!(user->ext->dc->mode.vmode & FB_VMODE_YUV_MASK) !=
-                    bypass)
-                        return -EINVAL;
-#endif
-
-                if (bypass != user->ext->dc->yuv_bypass)
-                        user->ext->dc->yuv_bypass_dirty = true;
-                user->ext->dc->yuv_bypass = bypass;
-                win_num = args.win_num;
-                win = kzalloc(sizeof(*win) * win_num, GFP_KERNEL);
-
-                if (args.flags &
-                                TEGRA_DC_EXT_FLIP_HEAD_FLAG_V2_ATTR)
-                        usr_win_size =
-                                sizeof(struct tegra_dc_ext_flip_windowattr_v2);
-
-                if (dev_cpy_from_usr(win, (void *)args.win,
-                                        usr_win_size, win_num)) {
-                        kfree(win);
-                        return -EFAULT;
-                }
-
-                ret = tegra_dc_ext_flip(user, win, win_num,
-                        NULL, NULL, &args.post_syncpt_fd, args.dirty_rect,
-                        args.flags, NULL, 0, NULL);
-
-                if (dev_cpy_to_usr((void *)args.win, usr_win_size,
-                                        win, win_num)) {
-                        kfree(win);
-                        return -EFAULT;
-                }
-
-                if (copy_to_user(user_arg, &args, sizeof(args))) {
-                        kfree(win);
-                        return -EFAULT;
-                }
-
-                kfree(win);
-                return ret;
-        }
         case TEGRA_DC_EXT_FLIP4:
         {
                 int ret;
diff --git a/include/video/tegra_dc_ext.h b/include/video/tegra_dc_ext.h
index 5aa5d9d7e..c68515cd7 100644
--- a/include/video/tegra_dc_ext.h
+++ b/include/video/tegra_dc_ext.h
@@ -373,14 +373,6 @@ struct tegra_dc_ext_flip_windowattr_v2 {
         };
 };
 
-#define TEGRA_DC_EXT_FLIP_N_WINDOWS     3
-
-struct tegra_dc_ext_flip {
-        struct tegra_dc_ext_flip_windowattr win[TEGRA_DC_EXT_FLIP_N_WINDOWS];
-        __u32 post_syncpt_id;
-        __u32 post_syncpt_val;
-};
-
 /*
  * Variable win is the pointer to struct tegra_dc_ext_flip_windowattr.
  * Using the modified struct to avoid code conflict in user mode,
@@ -389,7 +381,6 @@ struct tegra_dc_ext_flip {
  * for flip2 use case.
  *
  */
-
 struct tegra_dc_ext_flip_2 {
         struct tegra_dc_ext_flip_windowattr __user *win;
         __u8 win_num;
@@ -400,22 +391,6 @@ struct tegra_dc_ext_flip_2 {
         __u16 dirty_rect[4]; /* x,y,w,h for partial screen update. 0 ignores */
 };
 
-/*
- * Variable win is the pointer to struct tegra_dc_ext_flip_windowattr_v2.
- * Flags has set to use TEGRA_DC_EXT_FLIP_HEAD_FLAG_V2_ATTR,
- * then use struct tegra_dc_ext_flip_windowattr_v2. If flag is not set
- * to use V2_ATTR, then code will use old struct tegra_dc_ext_flip_windowattr
- *
-*/
-struct tegra_dc_ext_flip_3 {
-        __u64 __user win;
-        __u8 win_num;
-        __u8 flags;
-        __u16 reserved2; /* unused - must be 0 */
-        __s32 post_syncpt_fd;
-        __u16 dirty_rect[4]; /* x,y,w,h for partial screen update. 0 ignores */
-};
-
 enum tegra_dc_ext_flip_data_type {
         TEGRA_DC_EXT_FLIP_USER_DATA_NONE, /* dummy value - do not use */
         TEGRA_DC_EXT_FLIP_USER_DATA_HDR_DATA,
@@ -649,9 +624,9 @@ struct tegra_dc_ext_flip_user_data {
 } __attribute__((__packed__));
 
 /*
- *tegra_dc_flip_4 : Incorporates a new pointer to an array of 32 bytes of data
- *to pass head specific info. The new nr_elements carries the number of such
- *elements. Everything else remains the same as in tegra_dc_ext_flip_3
+ * tegra_dc_flip_4 : Incorporates a new pointer to an array of 32 bytes of data
+ * to pass head specific info. The new nr_elements carries the number of such
+ * elements.
  */
 struct tegra_dc_ext_flip_4 {
         __u64 __user win;
@@ -1153,9 +1128,6 @@ struct tegra_dc_ext_scanline_info {
 #define TEGRA_DC_EXT_PUT_WINDOW \
         _IOW('D', 0x02, __u32)
 
-#define TEGRA_DC_EXT_FLIP \
-        _IOWR('D', 0x03, struct tegra_dc_ext_flip)
-
 #define TEGRA_DC_EXT_GET_CURSOR \
         _IO('D', 0x04)
 #define TEGRA_DC_EXT_PUT_CURSOR \
@@ -1187,9 +1159,6 @@ struct tegra_dc_ext_scanline_info {
 #define TEGRA_DC_EXT_SET_CMU \
         _IOW('D', 0x0D, struct tegra_dc_ext_cmu)
 
-#define TEGRA_DC_EXT_FLIP2 \
-        _IOWR('D', 0x0E, struct tegra_dc_ext_flip_2)
-
 #define TEGRA_DC_EXT_GET_CMU \
         _IOR('D', 0x0F, struct tegra_dc_ext_cmu)
 
@@ -1199,9 +1168,6 @@ struct tegra_dc_ext_scanline_info {
 #define TEGRA_DC_EXT_SET_PROPOSED_BW \
         _IOR('D', 0x13, struct tegra_dc_ext_flip_2)
 
-#define TEGRA_DC_EXT_FLIP3 \
-        _IOWR('D', 0x14, struct tegra_dc_ext_flip_3)
-
 #define TEGRA_DC_EXT_SET_VBLANK \
         _IOW('D', 0x15, struct tegra_dc_ext_set_vblank)