[src/trunk]: src/sys/external/bsd/drm2/drm Missing includes, conditionalize o...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ca619c5d0286
branches:  trunk
changeset: 1028215:ca619c5d0286
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 09:50:42 2021 +0000

description:
Missing includes, conditionalize on drm legacy

Might want to remove drm legacy code entirely later.


Author: Maya Rashish <maya%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/drm/drm_module.c  |  5 +++--
 sys/external/bsd/drm2/drm/drm_scatter.c |  7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (62 lines):

diff -r 2b8d81a952b7 -r ca619c5d0286 sys/external/bsd/drm2/drm/drm_module.c
--- a/sys/external/bsd/drm2/drm/drm_module.c    Sun Dec 19 09:50:36 2021 +0000
+++ b/sys/external/bsd/drm2/drm/drm_module.c    Sun Dec 19 09:50:42 2021 +0000
@@ -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 @@
 #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>
diff -r 2b8d81a952b7 -r ca619c5d0286 sys/external/bsd/drm2/drm/drm_scatter.c
--- a/sys/external/bsd/drm2/drm/drm_scatter.c   Sun Dec 19 09:50:36 2021 +0000
+++ b/sys/external/bsd/drm2/drm/drm_scatter.c   Sun Dec 19 09:50:42 2021 +0000
@@ -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 @@
 #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 @@
        sg->sg_tag = NULL;      /* XXX paranoia */
        kmem_free(sg, offsetof(struct drm_sg_mem, sg_segs[sg->sg_nsegs_max]));
 }
+#endif