linux-stable.git/drivers/gpu/vga, branch linux-2.6.38.y

Merge remote branch 'linus/master' into drm-intel-fixes

2011-01-24T18:27:32+00:00

Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().

Conflicts:
	drivers/gpu/drm/i915/intel_ringbuffer.c

drm/i915: Recognise non-VGA display devices

2011-01-23T12:52:16+00:00

Starting with SandyBridge (though possible with earlier hacked BIOSes),
the BIOS may initialise the IGFX as secondary to a discrete GPU. Prior,
it would simply disable the integrated GPU. So we adjust our PCI class
mask to match any DISPLAY_CLASS device.

In such a configuration, the IGFX is not a primary VGA controller and
so should not take part in VGA arbitration, and the error return from
vga_client_register() is expected.

Signed-off-by: Chris Wilson 
Cc: stable@kernel.org

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-21T01:02:05+00:00

The meaning of CONFIG_EMBEDDED has long since been obsoleted; the option
is used to configure any non-standard kernel with a much larger scope than
only small devices.

This patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes
references to the option throughout the kernel.  A new CONFIG_EMBEDDED
option is added that automatically selects CONFIG_EXPERT when enabled and
can be used in the future to isolate options that should only be
considered for embedded systems (RISC architectures, SLOB, etc).

Calling the option "EXPERT" more accurately represents its intention: only
expert users who understand the impact of the configuration changes they
are making should enable it.

Reviewed-by: Ingo Molnar 
Acked-by: David Woodhouse 
Signed-off-by: David Rientjes 
Cc: Greg KH 
Cc: "David S. Miller" 
Cc: Jens Axboe 
Cc: Arnd Bergmann 
Cc: Robin Holt 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

vga_switcheroo: comparing too few characters in strncmp()

2011-01-07T05:29:37+00:00

This is a copy-and-paste bug.  We should be comparing 4 characters here
instead of 3.

Signed-off-by: Dan Carpenter 
Signed-off-by: Dave Airlie

vga_switcheroo: split switching into two stages.

2011-01-05T03:45:46+00:00

stage 1: turn card on, switch boot vga pointer.
stage 2: switch fbs, switch mux and power off old card.

Signed-off-by: Dave Airlie

vga_switcheroo: add reprobe hook for fbcon to recheck connected outputs.

2011-01-05T03:44:07+00:00

This adds a hook after the mux is switched for the driver to reprobe
the connected outputs.

Signed-off-by: Dave Airlie

vga_switcheroo: add debugging mux switch option.

2011-01-05T03:43:15+00:00

This allows the mux to be switched from userspace using MIGD/MDIS
command to the switch.

Signed-off-by: Dave Airlie

vga_switcheroo: make power switch handler optional

2011-01-05T03:43:05+00:00

At least on the nvidia mux the power switch seems to be executed
by the ACPI PS0/PS3 methods so need to do it explicitly.

Signed-off-by: Dave Airlie

vga_switcheroo: print the IGD/DIS flag in the debugfs output.

2011-01-05T03:42:59+00:00

We really want to see this so we can confirm that we pick the right one.

Signed-off-by: Dave Airlie

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22T17:52:56+00:00

* 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
  vfs: make no_llseek the default
  vfs: don't use BKL in default_llseek
  llseek: automatically add .llseek fop
  libfs: use generic_file_llseek for simple_attr
  mac80211: disallow seeks in minstrel debug code
  lirc: make chardev nonseekable
  viotape: use noop_llseek
  raw: use explicit llseek file operations
  ibmasmfs: use generic_file_llseek
  spufs: use llseek in all file operations
  arm/omap: use generic_file_llseek in iommu_debug
  lkdtm: use generic_file_llseek in debugfs
  net/wireless: use generic_file_llseek in debugfs
  drm: use noop_llseek