Module Name: src Committed By: riastradh Date: Mon Aug 27 14:40:30 UTC 2018
Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_crtc.c Log Message: Call drm_modeset_lock_fini in drm_plane_cleanup. >From mrg@. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/dist/drm/drm_crtc.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/dist/drm/drm_crtc.c diff -u src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.10 src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.11 --- src/sys/external/bsd/drm2/dist/drm/drm_crtc.c:1.10 Mon Aug 27 14:39:46 2018 +++ src/sys/external/bsd/drm2/dist/drm/drm_crtc.c Mon Aug 27 14:40:30 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_crtc.c,v 1.10 2018/08/27 14:39:46 riastradh Exp $ */ +/* $NetBSD: drm_crtc.c,v 1.11 2018/08/27 14:40:30 riastradh Exp $ */ /* * Copyright (c) 2006-2008 Intel Corporation @@ -32,7 +32,7 @@ * Jesse Barnes <jesse.bar...@intel.com> */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: drm_crtc.c,v 1.10 2018/08/27 14:39:46 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_crtc.c,v 1.11 2018/08/27 14:40:30 riastradh Exp $"); #include <linux/err.h> #include <linux/spinlock.h> @@ -1295,6 +1295,7 @@ void drm_plane_cleanup(struct drm_plane WARN_ON(plane->state && !plane->funcs->atomic_destroy_state); if (plane->state && plane->funcs->atomic_destroy_state) plane->funcs->atomic_destroy_state(plane, plane->state); + drm_modeset_lock_fini(&plane->mutex); memset(plane, 0, sizeof(*plane)); }