mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 15:15:47 +00:00
03a2c4d76c
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (151 commits) vga_switcheroo: disable default y by new rules. drm/nouveau: fix *staging* driver build with switcheroo off. drm/radeon: fix typo in Makefile vga_switcheroo: fix build on platforms with no ACPI drm/radeon: Fix printf type warning in 64bit system. drm/radeon/kms: bump the KMS version number for square tiling support. vga_switcheroo: initial implementation (v15) drm/radeon/kms: do not disable audio engine twice Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730" drm/radeon/kms: do not preset audio stuff and start timer when not using audio drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond drm/ttm: fix function prototype to match implementation drm/radeon: use ALIGN instead of open coding it drm/radeon/kms: initialize set_surface_reg reg for rs600 asic drm/i915: Use a dmi quirk to skip a broken SDVO TV output. drm/i915: enable/disable LVDS port at DPMS time drm/i915: check for multiple write domains in pin_and_relocate drm/i915: clean-up i915_gem_flush_gpu_write_domain drm/i915: reuse i915_gpu_idle helper drm/i915: ensure lru ordering of fence_list ... Fixed trivial conflicts in drivers/gpu/vga/Kconfig
29 lines
1 KiB
Text
29 lines
1 KiB
Text
config VGA_ARB
|
|
bool "VGA Arbitration" if EMBEDDED
|
|
default y
|
|
depends on PCI
|
|
help
|
|
Some "legacy" VGA devices implemented on PCI typically have the same
|
|
hard-decoded addresses as they did on ISA. When multiple PCI devices
|
|
are accessed at same time they need some kind of coordination. Please
|
|
see Documentation/vgaarbiter.txt for more details. Select this to
|
|
enable VGA arbiter.
|
|
|
|
config VGA_ARB_MAX_GPUS
|
|
int "Maximum number of GPUs"
|
|
default 16
|
|
depends on VGA_ARB
|
|
help
|
|
Reserves space in the kernel to maintain resource locking for
|
|
multiple GPUS. The overhead for each GPU is very small.
|
|
|
|
config VGA_SWITCHEROO
|
|
bool "Laptop Hybrid Grapics - GPU switching support"
|
|
depends on X86
|
|
depends on ACPI
|
|
help
|
|
Many laptops released in 2008/9/10 have two gpus with a multiplxer
|
|
to switch between them. This adds support for dynamic switching when
|
|
X isn't running and delayed switching until the next logoff. This
|
|
features is called hybrid graphics, ATI PowerXpress, and Nvidia
|
|
HybridPower.
|