Skip to content

Commit 2ddea3f

Browse files
committed
drm/modes: reduce fb_lock to just protecting lists
This reduces the fb_lock to just protecting the num_fb/fb_list. "Previously fb refcounting, and especially the weak reference (kref_get_unless_zero) used in fb lookups have been protected by fb_lock. But with the refactoring to share refcounting in the drm_mode_object base class that switched to being protected by idr_mutex, which means fb_lock critical sections can be reduced." Reviewed-by: Daniel Vetter <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
1 parent 72fe90b commit 2ddea3f

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

drivers/gpu/drm/drm_crtc.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,7 @@ static void drm_framebuffer_free(struct kref *kref)
433433
* The lookup idr holds a weak reference, which has not necessarily been
434434
* removed at this point. Check for that.
435435
*/
436-
mutex_lock(&dev->mode_config.fb_lock);
437436
drm_mode_object_unregister(dev, &fb->base);
438-
mutex_unlock(&dev->mode_config.fb_lock);
439437

440438
fb->funcs->destroy(fb);
441439
}
@@ -475,9 +473,9 @@ int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb,
475473
mutex_lock(&dev->mode_config.fb_lock);
476474
dev->mode_config.num_fb++;
477475
list_add(&fb->head, &dev->mode_config.fb_list);
476+
mutex_unlock(&dev->mode_config.fb_lock);
478477

479478
drm_mode_object_register(dev, &fb->base);
480-
mutex_unlock(&dev->mode_config.fb_lock);
481479
out:
482480
return ret;
483481
}
@@ -498,12 +496,9 @@ struct drm_framebuffer *drm_framebuffer_lookup(struct drm_device *dev,
498496
struct drm_mode_object *obj;
499497
struct drm_framebuffer *fb = NULL;
500498

501-
mutex_lock(&dev->mode_config.fb_lock);
502499
obj = _object_find(dev, id, DRM_MODE_OBJECT_FB);
503500
if (obj)
504501
fb = obj_to_fb(obj);
505-
mutex_unlock(&dev->mode_config.fb_lock);
506-
507502
return fb;
508503
}
509504
EXPORT_SYMBOL(drm_framebuffer_lookup);
@@ -526,10 +521,8 @@ void drm_framebuffer_unregister_private(struct drm_framebuffer *fb)
526521

527522
dev = fb->dev;
528523

529-
mutex_lock(&dev->mode_config.fb_lock);
530524
/* Mark fb as reaped and drop idr ref. */
531525
drm_mode_object_unregister(dev, &fb->base);
532-
mutex_unlock(&dev->mode_config.fb_lock);
533526
}
534527
EXPORT_SYMBOL(drm_framebuffer_unregister_private);
535528

0 commit comments

Comments
 (0)