fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-25 02:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a crash on X startup

Browse source
This commit is contained in:
Alan Hourihane 2007-10-17 09:35:44 +01:00
parent 90bfc8e611
commit be2d68914d
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
shared-core/i915_dma.c
View file

@ -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);