Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:48:02 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/display: intel_overlay.c
Log Message:
Undo local diff, nbsd-namespace.h
Author: Maya Rashish <[email protected]>
Committer: Taylor R Campbell <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_overlay.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/i915/display/intel_overlay.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_overlay.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_overlay.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_overlay.c:1.2 Sat Dec 18 23:45:30 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_overlay.c Sun Dec 19 11:48:02 2021
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: intel_overla
#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 @@ int intel_overlay_put_image_ioctl(struct
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;
