From 72a1190f6d9acea5fb789bec706c842604954049 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 27 Mar 2007 17:59:30 +1000 Subject: drm/ttm: make sure dev_mapping is set-up for the first opener of the drm This was causing an oops in my miniglx code to try and use a TTM-only setup. --- linux-core/drm_fops.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'linux-core/drm_fops.c') diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c index 3521c092..d400a4d5 100644 --- a/linux-core/drm_fops.c +++ b/linux-core/drm_fops.c @@ -154,10 +154,13 @@ int drm_open(struct inode *inode, struct file *filp) spin_lock(&dev->count_lock); if (!dev->open_count++) { spin_unlock(&dev->count_lock); - return drm_setup(dev); + retcode = drm_setup(dev); + goto out; } spin_unlock(&dev->count_lock); } + + out: mutex_lock(&dev->struct_mutex); BUG_ON((dev->dev_mapping != NULL) && (dev->dev_mapping != inode->i_mapping)); -- cgit v1.2.3