[Midnightbsd-cvs] src [6766] trunk/sys/dev/drm2: sync drm2 with freebsd 9.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Sep 13 23:55:55 EDT 2014
Revision: 6766
http://svnweb.midnightbsd.org/src/?rev=6766
Author: laffer1
Date: 2014-09-13 23:55:54 -0400 (Sat, 13 Sep 2014)
Log Message:
-----------
sync drm2 with freebsd 9.2
Modified Paths:
--------------
trunk/sys/dev/drm2/drm.h
trunk/sys/dev/drm2/drmP.h
trunk/sys/dev/drm2/drm_agpsupport.c
trunk/sys/dev/drm2/drm_atomic.h
trunk/sys/dev/drm2/drm_auth.c
trunk/sys/dev/drm2/drm_bufs.c
trunk/sys/dev/drm2/drm_context.c
trunk/sys/dev/drm2/drm_crtc.c
trunk/sys/dev/drm2/drm_crtc.h
trunk/sys/dev/drm2/drm_crtc_helper.c
trunk/sys/dev/drm2/drm_crtc_helper.h
trunk/sys/dev/drm2/drm_dma.c
trunk/sys/dev/drm2/drm_dp_helper.h
trunk/sys/dev/drm2/drm_dp_iic_helper.c
trunk/sys/dev/drm2/drm_drawable.c
trunk/sys/dev/drm2/drm_drv.c
trunk/sys/dev/drm2/drm_edid.c
trunk/sys/dev/drm2/drm_edid.h
trunk/sys/dev/drm2/drm_edid_modes.h
trunk/sys/dev/drm2/drm_fb_helper.c
trunk/sys/dev/drm2/drm_fb_helper.h
trunk/sys/dev/drm2/drm_fops.c
trunk/sys/dev/drm2/drm_fourcc.h
trunk/sys/dev/drm2/drm_gem.c
trunk/sys/dev/drm2/drm_gem_names.c
trunk/sys/dev/drm2/drm_gem_names.h
trunk/sys/dev/drm2/drm_hashtab.c
trunk/sys/dev/drm2/drm_hashtab.h
trunk/sys/dev/drm2/drm_internal.h
trunk/sys/dev/drm2/drm_ioctl.c
trunk/sys/dev/drm2/drm_irq.c
trunk/sys/dev/drm2/drm_linux_list.h
trunk/sys/dev/drm2/drm_linux_list_sort.c
trunk/sys/dev/drm2/drm_lock.c
trunk/sys/dev/drm2/drm_memory.c
trunk/sys/dev/drm2/drm_mm.c
trunk/sys/dev/drm2/drm_mm.h
trunk/sys/dev/drm2/drm_mode.h
trunk/sys/dev/drm2/drm_modes.c
trunk/sys/dev/drm2/drm_pci.c
trunk/sys/dev/drm2/drm_pciids.h
trunk/sys/dev/drm2/drm_sarea.h
trunk/sys/dev/drm2/drm_scatter.c
trunk/sys/dev/drm2/drm_sman.c
trunk/sys/dev/drm2/drm_sman.h
trunk/sys/dev/drm2/drm_stub.c
trunk/sys/dev/drm2/drm_sysctl.c
trunk/sys/dev/drm2/drm_vm.c
trunk/sys/dev/drm2/i915/i915_debug.c
trunk/sys/dev/drm2/i915/i915_dma.c
trunk/sys/dev/drm2/i915/i915_drm.h
trunk/sys/dev/drm2/i915/i915_drv.c
trunk/sys/dev/drm2/i915/i915_drv.h
trunk/sys/dev/drm2/i915/i915_gem.c
trunk/sys/dev/drm2/i915/i915_gem_evict.c
trunk/sys/dev/drm2/i915/i915_gem_execbuffer.c
trunk/sys/dev/drm2/i915/i915_gem_gtt.c
trunk/sys/dev/drm2/i915/i915_gem_tiling.c
trunk/sys/dev/drm2/i915/i915_irq.c
trunk/sys/dev/drm2/i915/i915_reg.h
trunk/sys/dev/drm2/i915/i915_suspend.c
trunk/sys/dev/drm2/i915/intel_bios.c
trunk/sys/dev/drm2/i915/intel_bios.h
trunk/sys/dev/drm2/i915/intel_crt.c
trunk/sys/dev/drm2/i915/intel_display.c
trunk/sys/dev/drm2/i915/intel_dp.c
trunk/sys/dev/drm2/i915/intel_drv.h
trunk/sys/dev/drm2/i915/intel_fb.c
trunk/sys/dev/drm2/i915/intel_hdmi.c
trunk/sys/dev/drm2/i915/intel_iic.c
trunk/sys/dev/drm2/i915/intel_lvds.c
trunk/sys/dev/drm2/i915/intel_modes.c
trunk/sys/dev/drm2/i915/intel_opregion.c
trunk/sys/dev/drm2/i915/intel_overlay.c
trunk/sys/dev/drm2/i915/intel_panel.c
trunk/sys/dev/drm2/i915/intel_ringbuffer.c
trunk/sys/dev/drm2/i915/intel_ringbuffer.h
trunk/sys/dev/drm2/i915/intel_sdvo.c
Modified: trunk/sys/dev/drm2/drm.h
===================================================================
--- trunk/sys/dev/drm2/drm.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/**
* \file drm.h
* Header for the Direct Rendering Manager
@@ -34,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm.h 235783 2012-05-22 11:07:44Z kib $");
/**
* \mainpage
Modified: trunk/sys/dev/drm2/drmP.h
===================================================================
--- trunk/sys/dev/drm2/drmP.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drmP.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
* Created: Mon Jan 4 10:05:05 1999 by faith at precisioninsight.com
*/
@@ -32,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drmP.h 249080 2013-04-04 05:36:11Z kib $");
#ifndef _DRM_P_H_
#define _DRM_P_H_
@@ -105,6 +106,7 @@
#include <dev/drm2/drm_mm.h>
#include <dev/drm2/drm_hashtab.h>
+#include "opt_compat.h"
#include "opt_drm.h"
#ifdef DRM_DEBUG
#undef DRM_DEBUG
@@ -227,6 +229,7 @@
#define IRQ_NONE /* nothing */
#define unlikely(x) __builtin_expect(!!(x), 0)
+#define likely(x) __builtin_expect(!!(x), 1)
#define container_of(ptr, type, member) ({ \
__typeof( ((type *)0)->member ) *__mptr = (ptr); \
(type *)( (char *)__mptr - offsetof(type,member) );})
@@ -760,6 +763,10 @@
int (*device_is_agp) (struct drm_device * dev);
drm_ioctl_desc_t *ioctls;
+#ifdef COMPAT_FREEBSD32
+ drm_ioctl_desc_t *compat_ioctls;
+ int *compat_ioctls_nr;
+#endif
int max_ioctl;
int buf_priv_size;
Modified: trunk/sys/dev/drm2/drm_agpsupport.c
===================================================================
--- trunk/sys/dev/drm2/drm_agpsupport.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_agpsupport.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_agpsupport.c 235783 2012-05-22 11:07:44Z kib $");
/** @file drm_agpsupport.c
* Support code for tying the kernel AGP support to DRM drivers and
Modified: trunk/sys/dev/drm2/drm_atomic.h
===================================================================
--- trunk/sys/dev/drm2/drm_atomic.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_atomic.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/**
* \file drm_atomic.h
* Atomic operations used in the DRM which may or may not be provided by the OS.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_atomic.h 235783 2012-05-22 11:07:44Z kib $");
/* Many of these implementations are rather fake, but good enough. */
Modified: trunk/sys/dev/drm2/drm_auth.c
===================================================================
--- trunk/sys/dev/drm2/drm_auth.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_auth.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_auth.c 235783 2012-05-22 11:07:44Z kib $");
/** @file drm_auth.c
* Implementation of the get/authmagic ioctls implementing the authentication
Modified: trunk/sys/dev/drm2/drm_bufs.c
===================================================================
--- trunk/sys/dev/drm2/drm_bufs.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_bufs.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_bufs.c 235783 2012-05-22 11:07:44Z kib $");
/** @file drm_bufs.c
* Implementation of the ioctls for setup of DRM mappings and DMA buffers.
Modified: trunk/sys/dev/drm2/drm_context.c
===================================================================
--- trunk/sys/dev/drm2/drm_context.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_context.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_context.c 235783 2012-05-22 11:07:44Z kib $");
/** @file drm_context.c
* Implementation of the context management ioctls.
Modified: trunk/sys/dev/drm2/drm_crtc.c
===================================================================
--- trunk/sys/dev/drm2/drm_crtc.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_crtc.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2006-2008 Intel Corporation
* Copyright (c) 2007 Dave Airlie <airlied at linux.ie>
@@ -30,7 +31,7 @@
* Jesse Barnes <jesse.barnes at intel.com>
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_crtc.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drm.h>
#include <dev/drm2/drmP.h>
Modified: trunk/sys/dev/drm2/drm_crtc.h
===================================================================
--- trunk/sys/dev/drm2/drm_crtc.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_crtc.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright © 2006 Keith Packard
* Copyright © 2007-2008 Dave Airlie
@@ -22,7 +23,7 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/dev/drm2/drm_crtc.h 235783 2012-05-22 11:07:44Z kib $
*/
#ifndef __DRM_CRTC_H__
#define __DRM_CRTC_H__
Modified: trunk/sys/dev/drm2/drm_crtc_helper.c
===================================================================
--- trunk/sys/dev/drm2/drm_crtc_helper.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_crtc_helper.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2006-2008 Intel Corporation
* Copyright (c) 2007 Dave Airlie <airlied at linux.ie>
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_crtc_helper.c 235783 2012-05-22 11:07:44Z kib $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/dev/drm2/drm_crtc_helper.h
===================================================================
--- trunk/sys/dev/drm2/drm_crtc_helper.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_crtc_helper.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright © 2006 Keith Packard
* Copyright © 2007-2008 Dave Airlie
@@ -22,7 +23,7 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/dev/drm2/drm_crtc_helper.h 235783 2012-05-22 11:07:44Z kib $
*/
/*
Modified: trunk/sys/dev/drm2/drm_dma.c
===================================================================
--- trunk/sys/dev/drm2/drm_dma.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_dma.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_dma.c 235783 2012-05-22 11:07:44Z kib $");
/** @file drm_dma.c
* Support code for DMA buffer management.
Modified: trunk/sys/dev/drm2/drm_dp_helper.h
===================================================================
--- trunk/sys/dev/drm2/drm_dp_helper.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_dp_helper.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright © 2008 Keith Packard
*
@@ -19,7 +20,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/dev/drm2/drm_dp_helper.h 235783 2012-05-22 11:07:44Z kib $
*/
#ifndef _DRM_DP_HELPER_H_
Modified: trunk/sys/dev/drm2/drm_dp_iic_helper.c
===================================================================
--- trunk/sys/dev/drm2/drm_dp_iic_helper.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_dp_iic_helper.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright © 2009 Keith Packard
*
@@ -21,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_dp_iic_helper.c 235783 2012-05-22 11:07:44Z kib $");
#include <sys/types.h>
#include <sys/kobj.h>
Modified: trunk/sys/dev/drm2/drm_drawable.c
===================================================================
--- trunk/sys/dev/drm2/drm_drawable.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_drawable.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_drawable.c 235783 2012-05-22 11:07:44Z kib $");
/** @file drm_drawable.c
* This file implements ioctls to store information along with DRM drawables,
Modified: trunk/sys/dev/drm2/drm_drv.c
===================================================================
--- trunk/sys/dev/drm2/drm_drv.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_drv.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_drv.c 243442 2012-11-23 11:23:15Z glebius $");
/** @file drm_drv.c
* The catch-all file for DRM device support, including module setup/teardown,
@@ -36,8 +37,8 @@
* open/close, and ioctl dispatch.
*/
-
#include <sys/limits.h>
+#include <sys/sysent.h>
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
#include <dev/drm2/drm_sarea.h>
@@ -44,9 +45,10 @@
#include <dev/drm2/drm_mode.h>
#ifdef DRM_DEBUG_DEFAULT_ON
-int drm_debug_flag = 1;
+int drm_debug_flag = (DRM_DEBUGBITS_DEBUG | DRM_DEBUGBITS_KMS |
+ DRM_DEBUGBITS_FAILED_IOCTL);
#else
-int drm_debug_flag = 2;
+int drm_debug_flag = 0;
#endif
int drm_notyet_flag = 0;
@@ -802,6 +804,8 @@
DRM_UNLOCK(dev);
}
+extern drm_ioctl_desc_t drm_compat_ioctls[];
+
/* drm_ioctl is called whenever a process performs an ioctl on /dev/drm.
*/
int drm_ioctl(struct cdev *kdev, u_long cmd, caddr_t data, int flags,
@@ -846,7 +850,22 @@
return EINVAL;
}
- ioctl = &drm_ioctls[nr];
+#ifdef COMPAT_FREEBSD32
+ /*
+ * Called whenever a 32-bit process running under a 64-bit
+ * kernel performs an ioctl on /dev/drm.
+ */
+ if (SV_CURPROC_FLAG(SV_ILP32) && drm_compat_ioctls[nr].func != NULL)
+ /*
+ * Assume that ioctls without an explicit compat
+ * routine will just work. This may not always be a
+ * good assumption, but it's better than always
+ * failing.
+ */
+ ioctl = &drm_compat_ioctls[nr];
+ else
+#endif
+ ioctl = &drm_ioctls[nr];
/* It's not a core DRM ioctl, try driver-specific. */
if (ioctl->func == NULL && nr >= DRM_COMMAND_BASE) {
/* The array entries begin at DRM_COMMAND_BASE ioctl nr */
@@ -856,7 +875,14 @@
nr, dev->driver->max_ioctl);
return EINVAL;
}
- ioctl = &dev->driver->ioctls[nr];
+#ifdef COMPAT_FREEBSD32
+ if (SV_CURPROC_FLAG(SV_ILP32) &&
+ nr < *dev->driver->compat_ioctls_nr &&
+ dev->driver->compat_ioctls[nr].func != NULL)
+ ioctl = &dev->driver->compat_ioctls[nr];
+ else
+#endif
+ ioctl = &dev->driver->ioctls[nr];
is_driver_ioctl = 1;
}
func = ioctl->func;
Modified: trunk/sys/dev/drm2/drm_edid.c
===================================================================
--- trunk/sys/dev/drm2/drm_edid.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_edid.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2006 Luc Verhaegen (quirks list)
* Copyright (c) 2007-2008 Intel Corporation
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_edid.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm_edid.h>
Modified: trunk/sys/dev/drm2/drm_edid.h
===================================================================
--- trunk/sys/dev/drm2/drm_edid.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_edid.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright © 2007-2008 Intel Corporation
* Jesse Barnes <jesse.barnes at intel.com>
@@ -20,7 +21,7 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/dev/drm2/drm_edid.h 235783 2012-05-22 11:07:44Z kib $
*/
#ifndef __DRM_EDID_H__
#define __DRM_EDID_H__
Modified: trunk/sys/dev/drm2/drm_edid_modes.h
===================================================================
--- trunk/sys/dev/drm2/drm_edid_modes.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_edid_modes.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2007-2008 Intel Corporation
* Jesse Barnes <jesse.barnes at intel.com>
@@ -22,7 +23,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/dev/drm2/drm_edid_modes.h 235783 2012-05-22 11:07:44Z kib $
*/
#include <dev/drm2/drmP.h>
Modified: trunk/sys/dev/drm2/drm_fb_helper.c
===================================================================
--- trunk/sys/dev/drm2/drm_fb_helper.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_fb_helper.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2006-2009 Red Hat Inc.
* Copyright (c) 2006-2008 Intel Corporation
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_fb_helper.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm_crtc.h>
Modified: trunk/sys/dev/drm2/drm_fb_helper.h
===================================================================
--- trunk/sys/dev/drm2/drm_fb_helper.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_fb_helper.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2006-2009 Red Hat Inc.
* Copyright (c) 2006-2008 Intel Corporation
@@ -27,7 +28,7 @@
* Dave Airlie <airlied at linux.ie>
* Jesse Barnes <jesse.barnes at intel.com>
*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/dev/drm2/drm_fb_helper.h 235783 2012-05-22 11:07:44Z kib $
*/
#ifndef DRM_FB_HELPER_H
#define DRM_FB_HELPER_H
Modified: trunk/sys/dev/drm2/drm_fops.c
===================================================================
--- trunk/sys/dev/drm2/drm_fops.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_fops.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_fops.c 241088 2012-10-01 06:42:07Z hselasky $");
/** @file drm_fops.c
* Support code for dealing with the file privates associated with each
@@ -57,12 +58,6 @@
return ENOMEM;
}
- retcode = devfs_set_cdevpriv(priv, drm_close);
- if (retcode != 0) {
- free(priv, DRM_MEM_FILES);
- return retcode;
- }
-
DRM_LOCK(dev);
priv->dev = dev;
priv->uid = p->td_ucred->cr_svuid;
@@ -83,7 +78,6 @@
/* shared code returns -errno */
retcode = -dev->driver->open(dev, priv);
if (retcode != 0) {
- devfs_clear_cdevpriv();
free(priv, DRM_MEM_FILES);
DRM_UNLOCK(dev);
return retcode;
@@ -96,7 +90,12 @@
TAILQ_INSERT_TAIL(&dev->files, priv, link);
DRM_UNLOCK(dev);
kdev->si_drv1 = dev;
- return 0;
+
+ retcode = devfs_set_cdevpriv(priv, drm_close);
+ if (retcode != 0)
+ drm_close(priv);
+
+ return (retcode);
}
static bool
Modified: trunk/sys/dev/drm2/drm_fourcc.h
===================================================================
--- trunk/sys/dev/drm2/drm_fourcc.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_fourcc.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright 2011 Intel Corporation
*
@@ -20,7 +21,7 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/dev/drm2/drm_fourcc.h 235783 2012-05-22 11:07:44Z kib $
*/
#ifndef DRM_FOURCC_H
Modified: trunk/sys/dev/drm2/drm_gem.c
===================================================================
--- trunk/sys/dev/drm2/drm_gem.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_gem.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_gem.c 235783 2012-05-22 11:07:44Z kib $");
#include "opt_vm.h"
Modified: trunk/sys/dev/drm2/drm_gem_names.c
===================================================================
--- trunk/sys/dev/drm2/drm_gem_names.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_gem_names.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_gem_names.c 235783 2012-05-22 11:07:44Z kib $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/dev/drm2/drm_gem_names.h
===================================================================
--- trunk/sys/dev/drm2/drm_gem_names.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_gem_names.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/dev/drm2/drm_gem_names.h 235783 2012-05-22 11:07:44Z kib $
*
*/
Modified: trunk/sys/dev/drm2/drm_hashtab.c
===================================================================
--- trunk/sys/dev/drm2/drm_hashtab.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_hashtab.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/**************************************************************************
*
* Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA.
@@ -27,7 +28,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_hashtab.c 235783 2012-05-22 11:07:44Z kib $");
/*
* Simple open hash tab implementation.
Modified: trunk/sys/dev/drm2/drm_hashtab.h
===================================================================
--- trunk/sys/dev/drm2/drm_hashtab.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_hashtab.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/**************************************************************************
*
* Copyright 2006 Tungsten Graphics, Inc., Bismack, ND. USA.
@@ -27,7 +28,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_hashtab.h 235783 2012-05-22 11:07:44Z kib $");
/*
* Simple open hash tab implementation.
Modified: trunk/sys/dev/drm2/drm_internal.h
===================================================================
--- trunk/sys/dev/drm2/drm_internal.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_internal.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2007 Red Hat, Inc
* All rights reserved.
@@ -23,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_internal.h 235783 2012-05-22 11:07:44Z kib $");
/* This header file holds function prototypes and data types that are
* internal to the drm (not exported to user space) but shared across
Modified: trunk/sys/dev/drm2/drm_ioctl.c
===================================================================
--- trunk/sys/dev/drm2/drm_ioctl.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_ioctl.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_ioctl.c 235783 2012-05-22 11:07:44Z kib $");
/** @file drm_ioctl.c
* Varios minor DRM ioctls not applicable to other files, such as versioning
Modified: trunk/sys/dev/drm2/drm_irq.c
===================================================================
--- trunk/sys/dev/drm2/drm_irq.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_irq.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2003 Eric Anholt
* All Rights Reserved.
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_irq.c 235783 2012-05-22 11:07:44Z kib $");
/** @file drm_irq.c
* Support code for handling setup/teardown of interrupt handlers and
Modified: trunk/sys/dev/drm2/drm_linux_list.h
===================================================================
--- trunk/sys/dev/drm2/drm_linux_list.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_linux_list.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* drm_linux_list.h -- linux list functions for the BSDs.
* Created: Mon Apr 7 14:30:16 1999 by anholt at FreeBSD.org
*/
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_linux_list.h 235783 2012-05-22 11:07:44Z kib $");
#ifndef _DRM_LINUX_LIST_H_
#define _DRM_LINUX_LIST_H_
Modified: trunk/sys/dev/drm2/drm_linux_list_sort.c
===================================================================
--- trunk/sys/dev/drm2/drm_linux_list_sort.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_linux_list_sort.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
@@ -28,7 +29,7 @@
*/
#include <dev/drm2/drmP.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_linux_list_sort.c 235783 2012-05-22 11:07:44Z kib $");
struct drm_list_sort_thunk {
int (*cmp)(void *, struct list_head *, struct list_head *);
Modified: trunk/sys/dev/drm2/drm_lock.c
===================================================================
--- trunk/sys/dev/drm2/drm_lock.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_lock.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_lock.c 235783 2012-05-22 11:07:44Z kib $");
/** @file drm_lock.c
* Implementation of the ioctls and other support code for dealing with the
Modified: trunk/sys/dev/drm2/drm_memory.c
===================================================================
--- trunk/sys/dev/drm2/drm_memory.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_memory.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
*Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_memory.c 235783 2012-05-22 11:07:44Z kib $");
/** @file drm_memory.c
* Wrappers for kernel memory allocation routines, and MTRR management support.
Modified: trunk/sys/dev/drm2/drm_mm.c
===================================================================
--- trunk/sys/dev/drm2/drm_mm.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_mm.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/**************************************************************************
*
* Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA.
@@ -27,7 +28,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_mm.c 249081 2013-04-04 05:39:37Z kib $");
/*
* Generic simple memory manager implementation. Intended to be used as a base
@@ -561,3 +562,40 @@
KASSERT(mm->num_unused == 0, ("num_unused != 0"));
}
+
+void drm_mm_debug_table(struct drm_mm *mm, const char *prefix)
+{
+ struct drm_mm_node *entry;
+ unsigned long total_used = 0, total_free = 0, total = 0;
+ unsigned long hole_start, hole_end, hole_size;
+
+ hole_start = drm_mm_hole_node_start(&mm->head_node);
+ hole_end = drm_mm_hole_node_end(&mm->head_node);
+ hole_size = hole_end - hole_start;
+ if (hole_size)
+ printf("%s 0x%08lx-0x%08lx: %8lu: free\n",
+ prefix, hole_start, hole_end,
+ hole_size);
+ total_free += hole_size;
+
+ drm_mm_for_each_node(entry, mm) {
+ printf("%s 0x%08lx-0x%08lx: %8lu: used\n",
+ prefix, entry->start, entry->start + entry->size,
+ entry->size);
+ total_used += entry->size;
+
+ if (entry->hole_follows) {
+ hole_start = drm_mm_hole_node_start(entry);
+ hole_end = drm_mm_hole_node_end(entry);
+ hole_size = hole_end - hole_start;
+ printf("%s 0x%08lx-0x%08lx: %8lu: free\n",
+ prefix, hole_start, hole_end,
+ hole_size);
+ total_free += hole_size;
+ }
+ }
+ total = total_free + total_used;
+
+ printf("%s total: %lu, used %lu free %lu\n", prefix, total,
+ total_used, total_free);
+}
Modified: trunk/sys/dev/drm2/drm_mm.h
===================================================================
--- trunk/sys/dev/drm2/drm_mm.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_mm.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/**************************************************************************
*
* Copyright 2006-2008 Tungsten Graphics, Inc., Cedar Park, TX. USA.
@@ -27,7 +28,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_mm.h 249081 2013-04-04 05:39:37Z kib $");
/*
* Authors:
@@ -182,4 +183,6 @@
int drm_mm_scan_add_block(struct drm_mm_node *node);
int drm_mm_scan_remove_block(struct drm_mm_node *node);
+void drm_mm_debug_table(struct drm_mm *mm, const char *prefix);
+
#endif
Modified: trunk/sys/dev/drm2/drm_mode.h
===================================================================
--- trunk/sys/dev/drm2/drm_mode.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_mode.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2007 Dave Airlie <airlied at linux.ie>
* Copyright (c) 2007 Jakob Bornecrantz <wallbraker at gmail.com>
@@ -23,7 +24,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/dev/drm2/drm_mode.h 235783 2012-05-22 11:07:44Z kib $
*/
#ifndef _DRM_MODE_H
Modified: trunk/sys/dev/drm2/drm_modes.c
===================================================================
--- trunk/sys/dev/drm2/drm_modes.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_modes.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright © 1997-2003 by The XFree86 Project, Inc.
* Copyright © 2007 Dave Airlie
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_modes.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/drm_pci.c
===================================================================
--- trunk/sys/dev/drm2/drm_pci.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_pci.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2003 Eric Anholt.
* All Rights Reserved.
@@ -22,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_pci.c 235783 2012-05-22 11:07:44Z kib $");
/**
* \file drm_pci.h
Modified: trunk/sys/dev/drm2/drm_pciids.h
===================================================================
--- trunk/sys/dev/drm2/drm_pciids.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_pciids.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/dev/drm2/drm_pciids.h 237662 2012-06-27 21:05:21Z gavin $
*/
/*
This file is auto-generated from the drm_pciids.txt in the DRM CVS
Modified: trunk/sys/dev/drm2/drm_sarea.h
===================================================================
--- trunk/sys/dev/drm2/drm_sarea.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_sarea.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/**
* \file drm_sarea.h
* \brief SAREA definitions
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_sarea.h 235783 2012-05-22 11:07:44Z kib $");
#ifndef _DRM_SAREA_H_
#define _DRM_SAREA_H_
Modified: trunk/sys/dev/drm2/drm_scatter.c
===================================================================
--- trunk/sys/dev/drm2/drm_scatter.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_scatter.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2009 Robert C. Noland III <rnoland at FreeBSD.org>
* All Rights Reserved.
@@ -23,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_scatter.c 235783 2012-05-22 11:07:44Z kib $");
/** @file drm_scatter.c
* Allocation of memory for scatter-gather mappings by the graphics chip.
Modified: trunk/sys/dev/drm2/drm_sman.c
===================================================================
--- trunk/sys/dev/drm2/drm_sman.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_sman.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/**************************************************************************
*
* Copyright 2006 Tungsten Graphics, Inc., Bismarck., ND., USA.
@@ -27,7 +28,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_sman.c 235783 2012-05-22 11:07:44Z kib $");
/*
* Simple memory manager interface that keeps track on allocate regions on a
Modified: trunk/sys/dev/drm2/drm_sman.h
===================================================================
--- trunk/sys/dev/drm2/drm_sman.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_sman.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/**************************************************************************
*
* Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA.
@@ -27,7 +28,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_sman.h 235783 2012-05-22 11:07:44Z kib $");
/*
* Simple memory MANager interface that keeps track on allocate regions on a
Modified: trunk/sys/dev/drm2/drm_stub.c
===================================================================
--- trunk/sys/dev/drm2/drm_stub.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_stub.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/**
* \file drm_stub.h
* Stub support
@@ -32,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_stub.c 235783 2012-05-22 11:07:44Z kib $");
#include "drmP.h"
Modified: trunk/sys/dev/drm2/drm_sysctl.c
===================================================================
--- trunk/sys/dev/drm2/drm_sysctl.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_sysctl.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2003 Eric Anholt
* All Rights Reserved.
@@ -22,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_sysctl.c 235783 2012-05-22 11:07:44Z kib $");
/** @file drm_sysctl.c
* Implementation of various sysctls for controlling DRM behavior and reporting
Modified: trunk/sys/dev/drm2/drm_vm.c
===================================================================
--- trunk/sys/dev/drm2/drm_vm.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/drm_vm.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2003 Eric Anholt
* All Rights Reserved.
@@ -22,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/drm_vm.c 235783 2012-05-22 11:07:44Z kib $");
/** @file drm_vm.c
* Support code for mmaping of DRM maps.
Modified: trunk/sys/dev/drm2/i915/i915_debug.c
===================================================================
--- trunk/sys/dev/drm2/i915/i915_debug.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/i915_debug.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/i915_debug.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/i915_dma.c
===================================================================
--- trunk/sys/dev/drm2/i915/i915_dma.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/i915_dma.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/i915_dma.c 239965 2012-09-01 05:35:48Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
@@ -627,7 +627,7 @@
return (ret);
}
-static int i915_batchbuffer(struct drm_device *dev, void *data,
+int i915_batchbuffer(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -676,7 +676,7 @@
return ret;
}
-static int i915_cmdbuffer(struct drm_device *dev, void *data,
+int i915_cmdbuffer(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -747,7 +747,7 @@
return ret;
}
-static int i915_getparam(struct drm_device *dev, void *data,
+int i915_getparam(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
drm_i915_private_t *dev_priv = dev->dev_private;
@@ -1493,6 +1493,11 @@
DRM_IOCTL_DEF(DRM_I915_GET_SPRITE_COLORKEY, intel_sprite_get_colorkey, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
};
+#ifdef COMPAT_FREEBSD32
+extern drm_ioctl_desc_t i915_compat_ioctls[];
+extern int i915_compat_ioctls_nr;
+#endif
+
struct drm_driver_info i915_driver_info = {
.driver_features = DRIVER_USE_AGP | DRIVER_REQUIRE_AGP |
DRIVER_USE_MTRR | DRIVER_HAVE_IRQ | DRIVER_LOCKLESS_IRQ |
@@ -1516,6 +1521,10 @@
.sysctl_cleanup = i915_sysctl_cleanup,
.ioctls = i915_ioctls,
+#ifdef COMPAT_FREEBSD32
+ .compat_ioctls = i915_compat_ioctls,
+ .compat_ioctls_nr = &i915_compat_ioctls_nr,
+#endif
.max_ioctl = DRM_ARRAY_SIZE(i915_ioctls),
.name = DRIVER_NAME,
Modified: trunk/sys/dev/drm2/i915/i915_drm.h
===================================================================
--- trunk/sys/dev/drm2/i915/i915_drm.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/i915_drm.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/i915_drm.h 235783 2012-05-22 11:07:44Z kib $");
#ifndef _I915_DRM_H_
#define _I915_DRM_H_
Modified: trunk/sys/dev/drm2/i915/i915_drv.c
===================================================================
--- trunk/sys/dev/drm2/i915/i915_drv.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/i915_drv.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/i915_drv.c 241091 2012-10-01 08:33:39Z mav $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
@@ -486,7 +486,7 @@
count = 0;
while (count++ < 50 && (I915_READ_NOTRACE(FORCEWAKE_ACK) & 1))
- DELAY(10000);
+ DELAY(10);
I915_WRITE_NOTRACE(FORCEWAKE, 1);
POSTING_READ(FORCEWAKE);
@@ -493,7 +493,7 @@
count = 0;
while (count++ < 50 && (I915_READ_NOTRACE(FORCEWAKE_ACK) & 1) == 0)
- DELAY(10000);
+ DELAY(10);
}
void
@@ -503,7 +503,7 @@
count = 0;
while (count++ < 50 && (I915_READ_NOTRACE(FORCEWAKE_MT_ACK) & 1))
- DELAY(10000);
+ DELAY(10);
I915_WRITE_NOTRACE(FORCEWAKE_MT, (1<<16) | 1);
POSTING_READ(FORCEWAKE_MT);
@@ -510,7 +510,7 @@
count = 0;
while (count++ < 50 && (I915_READ_NOTRACE(FORCEWAKE_MT_ACK) & 1) == 0)
- DELAY(10000);
+ DELAY(10);
}
void
@@ -572,7 +572,7 @@
int loop = 500;
u32 fifo = I915_READ_NOTRACE(GT_FIFO_FREE_ENTRIES);
while (fifo <= GT_FIFO_NUM_RESERVED_ENTRIES && loop--) {
- DELAY(10000);
+ DELAY(10);
fifo = I915_READ_NOTRACE(GT_FIFO_FREE_ENTRIES);
}
if (loop < 0 && fifo <= GT_FIFO_NUM_RESERVED_ENTRIES) {
Modified: trunk/sys/dev/drm2/i915/i915_drv.h
===================================================================
--- trunk/sys/dev/drm2/i915/i915_drv.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/i915_drv.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/i915_drv.h 239965 2012-09-01 05:35:48Z kib $");
#ifndef _I915_DRV_H_
#define _I915_DRV_H_
@@ -1034,6 +1034,12 @@
void i915_sysctl_cleanup(struct drm_device *dev);
/* i915_dma.c */
+int i915_batchbuffer(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+int i915_cmdbuffer(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+int i915_getparam(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
extern void i915_kernel_lost_context(struct drm_device * dev);
extern int i915_driver_load(struct drm_device *, unsigned long flags);
extern int i915_driver_unload(struct drm_device *);
Modified: trunk/sys/dev/drm2/i915/i915_gem.c
===================================================================
--- trunk/sys/dev/drm2/i915/i915_gem.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/i915_gem.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/i915_gem.c 252496 2013-07-02 04:42:32Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
@@ -1362,7 +1362,6 @@
cause = ret = 0;
m = NULL;
-
if (i915_intr_pf) {
ret = i915_mutex_lock_interruptible(dev);
if (ret != 0) {
@@ -1372,6 +1371,23 @@
} else
DRM_LOCK(dev);
+ /*
+ * Since the object lock was dropped, other thread might have
+ * faulted on the same GTT address and instantiated the
+ * mapping for the page. Recheck.
+ */
+ VM_OBJECT_LOCK(vm_obj);
+ m = vm_page_lookup(vm_obj, OFF_TO_IDX(offset));
+ if (m != NULL) {
+ if ((m->flags & VPO_BUSY) != 0) {
+ DRM_UNLOCK(dev);
+ vm_page_sleep(m, "915pee");
+ goto retry;
+ }
+ goto have_page;
+ } else
+ VM_OBJECT_UNLOCK(vm_obj);
+
/* Now bind it into the GTT if needed */
if (!obj->map_and_fenceable) {
ret = i915_gem_object_unbind(obj);
@@ -1425,10 +1441,9 @@
goto retry;
}
m->valid = VM_PAGE_BITS_ALL;
+ vm_page_insert(m, vm_obj, OFF_TO_IDX(offset));
+have_page:
*mres = m;
- vm_page_lock(m);
- vm_page_insert(m, vm_obj, OFF_TO_IDX(offset));
- vm_page_unlock(m);
vm_page_busy(m);
CTR4(KTR_DRM, "fault %p %jx %x phys %x", gem_obj, offset, prot,
Modified: trunk/sys/dev/drm2/i915/i915_gem_evict.c
===================================================================
--- trunk/sys/dev/drm2/i915/i915_gem_evict.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/i915_gem_evict.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/i915_gem_evict.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/i915_gem_execbuffer.c
===================================================================
--- trunk/sys/dev/drm2/i915/i915_gem_execbuffer.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/i915_gem_execbuffer.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/i915_gem_execbuffer.c 236933 2012-06-11 21:44:24Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/i915_gem_gtt.c
===================================================================
--- trunk/sys/dev/drm2/i915/i915_gem_gtt.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/i915_gem_gtt.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/i915_gem_gtt.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/i915_gem_tiling.c
===================================================================
--- trunk/sys/dev/drm2/i915/i915_gem_tiling.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/i915_gem_tiling.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/i915_gem_tiling.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/i915_irq.c
===================================================================
--- trunk/sys/dev/drm2/i915/i915_irq.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/i915_irq.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/i915_irq.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/i915_reg.h
===================================================================
--- trunk/sys/dev/drm2/i915/i915_reg.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/i915_reg.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/i915_reg.h 235783 2012-05-22 11:07:44Z kib $");
#ifndef _I915_REG_H_
#define _I915_REG_H_
Modified: trunk/sys/dev/drm2/i915/i915_suspend.c
===================================================================
--- trunk/sys/dev/drm2/i915/i915_suspend.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/i915_suspend.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/i915_suspend.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/intel_bios.c
===================================================================
--- trunk/sys/dev/drm2/i915/intel_bios.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_bios.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -23,7 +23,7 @@
* Authors:
* Eric Anholt <eric at anholt.net>
*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_bios.c 235783 2012-05-22 11:07:44Z kib $
*/
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/intel_bios.h
===================================================================
--- trunk/sys/dev/drm2/i915/intel_bios.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_bios.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -23,7 +23,7 @@
* Authors:
* Eric Anholt <eric at anholt.net>
*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_bios.h 235783 2012-05-22 11:07:44Z kib $
*/
#ifndef _I830_BIOS_H_
Modified: trunk/sys/dev/drm2/i915/intel_crt.c
===================================================================
--- trunk/sys/dev/drm2/i915/intel_crt.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_crt.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_crt.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/intel_display.c
===================================================================
--- trunk/sys/dev/drm2/i915/intel_display.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_display.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_display.c 236931 2012-06-11 21:41:45Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/intel_dp.c
===================================================================
--- trunk/sys/dev/drm2/i915/intel_dp.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_dp.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_dp.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/intel_drv.h
===================================================================
--- trunk/sys/dev/drm2/i915/intel_drv.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_drv.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -22,7 +22,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_drv.h 235783 2012-05-22 11:07:44Z kib $
*/
#ifndef DRM_INTEL_DRV_H
Modified: trunk/sys/dev/drm2/i915/intel_fb.c
===================================================================
--- trunk/sys/dev/drm2/i915/intel_fb.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_fb.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_fb.c 252497 2013-07-02 04:45:51Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
@@ -207,6 +207,8 @@
}
}
+extern int sc_txtmouse_no_retrace_wait;
+
int intel_fbdev_init(struct drm_device *dev)
{
struct intel_fbdev *ifbdev;
@@ -229,6 +231,7 @@
drm_fb_helper_single_add_all_connectors(&ifbdev->helper);
drm_fb_helper_initial_config(&ifbdev->helper, 32);
+ sc_txtmouse_no_retrace_wait = 1;
return 0;
}
Modified: trunk/sys/dev/drm2/i915/intel_hdmi.c
===================================================================
--- trunk/sys/dev/drm2/i915/intel_hdmi.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_hdmi.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_hdmi.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/intel_iic.c
===================================================================
--- trunk/sys/dev/drm2/i915/intel_iic.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_iic.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -54,7 +54,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_iic.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/intel_lvds.c
===================================================================
--- trunk/sys/dev/drm2/i915/intel_lvds.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_lvds.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_lvds.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/intel_modes.c
===================================================================
--- trunk/sys/dev/drm2/i915/intel_modes.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_modes.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_modes.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/intel_opregion.c
===================================================================
--- trunk/sys/dev/drm2/i915/intel_opregion.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_opregion.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_opregion.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/i915/i915_drm.h>
Modified: trunk/sys/dev/drm2/i915/intel_overlay.c
===================================================================
--- trunk/sys/dev/drm2/i915/intel_overlay.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_overlay.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_overlay.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/intel_panel.c
===================================================================
--- trunk/sys/dev/drm2/i915/intel_panel.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_panel.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_panel.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/intel_ringbuffer.c
===================================================================
--- trunk/sys/dev/drm2/i915/intel_ringbuffer.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_ringbuffer.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_ringbuffer.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
Modified: trunk/sys/dev/drm2/i915/intel_ringbuffer.h
===================================================================
--- trunk/sys/dev/drm2/i915/intel_ringbuffer.h 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_ringbuffer.h 2014-09-14 03:55:54 UTC (rev 6766)
@@ -1,5 +1,5 @@
/*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_ringbuffer.h 235783 2012-05-22 11:07:44Z kib $
*/
#ifndef _INTEL_RINGBUFFER_H_
Modified: trunk/sys/dev/drm2/i915/intel_sdvo.c
===================================================================
--- trunk/sys/dev/drm2/i915/intel_sdvo.c 2014-09-14 03:55:20 UTC (rev 6765)
+++ trunk/sys/dev/drm2/i915/intel_sdvo.c 2014-09-14 03:55:54 UTC (rev 6766)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: release/9.2.0/sys/dev/drm2/i915/intel_sdvo.c 235783 2012-05-22 11:07:44Z kib $");
#include <dev/drm2/drmP.h>
#include <dev/drm2/drm.h>
More information about the Midnightbsd-cvs
mailing list