diff options
| author | Keith Packard <keithp@keithp.com> | 2008-05-10 21:05:25 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2008-05-10 21:05:25 -0700 |
| commit | 1f9eaceb71792879a3ecb0046b64dbf65b870d50 (patch) | |
| tree | 8c1e47ff8d0863e05576a518b91f7d8d731cfe93 /shared-core/i915_dma.c | |
| parent | 177b8b07033c56c84d335808121690d235516bb5 (diff) | |
| parent | 48a8531aa403ea250696338aa8717e3e36477370 (diff) | |
Merge commit 'anholt/drm-gem' into drm-gem
Diffstat (limited to 'shared-core/i915_dma.c')
| -rw-r--r-- | shared-core/i915_dma.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 0601b89c..24f361e0 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -1052,6 +1052,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) _DRM_KERNEL | _DRM_DRIVER, &dev_priv->mmio_map); INIT_LIST_HEAD(&dev_priv->mm.gtt_lru); + INIT_LIST_HEAD(&dev_priv->mm.execution_list); #ifdef __linux__ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) @@ -1093,6 +1094,7 @@ void i915_driver_lastclose(struct drm_device * dev) dev_priv->val_bufs = NULL; } #endif + i915_gem_lastclose(dev); if (drm_getsarea(dev) && dev_priv->sarea_priv) i915_do_cleanup_pageflip(dev); |