aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-12-19 06:15:29 -0500
committerDave Airlie <airlied@redhat.com>2012-02-16 13:31:07 -0500
commit466e69b8b03b8c1987367912782bc12988ad8794 (patch)
tree60ac84ef32b7590618bc81b0b52a5ba14a49bf45 /drivers/gpu/drm/i915
parent42b923b587d055cd98fb84f32e3e758672026ae9 (diff)
drm: move pci bus master enable into driver.
The current enabling of bus mastering in the drm midlayer allows a large race condition under kexec. When a kexec'ed kernel re-enables bus mastering for the GPU, previously setup dma blocks may cause writes to random pieces of memory. On radeon the writeback mechanism can cause these sorts of issues. This patch doesn't fix the problem, but it moves the bus master enable under the individual drivers control so they can move enabling it until later in their load cycle and close the race. Fix for radeon kms driver will be in a follow-up patch. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 8919dcc07ed8..a8081f2efaea 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1933,6 +1933,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
1933 goto free_priv; 1933 goto free_priv;
1934 } 1934 }
1935 1935
1936 pci_set_master(dev->pdev);
1937
1936 /* overlay on gen2 is broken and can't address above 1G */ 1938 /* overlay on gen2 is broken and can't address above 1G */
1937 if (IS_GEN2(dev)) 1939 if (IS_GEN2(dev))
1938 dma_set_coherent_mask(&dev->pdev->dev, DMA_BIT_MASK(30)); 1940 dma_set_coherent_mask(&dev->pdev->dev, DMA_BIT_MASK(30));