Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:50:42 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: drm_module.c drm_scatter.c
Log Message:
Missing includes, conditionalize on drm legacy
Might want to remove drm legacy code entirely later.
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/drm2/drm/drm_module.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/drm/drm_scatter.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_module.c
diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.21 src/sys/external/bsd/drm2/drm/drm_module.c:1.22
--- src/sys/external/bsd/drm2/drm/drm_module.c:1.21 Sun Dec 19 01:03:22 2021
+++ src/sys/external/bsd/drm2/drm/drm_module.c Sun Dec 19 09:50:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_module.c,v 1.21 2021/12/19 01:03:22 riastradh Exp $ */
+/* $NetBSD: drm_module.c,v 1.22 2021/12/19 09:50:42 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.21 2021/12/19 01:03:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.22 2021/12/19 09:50:42 riastradh Exp $");
#include <sys/types.h>
#include <sys/condvar.h>
@@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_module.c
#include <linux/mutex.h>
#include <drm/drmP.h>
+#include <drm/drm_bridge.h>
#include <drm/drm_encoder_slave.h>
#include <drm/drm_sysctl.h>
#include <drm/drm_panel.h>
Index: src/sys/external/bsd/drm2/drm/drm_scatter.c
diff -u src/sys/external/bsd/drm2/drm/drm_scatter.c:1.6 src/sys/external/bsd/drm2/drm/drm_scatter.c:1.7
--- src/sys/external/bsd/drm2/drm/drm_scatter.c:1.6 Sun Dec 19 00:28:20 2021
+++ src/sys/external/bsd/drm2/drm/drm_scatter.c Sun Dec 19 09:50:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_scatter.c,v 1.6 2021/12/19 00:28:20 riastradh Exp $ */
+/* $NetBSD: drm_scatter.c,v 1.7 2021/12/19 09:50:42 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_scatter.c,v 1.6 2021/12/19 00:28:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_scatter.c,v 1.7 2021/12/19 09:50:42 riastradh Exp $");
#include <sys/types.h>
#include <sys/bus.h>
@@ -40,10 +40,12 @@ __KERNEL_RCSID(0, "$NetBSD: drm_scatter.
#include <linux/slab.h>
#include <drm/drmP.h>
+#include <drm/drm_drv.h>
#include "../dist/drm/drm_internal.h"
#include "../dist/drm/drm_legacy.h"
+#if IS_ENABLED(CONFIG_DRM_LEGACY)
static int drm_sg_alloc_mem(struct drm_device *, size_t,
struct drm_sg_mem **);
static void drm_sg_free_mem(struct drm_device *, struct drm_sg_mem *);
@@ -238,3 +240,4 @@ drm_sg_free_mem(struct drm_device *dev,
sg->sg_tag = NULL; /* XXX paranoia */
kmem_free(sg, offsetof(struct drm_sg_mem, sg_segs[sg->sg_nsegs_max]));
}
+#endif
