Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:15:24 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/drm: drm_fops.c
Log Message:
Sync drm_close_file: call drm_property_release_user_blobs.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/drm/drm_fops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/drm_fops.c
diff -u src/sys/external/bsd/drm2/drm/drm_fops.c:1.11 src/sys/external/bsd/drm2/drm/drm_fops.c:1.12
--- src/sys/external/bsd/drm2/drm/drm_fops.c:1.11 Mon Aug 27 14:15:12 2018
+++ src/sys/external/bsd/drm2/drm/drm_fops.c Mon Aug 27 14:15:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_fops.c,v 1.11 2018/08/27 14:15:12 riastradh Exp $ */
+/* $NetBSD: drm_fops.c,v 1.12 2018/08/27 14:15:24 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_fops.c,v 1.11 2018/08/27 14:15:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_fops.c,v 1.12 2018/08/27 14:15:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/select.h>
@@ -228,8 +228,10 @@ drm_close_file(struct drm_file *file)
if (drm_core_check_feature(dev, DRIVER_HAVE_DMA))
drm_legacy_reclaim_buffers(dev, file);
drm_events_release(file);
- if (drm_core_check_feature(dev, DRIVER_MODESET))
+ if (drm_core_check_feature(dev, DRIVER_MODESET)) {
drm_fb_release(file);
+ drm_property_destroy_user_blobs(dev, file);
+ }
if (drm_core_check_feature(dev, DRIVER_GEM))
drm_gem_release(dev, file);
drm_legacy_ctxbitmap_flush(dev, file);
@@ -237,12 +239,12 @@ drm_close_file(struct drm_file *file)
if (dev->driver->postclose)
(*dev->driver->postclose)(dev, file);
+
#ifndef __NetBSD__ /* XXX drm prime */
if (drm_core_check_feature(dev, DRIVER_PRIME))
drm_prime_destroy_file_private(&file->prime);
#endif
-
seldestroy(&file->event_selq);
DRM_DESTROY_WAITQUEUE(&file->event_wait);
linux_mutex_destroy(&file->fbs_lock);
