diff options
Diffstat (limited to 'drivers/gpu/drm/drm_lease.c')
-rw-r--r-- | drivers/gpu/drm/drm_lease.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c index 59849f02e2ad..1402c0e71b03 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c | |||
@@ -220,17 +220,6 @@ static struct drm_master *drm_lease_create(struct drm_master *lessor, struct idr | |||
220 | 220 | ||
221 | mutex_lock(&dev->mode_config.idr_mutex); | 221 | mutex_lock(&dev->mode_config.idr_mutex); |
222 | 222 | ||
223 | /* Insert the new lessee into the tree */ | ||
224 | id = idr_alloc(&(drm_lease_owner(lessor)->lessee_idr), lessee, 1, 0, GFP_KERNEL); | ||
225 | if (id < 0) { | ||
226 | error = id; | ||
227 | goto out_lessee; | ||
228 | } | ||
229 | |||
230 | lessee->lessee_id = id; | ||
231 | lessee->lessor = drm_master_get(lessor); | ||
232 | list_add_tail(&lessee->lessee_list, &lessor->lessees); | ||
233 | |||
234 | idr_for_each_entry(leases, entry, object) { | 223 | idr_for_each_entry(leases, entry, object) { |
235 | error = 0; | 224 | error = 0; |
236 | if (!idr_find(&dev->mode_config.crtc_idr, object)) | 225 | if (!idr_find(&dev->mode_config.crtc_idr, object)) |
@@ -246,6 +235,17 @@ static struct drm_master *drm_lease_create(struct drm_master *lessor, struct idr | |||
246 | } | 235 | } |
247 | } | 236 | } |
248 | 237 | ||
238 | /* Insert the new lessee into the tree */ | ||
239 | id = idr_alloc(&(drm_lease_owner(lessor)->lessee_idr), lessee, 1, 0, GFP_KERNEL); | ||
240 | if (id < 0) { | ||
241 | error = id; | ||
242 | goto out_lessee; | ||
243 | } | ||
244 | |||
245 | lessee->lessee_id = id; | ||
246 | lessee->lessor = drm_master_get(lessor); | ||
247 | list_add_tail(&lessee->lessee_list, &lessor->lessees); | ||
248 | |||
249 | /* Move the leases over */ | 249 | /* Move the leases over */ |
250 | lessee->leases = *leases; | 250 | lessee->leases = *leases; |
251 | DRM_DEBUG_LEASE("new lessee %d %p, lessor %d %p\n", lessee->lessee_id, lessee, lessor->lessee_id, lessor); | 251 | DRM_DEBUG_LEASE("new lessee %d %p, lessor %d %p\n", lessee->lessee_id, lessee, lessor->lessee_id, lessor); |