diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-09-21 00:33:58 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-09-21 01:00:27 -0400 |
| commit | 28d520433b6375740990ab99d69b0d0067fd656b (patch) | |
| tree | d3affea0fb69f84b9c924c03d78c5df23946306f /drivers/gpu/drm/i915/i915_reg.h | |
| parent | aadd4e17452d3d5c2269cd2b000b7de7cfb6c79e (diff) | |
drm/vgaarb: add VGA arbitration support to the drm and kms.
VGA arb requires DRM support for non-kms drivers, to turn on/off
irqs when disabling the mem/io regions.
VGA arb requires KMS support for GPUs where we can turn off VGA
decoding. Currently we know how to do this for intel and radeon
kms drivers, which allows them to be removed from the arbiter.
This patch comes from Fedora rawhide kernel.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index e38cd21161c8..3f7963553464 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | * fb aperture size and the amount of pre-reserved memory. | 30 | * fb aperture size and the amount of pre-reserved memory. |
| 31 | */ | 31 | */ |
| 32 | #define INTEL_GMCH_CTRL 0x52 | 32 | #define INTEL_GMCH_CTRL 0x52 |
| 33 | #define INTEL_GMCH_VGA_DISABLE (1 << 1) | ||
| 33 | #define INTEL_GMCH_ENABLED 0x4 | 34 | #define INTEL_GMCH_ENABLED 0x4 |
| 34 | #define INTEL_GMCH_MEM_MASK 0x1 | 35 | #define INTEL_GMCH_MEM_MASK 0x1 |
| 35 | #define INTEL_GMCH_MEM_64M 0x1 | 36 | #define INTEL_GMCH_MEM_64M 0x1 |