aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/ecryptfs.h12
-rw-r--r--include/linux/hardirq.h2
-rw-r--r--include/linux/netfilter/ipset/ip_set_ahash.h4
-rw-r--r--include/linux/regulator/driver.h2
-rw-r--r--include/linux/smpboot.h4
-rw-r--r--include/net/tcp.h4
-rw-r--r--include/uapi/video/Kbuild3
-rw-r--r--include/uapi/video/edid.h9
-rw-r--r--include/uapi/video/sisfb.h209
-rw-r--r--include/uapi/video/uvesafb.h60
-rw-r--r--include/video/Kbuild3
-rw-r--r--include/video/edid.h7
-rw-r--r--include/video/sisfb.h189
-rw-r--r--include/video/uvesafb.h58
14 files changed, 299 insertions, 267 deletions
diff --git a/include/linux/ecryptfs.h b/include/linux/ecryptfs.h
index 2224a8c0cb64..8d5ab998a222 100644
--- a/include/linux/ecryptfs.h
+++ b/include/linux/ecryptfs.h
@@ -6,9 +6,8 @@
6#define ECRYPTFS_VERSION_MINOR 0x04 6#define ECRYPTFS_VERSION_MINOR 0x04
7#define ECRYPTFS_SUPPORTED_FILE_VERSION 0x03 7#define ECRYPTFS_SUPPORTED_FILE_VERSION 0x03
8/* These flags indicate which features are supported by the kernel 8/* These flags indicate which features are supported by the kernel
9 * module; userspace tools such as the mount helper read 9 * module; userspace tools such as the mount helper read the feature
10 * ECRYPTFS_VERSIONING_MASK from a sysfs handle in order to determine 10 * bits from a sysfs handle in order to determine how to behave. */
11 * how to behave. */
12#define ECRYPTFS_VERSIONING_PASSPHRASE 0x00000001 11#define ECRYPTFS_VERSIONING_PASSPHRASE 0x00000001
13#define ECRYPTFS_VERSIONING_PUBKEY 0x00000002 12#define ECRYPTFS_VERSIONING_PUBKEY 0x00000002
14#define ECRYPTFS_VERSIONING_PLAINTEXT_PASSTHROUGH 0x00000004 13#define ECRYPTFS_VERSIONING_PLAINTEXT_PASSTHROUGH 0x00000004
@@ -19,13 +18,6 @@
19#define ECRYPTFS_VERSIONING_HMAC 0x00000080 18#define ECRYPTFS_VERSIONING_HMAC 0x00000080
20#define ECRYPTFS_VERSIONING_FILENAME_ENCRYPTION 0x00000100 19#define ECRYPTFS_VERSIONING_FILENAME_ENCRYPTION 0x00000100
21#define ECRYPTFS_VERSIONING_GCM 0x00000200 20#define ECRYPTFS_VERSIONING_GCM 0x00000200
22#define ECRYPTFS_VERSIONING_MASK (ECRYPTFS_VERSIONING_PASSPHRASE \
23 | ECRYPTFS_VERSIONING_PLAINTEXT_PASSTHROUGH \
24 | ECRYPTFS_VERSIONING_PUBKEY \
25 | ECRYPTFS_VERSIONING_XATTR \
26 | ECRYPTFS_VERSIONING_MULTKEY \
27 | ECRYPTFS_VERSIONING_DEVMISC \
28 | ECRYPTFS_VERSIONING_FILENAME_ENCRYPTION)
29#define ECRYPTFS_MAX_PASSWORD_LENGTH 64 21#define ECRYPTFS_MAX_PASSWORD_LENGTH 64
30#define ECRYPTFS_MAX_PASSPHRASE_BYTES ECRYPTFS_MAX_PASSWORD_LENGTH 22#define ECRYPTFS_MAX_PASSPHRASE_BYTES ECRYPTFS_MAX_PASSWORD_LENGTH
31#define ECRYPTFS_SALT_SIZE 8 23#define ECRYPTFS_SALT_SIZE 8
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index 29eb805ea4a6..c1d6555d2567 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -118,10 +118,8 @@
118 118
119#ifdef CONFIG_PREEMPT_COUNT 119#ifdef CONFIG_PREEMPT_COUNT
120# define preemptible() (preempt_count() == 0 && !irqs_disabled()) 120# define preemptible() (preempt_count() == 0 && !irqs_disabled())
121# define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1)
122#else 121#else
123# define preemptible() 0 122# define preemptible() 0
124# define IRQ_EXIT_OFFSET HARDIRQ_OFFSET
125#endif 123#endif
126 124
127#if defined(CONFIG_SMP) || defined(CONFIG_GENERIC_HARDIRQS) 125#if defined(CONFIG_SMP) || defined(CONFIG_GENERIC_HARDIRQS)
diff --git a/include/linux/netfilter/ipset/ip_set_ahash.h b/include/linux/netfilter/ipset/ip_set_ahash.h
index ef9acd3c8450..01d25e6fc792 100644
--- a/include/linux/netfilter/ipset/ip_set_ahash.h
+++ b/include/linux/netfilter/ipset/ip_set_ahash.h
@@ -854,6 +854,8 @@ type_pf_tresize(struct ip_set *set, bool retried)
854retry: 854retry:
855 ret = 0; 855 ret = 0;
856 htable_bits++; 856 htable_bits++;
857 pr_debug("attempt to resize set %s from %u to %u, t %p\n",
858 set->name, orig->htable_bits, htable_bits, orig);
857 if (!htable_bits) { 859 if (!htable_bits) {
858 /* In case we have plenty of memory :-) */ 860 /* In case we have plenty of memory :-) */
859 pr_warning("Cannot increase the hashsize of set %s further\n", 861 pr_warning("Cannot increase the hashsize of set %s further\n",
@@ -873,7 +875,7 @@ retry:
873 data = ahash_tdata(n, j); 875 data = ahash_tdata(n, j);
874 m = hbucket(t, HKEY(data, h->initval, htable_bits)); 876 m = hbucket(t, HKEY(data, h->initval, htable_bits));
875 ret = type_pf_elem_tadd(m, data, AHASH_MAX(h), 0, 877 ret = type_pf_elem_tadd(m, data, AHASH_MAX(h), 0,
876 type_pf_data_timeout(data)); 878 ip_set_timeout_get(type_pf_data_timeout(data)));
877 if (ret < 0) { 879 if (ret < 0) {
878 read_unlock_bh(&set->lock); 880 read_unlock_bh(&set->lock);
879 ahash_destroy(t); 881 ahash_destroy(t);
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 23070fd83872..7df93f52db08 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -199,6 +199,8 @@ enum regulator_type {
199 * output when using regulator_set_voltage_sel_regmap 199 * output when using regulator_set_voltage_sel_regmap
200 * @enable_reg: Register for control when using regmap enable/disable ops 200 * @enable_reg: Register for control when using regmap enable/disable ops
201 * @enable_mask: Mask for control when using regmap enable/disable ops 201 * @enable_mask: Mask for control when using regmap enable/disable ops
202 * @bypass_reg: Register for control when using regmap set_bypass
203 * @bypass_mask: Mask for control when using regmap set_bypass
202 * 204 *
203 * @enable_time: Time taken for initial enable of regulator (in uS). 205 * @enable_time: Time taken for initial enable of regulator (in uS).
204 */ 206 */
diff --git a/include/linux/smpboot.h b/include/linux/smpboot.h
index c65dee059913..13e929679550 100644
--- a/include/linux/smpboot.h
+++ b/include/linux/smpboot.h
@@ -24,6 +24,9 @@ struct smpboot_thread_data;
24 * parked (cpu offline) 24 * parked (cpu offline)
25 * @unpark: Optional unpark function, called when the thread is 25 * @unpark: Optional unpark function, called when the thread is
26 * unparked (cpu online) 26 * unparked (cpu online)
27 * @pre_unpark: Optional unpark function, called before the thread is
28 * unparked (cpu online). This is not guaranteed to be
29 * called on the target cpu of the thread. Careful!
27 * @selfparking: Thread is not parked by the park function. 30 * @selfparking: Thread is not parked by the park function.
28 * @thread_comm: The base name of the thread 31 * @thread_comm: The base name of the thread
29 */ 32 */
@@ -37,6 +40,7 @@ struct smp_hotplug_thread {
37 void (*cleanup)(unsigned int cpu, bool online); 40 void (*cleanup)(unsigned int cpu, bool online);
38 void (*park)(unsigned int cpu); 41 void (*park)(unsigned int cpu);
39 void (*unpark)(unsigned int cpu); 42 void (*unpark)(unsigned int cpu);
43 void (*pre_unpark)(unsigned int cpu);
40 bool selfparking; 44 bool selfparking;
41 const char *thread_comm; 45 const char *thread_comm;
42}; 46};
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 23f2e98d4b65..cf0694d4ad60 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1045,6 +1045,10 @@ static inline bool tcp_prequeue(struct sock *sk, struct sk_buff *skb)
1045 if (sysctl_tcp_low_latency || !tp->ucopy.task) 1045 if (sysctl_tcp_low_latency || !tp->ucopy.task)
1046 return false; 1046 return false;
1047 1047
1048 if (skb->len <= tcp_hdrlen(skb) &&
1049 skb_queue_len(&tp->ucopy.prequeue) == 0)
1050 return false;
1051
1048 __skb_queue_tail(&tp->ucopy.prequeue, skb); 1052 __skb_queue_tail(&tp->ucopy.prequeue, skb);
1049 tp->ucopy.memory += skb->truesize; 1053 tp->ucopy.memory += skb->truesize;
1050 if (tp->ucopy.memory > sk->sk_rcvbuf) { 1054 if (tp->ucopy.memory > sk->sk_rcvbuf) {
diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild
index aafaa5aa54d4..ac7203bb32cc 100644
--- a/include/uapi/video/Kbuild
+++ b/include/uapi/video/Kbuild
@@ -1 +1,4 @@
1# UAPI Header export list 1# UAPI Header export list
2header-y += edid.h
3header-y += sisfb.h
4header-y += uvesafb.h
diff --git a/include/uapi/video/edid.h b/include/uapi/video/edid.h
new file mode 100644
index 000000000000..8c0f032014c9
--- /dev/null
+++ b/include/uapi/video/edid.h
@@ -0,0 +1,9 @@
1#ifndef _UAPI__linux_video_edid_h__
2#define _UAPI__linux_video_edid_h__
3
4struct edid_info {
5 unsigned char dummy[128];
6};
7
8
9#endif /* _UAPI__linux_video_edid_h__ */
diff --git a/include/uapi/video/sisfb.h b/include/uapi/video/sisfb.h
new file mode 100644
index 000000000000..9250b22b10f8
--- /dev/null
+++ b/include/uapi/video/sisfb.h
@@ -0,0 +1,209 @@
1/*
2 * sisfb.h - definitions for the SiS framebuffer driver
3 *
4 * Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria.
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the named License,
9 * or any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
19 */
20
21#ifndef _UAPI_LINUX_SISFB_H_
22#define _UAPI_LINUX_SISFB_H_
23
24#include <linux/types.h>
25#include <asm/ioctl.h>
26
27/**********************************************/
28/* PUBLIC */
29/**********************************************/
30
31/* vbflags, public (others in sis.h) */
32#define CRT2_DEFAULT 0x00000001
33#define CRT2_LCD 0x00000002
34#define CRT2_TV 0x00000004
35#define CRT2_VGA 0x00000008
36#define TV_NTSC 0x00000010
37#define TV_PAL 0x00000020
38#define TV_HIVISION 0x00000040
39#define TV_YPBPR 0x00000080
40#define TV_AVIDEO 0x00000100
41#define TV_SVIDEO 0x00000200
42#define TV_SCART 0x00000400
43#define TV_PALM 0x00001000
44#define TV_PALN 0x00002000
45#define TV_NTSCJ 0x00001000
46#define TV_CHSCART 0x00008000
47#define TV_CHYPBPR525I 0x00010000
48#define CRT1_VGA 0x00000000
49#define CRT1_LCDA 0x00020000
50#define VGA2_CONNECTED 0x00040000
51#define VB_DISPTYPE_CRT1 0x00080000 /* CRT1 connected and used */
52#define VB_SINGLE_MODE 0x20000000 /* CRT1 or CRT2; determined by DISPTYPE_CRTx */
53#define VB_MIRROR_MODE 0x40000000 /* CRT1 + CRT2 identical (mirror mode) */
54#define VB_DUALVIEW_MODE 0x80000000 /* CRT1 + CRT2 independent (dual head mode) */
55
56/* Aliases: */
57#define CRT2_ENABLE (CRT2_LCD | CRT2_TV | CRT2_VGA)
58#define TV_STANDARD (TV_NTSC | TV_PAL | TV_PALM | TV_PALN | TV_NTSCJ)
59#define TV_INTERFACE (TV_AVIDEO|TV_SVIDEO|TV_SCART|TV_HIVISION|TV_YPBPR|TV_CHSCART|TV_CHYPBPR525I)
60
61/* Only if TV_YPBPR is set: */
62#define TV_YPBPR525I TV_NTSC
63#define TV_YPBPR525P TV_PAL
64#define TV_YPBPR750P TV_PALM
65#define TV_YPBPR1080I TV_PALN
66#define TV_YPBPRALL (TV_YPBPR525I | TV_YPBPR525P | TV_YPBPR750P | TV_YPBPR1080I)
67
68#define VB_DISPTYPE_DISP2 CRT2_ENABLE
69#define VB_DISPTYPE_CRT2 CRT2_ENABLE
70#define VB_DISPTYPE_DISP1 VB_DISPTYPE_CRT1
71#define VB_DISPMODE_SINGLE VB_SINGLE_MODE
72#define VB_DISPMODE_MIRROR VB_MIRROR_MODE
73#define VB_DISPMODE_DUAL VB_DUALVIEW_MODE
74#define VB_DISPLAY_MODE (SINGLE_MODE | MIRROR_MODE | DUALVIEW_MODE)
75
76/* Structure argument for SISFB_GET_INFO ioctl */
77struct sisfb_info {
78 __u32 sisfb_id; /* for identifying sisfb */
79#ifndef SISFB_ID
80#define SISFB_ID 0x53495346 /* Identify myself with 'SISF' */
81#endif
82 __u32 chip_id; /* PCI-ID of detected chip */
83 __u32 memory; /* total video memory in KB */
84 __u32 heapstart; /* heap start offset in KB */
85 __u8 fbvidmode; /* current sisfb mode */
86
87 __u8 sisfb_version;
88 __u8 sisfb_revision;
89 __u8 sisfb_patchlevel;
90
91 __u8 sisfb_caps; /* sisfb capabilities */
92
93 __u32 sisfb_tqlen; /* turbo queue length (in KB) */
94
95 __u32 sisfb_pcibus; /* The card's PCI ID */
96 __u32 sisfb_pcislot;
97 __u32 sisfb_pcifunc;
98
99 __u8 sisfb_lcdpdc; /* PanelDelayCompensation */
100
101 __u8 sisfb_lcda; /* Detected status of LCDA for low res/text modes */
102
103 __u32 sisfb_vbflags;
104 __u32 sisfb_currentvbflags;
105
106 __u32 sisfb_scalelcd;
107 __u32 sisfb_specialtiming;
108
109 __u8 sisfb_haveemi;
110 __u8 sisfb_emi30,sisfb_emi31,sisfb_emi32,sisfb_emi33;
111 __u8 sisfb_haveemilcd;
112
113 __u8 sisfb_lcdpdca; /* PanelDelayCompensation for LCD-via-CRT1 */
114
115 __u16 sisfb_tvxpos, sisfb_tvypos; /* Warning: Values + 32 ! */
116
117 __u32 sisfb_heapsize; /* heap size (in KB) */
118 __u32 sisfb_videooffset; /* Offset of viewport in video memory (in bytes) */
119
120 __u32 sisfb_curfstn; /* currently running FSTN/DSTN mode */
121 __u32 sisfb_curdstn;
122
123 __u16 sisfb_pci_vendor; /* PCI vendor (SiS or XGI) */
124
125 __u32 sisfb_vbflags2; /* ivideo->vbflags2 */
126
127 __u8 sisfb_can_post; /* sisfb can POST this card */
128 __u8 sisfb_card_posted; /* card is POSTED */
129 __u8 sisfb_was_boot_device; /* This card was the boot video device (ie is primary) */
130
131 __u8 reserved[183]; /* for future use */
132};
133
134#define SISFB_CMD_GETVBFLAGS 0x55AA0001 /* no arg; result[1] = vbflags */
135#define SISFB_CMD_SWITCHCRT1 0x55AA0010 /* arg[0]: 99 = query, 0 = off, 1 = on */
136/* more to come */
137
138#define SISFB_CMD_ERR_OK 0x80000000 /* command succeeded */
139#define SISFB_CMD_ERR_LOCKED 0x80000001 /* sisfb is locked */
140#define SISFB_CMD_ERR_EARLY 0x80000002 /* request before sisfb took over gfx system */
141#define SISFB_CMD_ERR_NOVB 0x80000003 /* No video bridge */
142#define SISFB_CMD_ERR_NOCRT2 0x80000004 /* can't change CRT1 status, CRT2 disabled */
143/* more to come */
144#define SISFB_CMD_ERR_UNKNOWN 0x8000ffff /* Unknown command */
145#define SISFB_CMD_ERR_OTHER 0x80010000 /* Other error */
146
147/* Argument for SISFB_CMD ioctl */
148struct sisfb_cmd {
149 __u32 sisfb_cmd;
150 __u32 sisfb_arg[16];
151 __u32 sisfb_result[4];
152};
153
154/* Additional IOCTLs for communication sisfb <> X driver */
155/* If changing this, vgatypes.h must also be changed (for X driver) */
156
157/* ioctl for identifying and giving some info (esp. memory heap start) */
158#define SISFB_GET_INFO_SIZE _IOR(0xF3,0x00,__u32)
159#define SISFB_GET_INFO _IOR(0xF3,0x01,struct sisfb_info)
160
161/* ioctrl to get current vertical retrace status */
162#define SISFB_GET_VBRSTATUS _IOR(0xF3,0x02,__u32)
163
164/* ioctl to enable/disable panning auto-maximize (like nomax parameter) */
165#define SISFB_GET_AUTOMAXIMIZE _IOR(0xF3,0x03,__u32)
166#define SISFB_SET_AUTOMAXIMIZE _IOW(0xF3,0x03,__u32)
167
168/* ioctls to relocate TV output (x=D[31:16], y=D[15:0], + 32)*/
169#define SISFB_GET_TVPOSOFFSET _IOR(0xF3,0x04,__u32)
170#define SISFB_SET_TVPOSOFFSET _IOW(0xF3,0x04,__u32)
171
172/* ioctl for internal sisfb commands (sisfbctrl) */
173#define SISFB_COMMAND _IOWR(0xF3,0x05,struct sisfb_cmd)
174
175/* ioctl for locking sisfb (no register access during lock) */
176/* As of now, only used to avoid register access during
177 * the ioctls listed above.
178 */
179#define SISFB_SET_LOCK _IOW(0xF3,0x06,__u32)
180
181/* ioctls 0xF3 up to 0x3F reserved for sisfb */
182
183/****************************************************************/
184/* The following are deprecated and should not be used anymore: */
185/****************************************************************/
186/* ioctl for identifying and giving some info (esp. memory heap start) */
187#define SISFB_GET_INFO_OLD _IOR('n',0xF8,__u32)
188/* ioctrl to get current vertical retrace status */
189#define SISFB_GET_VBRSTATUS_OLD _IOR('n',0xF9,__u32)
190/* ioctl to enable/disable panning auto-maximize (like nomax parameter) */
191#define SISFB_GET_AUTOMAXIMIZE_OLD _IOR('n',0xFA,__u32)
192#define SISFB_SET_AUTOMAXIMIZE_OLD _IOW('n',0xFA,__u32)
193/****************************************************************/
194/* End of deprecated ioctl numbers */
195/****************************************************************/
196
197/* For fb memory manager (FBIO_ALLOC, FBIO_FREE) */
198struct sis_memreq {
199 __u32 offset;
200 __u32 size;
201};
202
203/**********************************************/
204/* PRIVATE */
205/* (for IN-KERNEL usage only) */
206/**********************************************/
207
208
209#endif /* _UAPI_LINUX_SISFB_H_ */
diff --git a/include/uapi/video/uvesafb.h b/include/uapi/video/uvesafb.h
new file mode 100644
index 000000000000..cee063d723ad
--- /dev/null
+++ b/include/uapi/video/uvesafb.h
@@ -0,0 +1,60 @@
1#ifndef _UAPI_UVESAFB_H
2#define _UAPI_UVESAFB_H
3
4#include <linux/types.h>
5
6struct v86_regs {
7 __u32 ebx;
8 __u32 ecx;
9 __u32 edx;
10 __u32 esi;
11 __u32 edi;
12 __u32 ebp;
13 __u32 eax;
14 __u32 eip;
15 __u32 eflags;
16 __u32 esp;
17 __u16 cs;
18 __u16 ss;
19 __u16 es;
20 __u16 ds;
21 __u16 fs;
22 __u16 gs;
23};
24
25/* Task flags */
26#define TF_VBEIB 0x01
27#define TF_BUF_ESDI 0x02
28#define TF_BUF_ESBX 0x04
29#define TF_BUF_RET 0x08
30#define TF_EXIT 0x10
31
32struct uvesafb_task {
33 __u8 flags;
34 int buf_len;
35 struct v86_regs regs;
36};
37
38/* Constants for the capabilities field
39 * in vbe_ib */
40#define VBE_CAP_CAN_SWITCH_DAC 0x01
41#define VBE_CAP_VGACOMPAT 0x02
42
43/* The VBE Info Block */
44struct vbe_ib {
45 char vbe_signature[4];
46 __u16 vbe_version;
47 __u32 oem_string_ptr;
48 __u32 capabilities;
49 __u32 mode_list_ptr;
50 __u16 total_memory;
51 __u16 oem_software_rev;
52 __u32 oem_vendor_name_ptr;
53 __u32 oem_product_name_ptr;
54 __u32 oem_product_rev_ptr;
55 __u8 reserved[222];
56 char oem_data[256];
57 char misc_data[512];
58} __attribute__ ((packed));
59
60#endif /* _UAPI_UVESAFB_H */
diff --git a/include/video/Kbuild b/include/video/Kbuild
index ad3e622c5339..e69de29bb2d1 100644
--- a/include/video/Kbuild
+++ b/include/video/Kbuild
@@ -1,3 +0,0 @@
1header-y += edid.h
2header-y += sisfb.h
3header-y += uvesafb.h
diff --git a/include/video/edid.h b/include/video/edid.h
index c5f198704912..0cb8b2a92b75 100644
--- a/include/video/edid.h
+++ b/include/video/edid.h
@@ -1,14 +1,9 @@
1#ifndef __linux_video_edid_h__ 1#ifndef __linux_video_edid_h__
2#define __linux_video_edid_h__ 2#define __linux_video_edid_h__
3 3
4struct edid_info { 4#include <uapi/video/edid.h>
5 unsigned char dummy[128];
6};
7 5
8#ifdef __KERNEL__
9#ifdef CONFIG_X86 6#ifdef CONFIG_X86
10extern struct edid_info edid_info; 7extern struct edid_info edid_info;
11#endif 8#endif
12#endif
13
14#endif /* __linux_video_edid_h__ */ 9#endif /* __linux_video_edid_h__ */
diff --git a/include/video/sisfb.h b/include/video/sisfb.h
index 6dc5df9e43f3..6ddff93108fb 100644
--- a/include/video/sisfb.h
+++ b/include/video/sisfb.h
@@ -17,197 +17,12 @@
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
19 */ 19 */
20
21#ifndef _LINUX_SISFB_H_ 20#ifndef _LINUX_SISFB_H_
22#define _LINUX_SISFB_H_ 21#define _LINUX_SISFB_H_
23 22
24#include <linux/types.h>
25#include <asm/ioctl.h>
26
27/**********************************************/
28/* PUBLIC */
29/**********************************************/
30
31/* vbflags, public (others in sis.h) */
32#define CRT2_DEFAULT 0x00000001
33#define CRT2_LCD 0x00000002
34#define CRT2_TV 0x00000004
35#define CRT2_VGA 0x00000008
36#define TV_NTSC 0x00000010
37#define TV_PAL 0x00000020
38#define TV_HIVISION 0x00000040
39#define TV_YPBPR 0x00000080
40#define TV_AVIDEO 0x00000100
41#define TV_SVIDEO 0x00000200
42#define TV_SCART 0x00000400
43#define TV_PALM 0x00001000
44#define TV_PALN 0x00002000
45#define TV_NTSCJ 0x00001000
46#define TV_CHSCART 0x00008000
47#define TV_CHYPBPR525I 0x00010000
48#define CRT1_VGA 0x00000000
49#define CRT1_LCDA 0x00020000
50#define VGA2_CONNECTED 0x00040000
51#define VB_DISPTYPE_CRT1 0x00080000 /* CRT1 connected and used */
52#define VB_SINGLE_MODE 0x20000000 /* CRT1 or CRT2; determined by DISPTYPE_CRTx */
53#define VB_MIRROR_MODE 0x40000000 /* CRT1 + CRT2 identical (mirror mode) */
54#define VB_DUALVIEW_MODE 0x80000000 /* CRT1 + CRT2 independent (dual head mode) */
55
56/* Aliases: */
57#define CRT2_ENABLE (CRT2_LCD | CRT2_TV | CRT2_VGA)
58#define TV_STANDARD (TV_NTSC | TV_PAL | TV_PALM | TV_PALN | TV_NTSCJ)
59#define TV_INTERFACE (TV_AVIDEO|TV_SVIDEO|TV_SCART|TV_HIVISION|TV_YPBPR|TV_CHSCART|TV_CHYPBPR525I)
60
61/* Only if TV_YPBPR is set: */
62#define TV_YPBPR525I TV_NTSC
63#define TV_YPBPR525P TV_PAL
64#define TV_YPBPR750P TV_PALM
65#define TV_YPBPR1080I TV_PALN
66#define TV_YPBPRALL (TV_YPBPR525I | TV_YPBPR525P | TV_YPBPR750P | TV_YPBPR1080I)
67
68#define VB_DISPTYPE_DISP2 CRT2_ENABLE
69#define VB_DISPTYPE_CRT2 CRT2_ENABLE
70#define VB_DISPTYPE_DISP1 VB_DISPTYPE_CRT1
71#define VB_DISPMODE_SINGLE VB_SINGLE_MODE
72#define VB_DISPMODE_MIRROR VB_MIRROR_MODE
73#define VB_DISPMODE_DUAL VB_DUALVIEW_MODE
74#define VB_DISPLAY_MODE (SINGLE_MODE | MIRROR_MODE | DUALVIEW_MODE)
75
76/* Structure argument for SISFB_GET_INFO ioctl */
77struct sisfb_info {
78 __u32 sisfb_id; /* for identifying sisfb */
79#ifndef SISFB_ID
80#define SISFB_ID 0x53495346 /* Identify myself with 'SISF' */
81#endif
82 __u32 chip_id; /* PCI-ID of detected chip */
83 __u32 memory; /* total video memory in KB */
84 __u32 heapstart; /* heap start offset in KB */
85 __u8 fbvidmode; /* current sisfb mode */
86
87 __u8 sisfb_version;
88 __u8 sisfb_revision;
89 __u8 sisfb_patchlevel;
90
91 __u8 sisfb_caps; /* sisfb capabilities */
92
93 __u32 sisfb_tqlen; /* turbo queue length (in KB) */
94
95 __u32 sisfb_pcibus; /* The card's PCI ID */
96 __u32 sisfb_pcislot;
97 __u32 sisfb_pcifunc;
98
99 __u8 sisfb_lcdpdc; /* PanelDelayCompensation */
100
101 __u8 sisfb_lcda; /* Detected status of LCDA for low res/text modes */
102
103 __u32 sisfb_vbflags;
104 __u32 sisfb_currentvbflags;
105
106 __u32 sisfb_scalelcd;
107 __u32 sisfb_specialtiming;
108
109 __u8 sisfb_haveemi;
110 __u8 sisfb_emi30,sisfb_emi31,sisfb_emi32,sisfb_emi33;
111 __u8 sisfb_haveemilcd;
112
113 __u8 sisfb_lcdpdca; /* PanelDelayCompensation for LCD-via-CRT1 */
114
115 __u16 sisfb_tvxpos, sisfb_tvypos; /* Warning: Values + 32 ! */
116
117 __u32 sisfb_heapsize; /* heap size (in KB) */
118 __u32 sisfb_videooffset; /* Offset of viewport in video memory (in bytes) */
119
120 __u32 sisfb_curfstn; /* currently running FSTN/DSTN mode */
121 __u32 sisfb_curdstn;
122
123 __u16 sisfb_pci_vendor; /* PCI vendor (SiS or XGI) */
124
125 __u32 sisfb_vbflags2; /* ivideo->vbflags2 */
126
127 __u8 sisfb_can_post; /* sisfb can POST this card */
128 __u8 sisfb_card_posted; /* card is POSTED */
129 __u8 sisfb_was_boot_device; /* This card was the boot video device (ie is primary) */
130
131 __u8 reserved[183]; /* for future use */
132};
133
134#define SISFB_CMD_GETVBFLAGS 0x55AA0001 /* no arg; result[1] = vbflags */
135#define SISFB_CMD_SWITCHCRT1 0x55AA0010 /* arg[0]: 99 = query, 0 = off, 1 = on */
136/* more to come */
137
138#define SISFB_CMD_ERR_OK 0x80000000 /* command succeeded */
139#define SISFB_CMD_ERR_LOCKED 0x80000001 /* sisfb is locked */
140#define SISFB_CMD_ERR_EARLY 0x80000002 /* request before sisfb took over gfx system */
141#define SISFB_CMD_ERR_NOVB 0x80000003 /* No video bridge */
142#define SISFB_CMD_ERR_NOCRT2 0x80000004 /* can't change CRT1 status, CRT2 disabled */
143/* more to come */
144#define SISFB_CMD_ERR_UNKNOWN 0x8000ffff /* Unknown command */
145#define SISFB_CMD_ERR_OTHER 0x80010000 /* Other error */
146
147/* Argument for SISFB_CMD ioctl */
148struct sisfb_cmd {
149 __u32 sisfb_cmd;
150 __u32 sisfb_arg[16];
151 __u32 sisfb_result[4];
152};
153
154/* Additional IOCTLs for communication sisfb <> X driver */
155/* If changing this, vgatypes.h must also be changed (for X driver) */
156
157/* ioctl for identifying and giving some info (esp. memory heap start) */
158#define SISFB_GET_INFO_SIZE _IOR(0xF3,0x00,__u32)
159#define SISFB_GET_INFO _IOR(0xF3,0x01,struct sisfb_info)
160
161/* ioctrl to get current vertical retrace status */
162#define SISFB_GET_VBRSTATUS _IOR(0xF3,0x02,__u32)
163
164/* ioctl to enable/disable panning auto-maximize (like nomax parameter) */
165#define SISFB_GET_AUTOMAXIMIZE _IOR(0xF3,0x03,__u32)
166#define SISFB_SET_AUTOMAXIMIZE _IOW(0xF3,0x03,__u32)
167
168/* ioctls to relocate TV output (x=D[31:16], y=D[15:0], + 32)*/
169#define SISFB_GET_TVPOSOFFSET _IOR(0xF3,0x04,__u32)
170#define SISFB_SET_TVPOSOFFSET _IOW(0xF3,0x04,__u32)
171
172/* ioctl for internal sisfb commands (sisfbctrl) */
173#define SISFB_COMMAND _IOWR(0xF3,0x05,struct sisfb_cmd)
174
175/* ioctl for locking sisfb (no register access during lock) */
176/* As of now, only used to avoid register access during
177 * the ioctls listed above.
178 */
179#define SISFB_SET_LOCK _IOW(0xF3,0x06,__u32)
180
181/* ioctls 0xF3 up to 0x3F reserved for sisfb */
182
183/****************************************************************/
184/* The following are deprecated and should not be used anymore: */
185/****************************************************************/
186/* ioctl for identifying and giving some info (esp. memory heap start) */
187#define SISFB_GET_INFO_OLD _IOR('n',0xF8,__u32)
188/* ioctrl to get current vertical retrace status */
189#define SISFB_GET_VBRSTATUS_OLD _IOR('n',0xF9,__u32)
190/* ioctl to enable/disable panning auto-maximize (like nomax parameter) */
191#define SISFB_GET_AUTOMAXIMIZE_OLD _IOR('n',0xFA,__u32)
192#define SISFB_SET_AUTOMAXIMIZE_OLD _IOW('n',0xFA,__u32)
193/****************************************************************/
194/* End of deprecated ioctl numbers */
195/****************************************************************/
196
197/* For fb memory manager (FBIO_ALLOC, FBIO_FREE) */
198struct sis_memreq {
199 __u32 offset;
200 __u32 size;
201};
202
203/**********************************************/
204/* PRIVATE */
205/* (for IN-KERNEL usage only) */
206/**********************************************/
207
208#ifdef __KERNEL__
209 23
210#include <linux/pci.h> 24#include <linux/pci.h>
25#include <uapi/video/sisfb.h>
211 26
212#define UNKNOWN_VGA 0 27#define UNKNOWN_VGA 0
213#define SIS_300_VGA 1 28#define SIS_300_VGA 1
@@ -220,5 +35,3 @@ extern void sis_malloc_new(struct pci_dev *pdev, struct sis_memreq *req);
220extern void sis_free(u32 base); 35extern void sis_free(u32 base);
221extern void sis_free_new(struct pci_dev *pdev, u32 base); 36extern void sis_free_new(struct pci_dev *pdev, u32 base);
222#endif 37#endif
223
224#endif
diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
index 0993a220a3e6..1a91850cb961 100644
--- a/include/video/uvesafb.h
+++ b/include/video/uvesafb.h
@@ -1,63 +1,8 @@
1#ifndef _UVESAFB_H 1#ifndef _UVESAFB_H
2#define _UVESAFB_H 2#define _UVESAFB_H
3 3
4#include <linux/types.h> 4#include <uapi/video/uvesafb.h>
5
6struct v86_regs {
7 __u32 ebx;
8 __u32 ecx;
9 __u32 edx;
10 __u32 esi;
11 __u32 edi;
12 __u32 ebp;
13 __u32 eax;
14 __u32 eip;
15 __u32 eflags;
16 __u32 esp;
17 __u16 cs;
18 __u16 ss;
19 __u16 es;
20 __u16 ds;
21 __u16 fs;
22 __u16 gs;
23};
24
25/* Task flags */
26#define TF_VBEIB 0x01
27#define TF_BUF_ESDI 0x02
28#define TF_BUF_ESBX 0x04
29#define TF_BUF_RET 0x08
30#define TF_EXIT 0x10
31
32struct uvesafb_task {
33 __u8 flags;
34 int buf_len;
35 struct v86_regs regs;
36};
37
38/* Constants for the capabilities field
39 * in vbe_ib */
40#define VBE_CAP_CAN_SWITCH_DAC 0x01
41#define VBE_CAP_VGACOMPAT 0x02
42
43/* The VBE Info Block */
44struct vbe_ib {
45 char vbe_signature[4];
46 __u16 vbe_version;
47 __u32 oem_string_ptr;
48 __u32 capabilities;
49 __u32 mode_list_ptr;
50 __u16 total_memory;
51 __u16 oem_software_rev;
52 __u32 oem_vendor_name_ptr;
53 __u32 oem_product_name_ptr;
54 __u32 oem_product_rev_ptr;
55 __u8 reserved[222];
56 char oem_data[256];
57 char misc_data[512];
58} __attribute__ ((packed));
59 5
60#ifdef __KERNEL__
61 6
62/* VBE CRTC Info Block */ 7/* VBE CRTC Info Block */
63struct vbe_crtc_ib { 8struct vbe_crtc_ib {
@@ -191,5 +136,4 @@ struct uvesafb_par {
191 struct vbe_crtc_ib crtc; 136 struct vbe_crtc_ib crtc;
192}; 137};
193 138
194#endif /* __KERNEL__ */
195#endif /* _UVESAFB_H */ 139#endif /* _UVESAFB_H */
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-07 12:08:05 -0500