aboutsummaryrefslogtreecommitdiff
path: root/linux-core/drm_bo_lock.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2008-03-06 05:21:50 +1000
committerDave Airlie <airlied@linux.ie>2008-03-06 05:21:50 +1000
commit12574590cdf7871755d1939463ca6898251fd0d1 (patch)
treee9b133366e6154a0562946f5f80b80a164b8a2ff /linux-core/drm_bo_lock.c
parent638353103d009d44bd5bdbe97cc7cef1bf011cdf (diff)
drm: reorganise minor number handling using code from modesetting branch
Rip out the whole head thing and replace it with an idr and drm_minor structure.
Diffstat (limited to 'linux-core/drm_bo_lock.c')
-rw-r--r--linux-core/drm_bo_lock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/drm_bo_lock.c b/linux-core/drm_bo_lock.c
index f967fb7c..2795384e 100644
--- a/linux-core/drm_bo_lock.c
+++ b/linux-core/drm_bo_lock.c
@@ -141,7 +141,7 @@ int drm_bo_write_lock(struct drm_bo_lock *lock, struct drm_file *file_priv)
* while holding it.
*/
- dev = file_priv->head->dev;
+ dev = file_priv->minor->dev;
mutex_lock(&dev->struct_mutex);
ret = drm_add_user_object(file_priv, &lock->base, 0);
lock->base.remove = &drm_bo_write_lock_remove;
@@ -156,7 +156,7 @@ int drm_bo_write_lock(struct drm_bo_lock *lock, struct drm_file *file_priv)
int drm_bo_write_unlock(struct drm_bo_lock *lock, struct drm_file *file_priv)
{
- struct drm_device *dev = file_priv->head->dev;
+ struct drm_device *dev = file_priv->minor->dev;
struct drm_ref_object *ro;
mutex_lock(&dev->struct_mutex);