[PATCH 05/35] drm: Push struct_mutex into ->master_destroy
Alex Deucher
alexdeucher at gmail.com
Tue Apr 26 21:36:40 UTC 2016
On Tue, Apr 26, 2016 at 1:29 PM, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> Only two drivers implement this hook. vmwgfx (which doesn't need it
> really) and legacy radeon (which since v1 has been nuked, yay).
>
> v1: Rebase over radeon ums removal.
>
> Cc: Thomas Hellstrom <thellstrom at vmware.com>
> Cc: Alex Deucher <alexdeucher at gmail.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> drivers/gpu/drm/drm_drv.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index f8a7a6e66b7e..55273f8f3acb 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -123,10 +123,10 @@ static void drm_master_destroy(struct kref *kref)
> struct drm_device *dev = master->minor->dev;
> struct drm_map_list *r_list, *list_temp;
>
> - mutex_lock(&dev->struct_mutex);
> if (dev->driver->master_destroy)
> dev->driver->master_destroy(dev, master);
>
> + mutex_lock(&dev->struct_mutex);
> list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) {
> if (r_list->master == master) {
> drm_legacy_rmmap_locked(dev, r_list->map);
> --
> 2.8.1
>
More information about the dri-devel
mailing list