Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

S: D-91080 Uttenreuth

S: D-91080 Uttenreuth

S: Germany

S: Germany

N: Jaya Kumar

E: jayalk@intworks.biz

W: http://www.intworks.biz

D: Arc monochrome LCD framebuffer driver, x86 reboot fixups

S: Gurgaon, India

S: Kuala Lumpur, Malaysia

N: Gabor Kuti

N: Gabor Kuti

M: seasons@falcon.sch.bme.hu

M: seasons@falcon.sch.bme.hu

M: seasons@makosteszta.sote.hu

M: seasons@makosteszta.sote.hu

Intel 830M/845G/852GM/855GM/865G/915G Framebuffer driver

================================================================

A. Introduction

	This is a framebuffer driver for various Intel 810/815 compatible

graphics devices.  These would include:

	Intel 830M

	Intel 810E845G

	Intel 852GM

	Intel 855GM

	Intel 865G

	Intel 915G

B.  List of available options

   a. "video=intelfb"

	enables the intelfb driver

	Recommendation: required

   b. "mode=<xres>x<yres>[-<bpp>][@<refresh>]"

	select mode

	Recommendation: user preference

	(default = 1024x768-32@70)

   c. "vram=<value>"

	select amount of system RAM in MB to allocate for the video memory

	if not enough RAM was already allocated by the BIOS.

	Recommendation: 1 - 4 MB.

	(default = 4 MB)

   d. "voffset=<value>"

        select at what offset in MB of the logical memory to allocate the

	framebuffer memory.  The intent is to avoid the memory blocks

	used by standard graphics applications (XFree86). Depending on your

        usage, adjust the value up or down, (0 for maximum usage, 63/127 MB

        for the least amount).  Note, an arbitrary setting may conflict

        with XFree86.

	Recommendation: do not set

	(default = 48 MB)

   e. "accel"

	enable text acceleration.  This can be enabled/reenabled anytime

	by using 'fbset -accel true/false'.

	Recommendation: enable

	(default = set)

   f. "hwcursor"

	enable cursor acceleration.

	Recommendation: enable

	(default = set)

   g. "mtrr"

	enable MTRR.  This allows data transfers to the framebuffer memory

	to occur in bursts which can significantly increase performance.

	Not very helpful with the intel chips because of 'shared memory'.

	Recommendation: set

	(default = set)

   h. "fixed"

	disable mode switching.

	Recommendation: do not set

	(default = not set)

   The binary parameters can be unset with a "no" prefix, example "noaccel".

   The default parameter (not named) is the mode.

C. Kernel booting

Separate each option/option-pair by commas (,) and the option from its value

with an equals sign (=) as in the following:

video=i810fb:option1,option2=value2

Sample Usage

------------

In /etc/lilo.conf, add the line:

append="video=intelfb:800x600-32@75,accel,hwcursor,vram=8"

This will initialize the framebuffer to 800x600 at 32bpp and 75Hz. The

framebuffer will use 8 MB of System RAM. hw acceleration of text and cursor

will be enabled.

D.  Module options

	The module parameters are essentially similar to the kernel

parameters. The main difference is that you need to include a Boolean value

(1 for TRUE, and 0 for FALSE) for those options which don't need a value.

Example, to enable MTRR, include "mtrr=1".

Sample Usage

------------

Using the same setup as described above, load the module like this:

	modprobe intelfb mode=800x600-32@75 vram=8 accel=1 hwcursor=1

Or just add the following to /etc/modprobe.conf

	options intelfb mode=800x600-32@75 vram=8 accel=1 hwcursor=1

and just do a

	modprobe intelfb

E.  Acknowledgment:

	1.  Geert Uytterhoeven - his excellent howto and the virtual

                                 framebuffer driver code made this possible.

	2.  Jeff Hartmann for his agpgart code.

	3.  David Dawes for his original kernel 2.4 code.

	4.  The X developers.  Insights were provided just by reading the

	    XFree86 source code.

	5.  Antonino A. Daplas for his inspiring i810fb driver.

	6.  Andrew Morton for his kernel patches maintenance.

###########################

