summaryrefslogtreecommitdiff
path: root/shared-core/i915_dma.c
diff options
context:
space:
mode:
authorRobert Noland <rnoland@2hip.net>2009-02-25 17:59:26 -0600
committerRobert Noland <rnoland@2hip.net>2009-02-27 18:16:17 -0600
commit957b10695b619d6ed2f1098b00502395d9a3c149 (patch)
tree73ece8ec6f01018ea9fc920ee04992ec5e0fee2b /shared-core/i915_dma.c
parent7ce8d4c1fec618ac2578ea0ddb8915b1b41ab9cb (diff)
Move vblank_init to driver load time.
Diffstat (limited to 'shared-core/i915_dma.c')
-rw-r--r--shared-core/i915_dma.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index b97b576f..9afb2e84 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -898,6 +898,13 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
#endif
DRM_SPININIT(&dev_priv->user_irq_lock, "userirq");
+ ret = drm_vblank_init(dev, I915_NUM_PIPE);
+
+ if (ret) {
+ (void) i915_driver_unload(dev);
+ return ret;
+ }
+
return ret;
}