diff options
author | Eric Anholt <eric@anholt.net> | 2009-11-05 15:04:06 -0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-11-05 15:04:06 -0800 |
commit | 5b8f0be0dce012d190a53d55240fe3fde6306476 (patch) | |
tree | 19fccf22b07730205e9b1d64e8e8f676a12b763a /drivers/gpu/drm/drm_stub.c | |
parent | 43bcd61fae05fc6062b4f117c5adb1a72c9f8c57 (diff) | |
parent | 4fe9676d1ae6639b5749140eba052261d363366b (diff) |
Merge remote branch 'airlied/drm-next' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/drm_stub.c')
-rw-r--r-- | drivers/gpu/drm/drm_stub.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index 55bb8a82d61..adb864dfef3 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -220,9 +220,11 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, INIT_LIST_HEAD(&dev->ctxlist); INIT_LIST_HEAD(&dev->vmalist); INIT_LIST_HEAD(&dev->maplist); + INIT_LIST_HEAD(&dev->vblank_event_list); spin_lock_init(&dev->count_lock); spin_lock_init(&dev->drw_lock); + spin_lock_init(&dev->event_lock); init_timer(&dev->timer); mutex_init(&dev->struct_mutex); mutex_init(&dev->ctxlist_mutex); |