From 9f37229347b62d04999b0ade874eeae3ac4b731e Mon Sep 17 00:00:00 2001
From: Jon Mayo <jmayo@nvidia.com>
Date: Tue, 27 Mar 2012 17:18:48 -0700
Subject: video: tegra: dc: remove obsolete overlay interface

Remove old overlay interface, it is replaced with TEGRA_DC_EXTENSIONS
External functions made static now that overlay.c no longer needs them.

Change-Id: I5d080ceb19ad90d3b5cc4bf20494c967687293a5
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-on: http://git-master/r/92661
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Chao Xu <cxu@nvidia.com>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Kevin Huang (Eng-SW) <kevinh@nvidia.com>
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Michael I Gold <gold@nvidia.com>
Reviewed-by: Markus Holtmanns <mholtmanns@nvidia.com>
---
 include/linux/tegra_overlay.h | 79 -------------------------------------------
 1 file changed, 79 deletions(-)
 delete mode 100644 include/linux/tegra_overlay.h

(limited to 'include')

diff --git a/include/linux/tegra_overlay.h b/include/linux/tegra_overlay.h
deleted file mode 100644
index 2a6025afdad7..000000000000
--- a/include/linux/tegra_overlay.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2010 NVIDIA Corporation
- * Author: Dan Willemsen <dwillemsen@nvidia.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but 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.
- *
- */
-
-#ifndef __LINUX_TEGRA_OVERLAY_H
-#define __LINUX_TEGRA_OVERLAY_H
-
-#include <linux/ioctl.h>
-#include <linux/types.h>
-#include <video/tegrafb.h>
-
-#define TEGRA_FB_WIN_BLEND_NONE		0
-#define TEGRA_FB_WIN_BLEND_PREMULT	1
-#define TEGRA_FB_WIN_BLEND_COVERAGE	2
-
-#define TEGRA_FB_WIN_FLAG_INVERT_H	(1 << 0)
-#define TEGRA_FB_WIN_FLAG_INVERT_V	(1 << 1)
-#define TEGRA_FB_WIN_FLAG_TILED		(1 << 2)
-
-/* set index to -1 to ignore window data */
-struct tegra_overlay_windowattr {
-	__s32	index;
-	__u32	buff_id;
-	__u32	blend;
-	__u32	offset;
-	__u32	offset_u;
-	__u32	offset_v;
-	__u32	stride;
-	__u32	stride_uv;
-	__u32	pixformat;
-	__u32	x;
-	__u32	y;
-	__u32	w;
-	__u32	h;
-	__u32	out_x;
-	__u32	out_y;
-	__u32	out_w;
-	__u32	out_h;
-	__u32	z;
-	__u32	pre_syncpt_id;
-	__u32	pre_syncpt_val;
-	__u32	hfilter;
-	__u32	vfilter;
-	__u32	do_not_use__tiled; /* compatibility */
-	__u32	flags;
-};
-
-#define TEGRA_OVERLAY_FLIP_FLAG_BLEND_REORDER (1 << 0)
-#define TEGRA_FB_FLIP_N_WINDOWS			3
-
-struct tegra_overlay_flip_args {
-	struct tegra_overlay_windowattr win[TEGRA_FB_FLIP_N_WINDOWS];
-	__u32 post_syncpt_id;
-	__u32 post_syncpt_val;
-	__u32 flags;
-};
-
-#define TEGRA_OVERLAY_IOCTL_MAGIC		'O'
-
-#define TEGRA_OVERLAY_IOCTL_OPEN_WINDOW		_IOWR(TEGRA_OVERLAY_IOCTL_MAGIC, 0x40, __u32)
-#define TEGRA_OVERLAY_IOCTL_CLOSE_WINDOW	_IOW(TEGRA_OVERLAY_IOCTL_MAGIC, 0x41, __u32)
-#define TEGRA_OVERLAY_IOCTL_FLIP		_IOW(TEGRA_OVERLAY_IOCTL_MAGIC, 0x42, struct tegra_overlay_flip_args)
-#define TEGRA_OVERLAY_IOCTL_SET_NVMAP_FD	_IOW(TEGRA_OVERLAY_IOCTL_MAGIC, 0x43, __u32)
-
-#define TEGRA_OVERLAY_IOCTL_MIN_NR		_IOC_NR(TEGRA_OVERLAY_IOCTL_OPEN_WINDOW)
-#define TEGRA_OVERLAY_IOCTL_MAX_NR		_IOC_NR(TEGRA_OVERLAY_IOCTL_SET_NVMAP_FD)
-
-#endif
-- 
cgit v1.2.3