[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/display Undo local diff,...

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

details:   https://anonhg.NetBSD.org/src/rev/4e9e7f69acd8
branches:  trunk
changeset: 1028701:4e9e7f69acd8
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:48:02 2021 +0000

description:
Undo local diff, nbsd-namespace.h


Author: Maya Rashish <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/display/intel_overlay.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r cd149b0994ad -r 4e9e7f69acd8 sys/external/bsd/drm2/dist/drm/i915/display/intel_overlay.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_overlay.c       Sun Dec 19 11:47:55 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_overlay.c       Sun Dec 19 11:48:02 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_overlay.c,v 1.2 2021/12/18 23:45:30 riastradh Exp $      */
+/*     $NetBSD: intel_overlay.c,v 1.3 2021/12/19 11:48:02 riastradh Exp $      */
 
 /*
  * Copyright © 2009
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_overlay.c,v 1.2 2021/12/18 23:45:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_overlay.c,v 1.3 2021/12/19 11:48:02 riastradh Exp $");
 
 #include <drm/drm_fourcc.h>
 #include <drm/i915_drm.h>
@@ -43,6 +43,8 @@
 #include "intel_frontbuffer.h"
 #include "intel_overlay.h"
 
+#include <linux/nbsd-namespace.h>
+
 /* Limits for overlay size. According to intel doc, the real limits are:
  * Y width: 4095, UV width (planar): 2047, Y height: 2047,
  * UV width (planar): * 1023. But the xorg thinks 2048 for height and width. Use
@@ -1079,7 +1081,6 @@
        struct intel_overlay *overlay;
        struct drm_crtc *drmmode_crtc;
        struct intel_crtc *crtc;
-       struct drm_gem_object *new_gbo;
        struct drm_i915_gem_object *new_bo;
        int ret;