Sylvain

  mode=xxx      Sets the permissions on files to xxx

  mode=xxx      Sets the permissions on files to xxx

  nojoliet      Ignore Joliet extensions if they are present.

  nojoliet      Ignore Joliet extensions if they are present.

  norock        Ignore Rock Ridge extensions if they are present.

  norock        Ignore Rock Ridge extensions if they are present.

  unhide        Show hidden files.

  hide		Completely strip hidden files from the file system.

  showassoc	Show files marked with the 'associated' bit

  unhide	Deprecated; showing hidden files is now default;

		If given, it is a synonym for 'showassoc' which will

		recreate previous unhide behavior

  session=x     Select number of session on multisession CD

  session=x     Select number of session on multisession CD

  sbsector=xxx  Session begins from sector xxx

  sbsector=xxx  Session begins from sector xxx

to limit this tmpfs instance to that percentage of your physical RAM:

to limit this tmpfs instance to that percentage of your physical RAM:

the default, when neither size nor nr_blocks is specified, is size=50%

the default, when neither size nor nr_blocks is specified, is size=50%

If both nr_blocks (or size) and nr_inodes are set to 0, neither blocks

If nr_blocks=0 (or size=0), blocks will not be limited in that instance;

nor inodes will be limited in that instance.  It is generally unwise to

if nr_inodes=0, inodes will not be limited.  It is generally unwise to

mount with such options, since it allows any user with write access to

mount with such options, since it allows any user with write access to

use up all the memory on the machine; but enhances the scalability of

use up all the memory on the machine; but enhances the scalability of

that instance in a system with many cpus making intensive use of it.

that instance in a system with many cpus making intensive use of it.

Author:

Author:

   Christoph Rohland <cr@sap.com>, 1.12.01

   Christoph Rohland <cr@sap.com>, 1.12.01

Updated:

Updated:

   Hugh Dickins <hugh@veritas.com>, 01 September 2004

   Hugh Dickins <hugh@veritas.com>, 13 March 2005

  device numbers (0xabcd or abcd, for 2.4 backward compatibility).

  device numbers (0xabcd or abcd, for 2.4 backward compatibility).

  You can use the 'all' keyword to ignore all devices.

  You can use the 'all' keyword to ignore all devices.

  The '!' operator will cause the I/O-layer to _not_ ignore a device.

  The '!' operator will cause the I/O-layer to _not_ ignore a device.

  The order on the command line is not important.

  The command line is parsed from left to right.

  For example, 

  For example, 

	cio_ignore=0.0.0023-0.0.0042,0.0.4711

	cio_ignore=0.0.0023-0.0.0042,0.0.4711

  /proc/cio_ignore; "add <device range>, <device range>, ..." will ignore the

  /proc/cio_ignore; "add <device range>, <device range>, ..." will ignore the

  specified devices.

  specified devices.

  Note: Already known devices cannot be ignored.

  Note: While already known devices can be added to the list of devices to be

        ignored, there will be no effect on then. However, if such a device

        disappears and then reappeares, it will then be ignored.

  For example, if device 0.0.abcd is already known and all other devices

  For example,

  0.0.a000-0.0.afff are not known,

	"echo add 0.0.a000-0.0.accc, 0.0.af00-0.0.afff > /proc/cio_ignore"

	"echo add 0.0.a000-0.0.accc, 0.0.af00-0.0.afff > /proc/cio_ignore"

  will add 0.0.a000-0.0.abcc, 0.0.abce-0.0.accc and 0.0.af00-0.0.afff to the

  will add 0.0.a000-0.0.accc and 0.0.af00-0.0.afff to the list of ignored

  list of ignored devices and skip 0.0.abcd.

  devices.

  The devices can be specified either by bus id (0.0.abcd) or, for 2.4 backward

  The devices can be specified either by bus id (0.0.abcd) or, for 2.4 backward

  compatibilty, by the device number in hexadecimal (0xabcd or abcd).

  compatibilty, by the device number in hexadecimal (0xabcd or abcd).

  - /proc/s390dbf/cio_trace/hex_ascii

  - /proc/s390dbf/cio_trace/hex_ascii

    Logs the calling of functions in the common I/O-layer and, if applicable, 

    Logs the calling of functions in the common I/O-layer and, if applicable, 

    which subchannel they were called for.

    which subchannel they were called for, as well as dumps of some data

    structures (like irb in an error case).

  The level of logging can be changed to be more or less verbose by piping to 

  The level of logging can be changed to be more or less verbose by piping to 

  /proc/s390dbf/cio_*/level a number between 0 and 6; see the documentation on

  /proc/s390dbf/cio_*/level a number between 0 and 6; see the documentation on