diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2007-10-17 09:35:44 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2007-10-17 09:35:44 +0100 |
| commit | be2d68914d0992a37b9fb4d93338aeaf2240c4f5 (patch) | |
| tree | 5ba5c8409ed6649cf74a9074264ed0fdfc09cdca /shared-core | |
| parent | 90bfc8e611cb0c72ee03dce47027b50d2cc614b1 (diff) | |
Fix a crash on X startup
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/i915_dma.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 23994821..54621d9e 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -86,8 +86,6 @@ int i915_dma_cleanup(struct drm_device * dev) * may not have been called from userspace and after dev_private * is freed, it's too late. */ - I915_WRITE(LP_RING + RING_LEN, 0); - if (dev->irq) drm_irq_uninstall(dev); @@ -1042,7 +1040,7 @@ int i915_do_cleanup_pageflip(struct drm_device * dev) DRM_DEBUG("%s\n", __FUNCTION__); - for (i = 0, planes = 0; i < 2; i++) + for (i = 0, planes = 0; i < 2; i++) { if (dev_priv->sarea_priv->pf_current_page & (0x3 << (2 * i))) { dev_priv->sarea_priv->pf_current_page = (dev_priv->sarea_priv->pf_current_page & @@ -1050,6 +1048,7 @@ int i915_do_cleanup_pageflip(struct drm_device * dev) planes |= 1 << i; } + } if (planes) i915_dispatch_flip(dev, planes, 0); |