diff options
| author | Dave Airlie | 2009-09-21 06:33:58 +0200 |
|---|---|---|
| committer | Dave Airlie | 2009-09-21 07:00:27 +0200 |
| commit | 28d520433b6375740990ab99d69b0d0067fd656b (patch) | |
| tree | d3affea0fb69f84b9c924c03d78c5df23946306f /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/radeon: some r420s have a CP race with the DMA engine. (diff) | |
| download | kernel-qcow2-linux-28d520433b6375740990ab99d69b0d0067fd656b.tar.gz kernel-qcow2-linux-28d520433b6375740990ab99d69b0d0067fd656b.tar.xz kernel-qcow2-linux-28d520433b6375740990ab99d69b0d0067fd656b.zip | |
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/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 155719ff99d1..0227b1652906 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3917,3 +3917,20 @@ struct drm_encoder *intel_best_encoder(struct drm_connector *connector) return &intel_output->enc; } + +/* + * set vga decode state - true == enable VGA decode + */ +int intel_modeset_vga_set_state(struct drm_device *dev, bool state) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + u16 gmch_ctrl; + + pci_read_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, &gmch_ctrl); + if (state) + gmch_ctrl &= ~INTEL_GMCH_VGA_DISABLE; + else + gmch_ctrl |= INTEL_GMCH_VGA_DISABLE; + pci_write_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, gmch_ctrl); + return 0; +} |