Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/drm2/drm Make drm_lastclose match upstream.
details: https://anonhg.NetBSD.org/src/rev/955ee68341c8
branches: trunk
changeset: 365803:955ee68341c8
user: riastradh <riastradh%NetBSD.org@localhost>
date: Mon Aug 27 06:48:50 2018 +0000
description:
Make drm_lastclose match upstream.
diffstat:
sys/external/bsd/drm2/drm/drm_cdevsw.c | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diffs (49 lines):
diff -r d9fc85aafe16 -r 955ee68341c8 sys/external/bsd/drm2/drm/drm_cdevsw.c
--- a/sys/external/bsd/drm2/drm/drm_cdevsw.c Mon Aug 27 06:48:40 2018 +0000
+++ b/sys/external/bsd/drm2/drm/drm_cdevsw.c Mon Aug 27 06:48:50 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_cdevsw.c,v 1.1 2018/08/27 06:31:41 riastradh Exp $ */
+/* $NetBSD: drm_cdevsw.c,v 1.2 2018/08/27 06:48:50 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.1 2018/08/27 06:31:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.2 2018/08/27 06:48:50 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -387,7 +387,6 @@
int
drm_lastclose(struct drm_device *dev)
{
- struct drm_vma_entry *vma, *vma_temp;
/* XXX Order is sketchy here... */
if (dev->driver->lastclose)
@@ -399,19 +398,12 @@
if (dev->agp)
drm_agp_clear_hook(dev);
drm_legacy_sg_cleanup(dev);
- list_for_each_entry_safe(vma, vma_temp, &dev->vmalist, head) {
- list_del(&vma->head);
- kfree(vma);
- }
+ drm_legacy_vma_flush(dev);
drm_legacy_dma_takedown(dev);
+
mutex_unlock(&dev->struct_mutex);
- if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
- dev->sigdata.lock = NULL;
- dev->context_flag = 0;
- dev->last_context = 0;
- dev->if_version = 0;
- }
+ drm_legacy_dev_reinit(dev);
return 0;
}
Home |
Main Index |
Thread Index |
Old Index