Module Name: src
Committed By: riastradh
Date: Sun Dec 19 00:48:45 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_agp_hook.c drm_cdevsw.c
Log Message:
drm_agp_clear got renamed to drm_agp_legacy_clear.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/drm/drm_agp_hook.c
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/drm2/drm/drm_cdevsw.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_agp_hook.c
diff -u src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.4 src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.5
--- src/sys/external/bsd/drm2/drm/drm_agp_hook.c:1.4 Sun Dec 19 00:28:20 2021
+++ src/sys/external/bsd/drm2/drm/drm_agp_hook.c Sun Dec 19 00:48:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_agp_hook.c,v 1.4 2021/12/19 00:28:20 riastradh Exp $ */
+/* $NetBSD: drm_agp_hook.c,v 1.5 2021/12/19 00:48:45 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_agp_hook.c,v 1.4 2021/12/19 00:28:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_agp_hook.c,v 1.5 2021/12/19 00:48:45 riastradh Exp $");
#include <sys/types.h>
#include <sys/condvar.h>
@@ -165,7 +165,7 @@ drm_agp_fini(struct drm_device *dev)
}
void
-drm_agp_clear(struct drm_device *dev)
+drm_legacy_agp_clear(struct drm_device *dev)
{
if (dev->agp == NULL)
Index: src/sys/external/bsd/drm2/drm/drm_cdevsw.c
diff -u src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.18 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.19
--- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.18 Sun Dec 19 00:48:38 2021
+++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c Sun Dec 19 00:48:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_cdevsw.c,v 1.18 2021/12/19 00:48:38 riastradh Exp $ */
+/* $NetBSD: drm_cdevsw.c,v 1.19 2021/12/19 00:48:45 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.18 2021/12/19 00:48:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.19 2021/12/19 00:48:45 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -255,7 +255,7 @@ drm_lastclose(struct drm_device *dev)
mutex_lock(&dev->struct_mutex);
if (dev->agp)
- drm_agp_clear(dev);
+ drm_legacy_agp_clear(dev);
drm_legacy_sg_cleanup(dev);
drm_legacy_dma_takedown(dev);
mutex_unlock(&dev->struct_mutex);
