summaryrefslogtreecommitdiffstats
path: root/include/video
diff options
context:
space:
mode:
authorUjwal Patel <ujwalp@nvidia.com>2017-08-03 18:40:56 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-08-11 07:32:07 -0400
commit9fed5c1e8af160d8ea8e3e45a5f12ed84becf4bd (patch)
treeff9e082a439074e85eac50136ed56ee0ef2fdcb7 /include/video
parent85810fad44c03b9c755543095cd06ccfe565b391 (diff)
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>
Diffstat (limited to 'include/video')
-rw-r--r--include/video/tegra_dc_ext.h40
1 files changed, 3 insertions, 37 deletions
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 {
373 }; 373 };
374}; 374};
375 375
376#define TEGRA_DC_EXT_FLIP_N_WINDOWS 3
377
378struct tegra_dc_ext_flip {
379 struct tegra_dc_ext_flip_windowattr win[TEGRA_DC_EXT_FLIP_N_WINDOWS];
380 __u32 post_syncpt_id;
381 __u32 post_syncpt_val;
382};
383
384/* 376/*
385 * Variable win is the pointer to struct tegra_dc_ext_flip_windowattr. 377 * Variable win is the pointer to struct tegra_dc_ext_flip_windowattr.
386 * Using the modified struct to avoid code conflict in user mode, 378 * Using the modified struct to avoid code conflict in user mode,
@@ -389,7 +381,6 @@ struct tegra_dc_ext_flip {
389 * for flip2 use case. 381 * for flip2 use case.
390 * 382 *
391 */ 383 */
392
393struct tegra_dc_ext_flip_2 { 384struct tegra_dc_ext_flip_2 {
394 struct tegra_dc_ext_flip_windowattr __user *win; 385 struct tegra_dc_ext_flip_windowattr __user *win;
395 __u8 win_num; 386 __u8 win_num;
@@ -400,22 +391,6 @@ struct tegra_dc_ext_flip_2 {
400 __u16 dirty_rect[4]; /* x,y,w,h for partial screen update. 0 ignores */ 391 __u16 dirty_rect[4]; /* x,y,w,h for partial screen update. 0 ignores */
401}; 392};
402 393
403/*
404 * Variable win is the pointer to struct tegra_dc_ext_flip_windowattr_v2.
405 * Flags has set to use TEGRA_DC_EXT_FLIP_HEAD_FLAG_V2_ATTR,
406 * then use struct tegra_dc_ext_flip_windowattr_v2. If flag is not set
407 * to use V2_ATTR, then code will use old struct tegra_dc_ext_flip_windowattr
408 *
409*/
410struct tegra_dc_ext_flip_3 {
411 __u64 __user win;
412 __u8 win_num;
413 __u8 flags;
414 __u16 reserved2; /* unused - must be 0 */
415 __s32 post_syncpt_fd;
416 __u16 dirty_rect[4]; /* x,y,w,h for partial screen update. 0 ignores */
417};
418
419enum tegra_dc_ext_flip_data_type { 394enum tegra_dc_ext_flip_data_type {
420 TEGRA_DC_EXT_FLIP_USER_DATA_NONE, /* dummy value - do not use */ 395 TEGRA_DC_EXT_FLIP_USER_DATA_NONE, /* dummy value - do not use */
421 TEGRA_DC_EXT_FLIP_USER_DATA_HDR_DATA, 396 TEGRA_DC_EXT_FLIP_USER_DATA_HDR_DATA,
@@ -649,9 +624,9 @@ struct tegra_dc_ext_flip_user_data {
649} __attribute__((__packed__)); 624} __attribute__((__packed__));
650 625
651/* 626/*
652 *tegra_dc_flip_4 : Incorporates a new pointer to an array of 32 bytes of data 627 * tegra_dc_flip_4 : Incorporates a new pointer to an array of 32 bytes of data
653 *to pass head specific info. The new nr_elements carries the number of such 628 * to pass head specific info. The new nr_elements carries the number of such
654 *elements. Everything else remains the same as in tegra_dc_ext_flip_3 629 * elements.
655 */ 630 */
656struct tegra_dc_ext_flip_4 { 631struct tegra_dc_ext_flip_4 {
657 __u64 __user win; 632 __u64 __user win;
@@ -1153,9 +1128,6 @@ struct tegra_dc_ext_scanline_info {
1153#define TEGRA_DC_EXT_PUT_WINDOW \ 1128#define TEGRA_DC_EXT_PUT_WINDOW \
1154 _IOW('D', 0x02, __u32) 1129 _IOW('D', 0x02, __u32)
1155 1130
1156#define TEGRA_DC_EXT_FLIP \
1157 _IOWR('D', 0x03, struct tegra_dc_ext_flip)
1158
1159#define TEGRA_DC_EXT_GET_CURSOR \ 1131#define TEGRA_DC_EXT_GET_CURSOR \
1160 _IO('D', 0x04) 1132 _IO('D', 0x04)
1161#define TEGRA_DC_EXT_PUT_CURSOR \ 1133#define TEGRA_DC_EXT_PUT_CURSOR \
@@ -1187,9 +1159,6 @@ struct tegra_dc_ext_scanline_info {
1187#define TEGRA_DC_EXT_SET_CMU \ 1159#define TEGRA_DC_EXT_SET_CMU \
1188 _IOW('D', 0x0D, struct tegra_dc_ext_cmu) 1160 _IOW('D', 0x0D, struct tegra_dc_ext_cmu)
1189 1161
1190#define TEGRA_DC_EXT_FLIP2 \
1191 _IOWR('D', 0x0E, struct tegra_dc_ext_flip_2)
1192
1193#define TEGRA_DC_EXT_GET_CMU \ 1162#define TEGRA_DC_EXT_GET_CMU \
1194 _IOR('D', 0x0F, struct tegra_dc_ext_cmu) 1163 _IOR('D', 0x0F, struct tegra_dc_ext_cmu)
1195 1164
@@ -1199,9 +1168,6 @@ struct tegra_dc_ext_scanline_info {
1199#define TEGRA_DC_EXT_SET_PROPOSED_BW \ 1168#define TEGRA_DC_EXT_SET_PROPOSED_BW \
1200 _IOR('D', 0x13, struct tegra_dc_ext_flip_2) 1169 _IOR('D', 0x13, struct tegra_dc_ext_flip_2)
1201 1170
1202#define TEGRA_DC_EXT_FLIP3 \
1203 _IOWR('D', 0x14, struct tegra_dc_ext_flip_3)
1204
1205#define TEGRA_DC_EXT_SET_VBLANK \ 1171#define TEGRA_DC_EXT_SET_VBLANK \
1206 _IOW('D', 0x15, struct tegra_dc_ext_set_vblank) 1172 _IOW('D', 0x15, struct tegra_dc_ext_set_vblank)
1207 1173