[Midnightbsd-cvs] src [10119] trunk/sys/dev/drm: update drm
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun May 27 20:14:51 EDT 2018
Revision: 10119
http://svnweb.midnightbsd.org/src/?rev=10119
Author: laffer1
Date: 2018-05-27 20:14:50 -0400 (Sun, 27 May 2018)
Log Message:
-----------
update drm
Modified Paths:
--------------
trunk/sys/dev/drm/ati_pcigart.c
trunk/sys/dev/drm/drm.h
trunk/sys/dev/drm/drmP.h
trunk/sys/dev/drm/drm_agpsupport.c
trunk/sys/dev/drm/drm_atomic.h
trunk/sys/dev/drm/drm_auth.c
trunk/sys/dev/drm/drm_bufs.c
trunk/sys/dev/drm/drm_context.c
trunk/sys/dev/drm/drm_dma.c
trunk/sys/dev/drm/drm_drawable.c
trunk/sys/dev/drm/drm_drv.c
trunk/sys/dev/drm/drm_fops.c
trunk/sys/dev/drm/drm_hashtab.c
trunk/sys/dev/drm/drm_hashtab.h
trunk/sys/dev/drm/drm_internal.h
trunk/sys/dev/drm/drm_ioctl.c
trunk/sys/dev/drm/drm_irq.c
trunk/sys/dev/drm/drm_linux_list.h
trunk/sys/dev/drm/drm_lock.c
trunk/sys/dev/drm/drm_memory.c
trunk/sys/dev/drm/drm_mm.c
trunk/sys/dev/drm/drm_mm.h
trunk/sys/dev/drm/drm_pci.c
trunk/sys/dev/drm/drm_pciids.h
trunk/sys/dev/drm/drm_sarea.h
trunk/sys/dev/drm/drm_scatter.c
trunk/sys/dev/drm/drm_sman.c
trunk/sys/dev/drm/drm_sman.h
trunk/sys/dev/drm/drm_sysctl.c
trunk/sys/dev/drm/drm_vm.c
trunk/sys/dev/drm/i915_dma.c
trunk/sys/dev/drm/i915_drm.h
trunk/sys/dev/drm/i915_drv.c
trunk/sys/dev/drm/i915_drv.h
trunk/sys/dev/drm/i915_irq.c
trunk/sys/dev/drm/i915_mem.c
trunk/sys/dev/drm/i915_reg.h
trunk/sys/dev/drm/i915_suspend.c
trunk/sys/dev/drm/mach64_dma.c
trunk/sys/dev/drm/mach64_drm.h
trunk/sys/dev/drm/mach64_drv.c
trunk/sys/dev/drm/mach64_drv.h
trunk/sys/dev/drm/mach64_irq.c
trunk/sys/dev/drm/mach64_state.c
trunk/sys/dev/drm/mga_dma.c
trunk/sys/dev/drm/mga_drm.h
trunk/sys/dev/drm/mga_drv.c
trunk/sys/dev/drm/mga_drv.h
trunk/sys/dev/drm/mga_irq.c
trunk/sys/dev/drm/mga_state.c
trunk/sys/dev/drm/mga_ucode.h
trunk/sys/dev/drm/mga_warp.c
trunk/sys/dev/drm/r128_cce.c
trunk/sys/dev/drm/r128_drm.h
trunk/sys/dev/drm/r128_drv.c
trunk/sys/dev/drm/r128_drv.h
trunk/sys/dev/drm/r128_irq.c
trunk/sys/dev/drm/r128_state.c
trunk/sys/dev/drm/r300_cmdbuf.c
trunk/sys/dev/drm/r300_reg.h
trunk/sys/dev/drm/r600_blit.c
trunk/sys/dev/drm/r600_cp.c
trunk/sys/dev/drm/r600_microcode.h
trunk/sys/dev/drm/radeon_cp.c
trunk/sys/dev/drm/radeon_cs.c
trunk/sys/dev/drm/radeon_drm.h
trunk/sys/dev/drm/radeon_drv.c
trunk/sys/dev/drm/radeon_drv.h
trunk/sys/dev/drm/radeon_irq.c
trunk/sys/dev/drm/radeon_mem.c
trunk/sys/dev/drm/radeon_microcode.h
trunk/sys/dev/drm/radeon_state.c
trunk/sys/dev/drm/savage_bci.c
trunk/sys/dev/drm/savage_drm.h
trunk/sys/dev/drm/savage_drv.c
trunk/sys/dev/drm/savage_drv.h
trunk/sys/dev/drm/savage_state.c
trunk/sys/dev/drm/sis_drm.h
trunk/sys/dev/drm/sis_drv.c
trunk/sys/dev/drm/sis_drv.h
trunk/sys/dev/drm/sis_ds.c
trunk/sys/dev/drm/sis_ds.h
trunk/sys/dev/drm/sis_mm.c
trunk/sys/dev/drm/tdfx_drv.c
trunk/sys/dev/drm/tdfx_drv.h
trunk/sys/dev/drm/via_3d_reg.h
trunk/sys/dev/drm/via_dma.c
trunk/sys/dev/drm/via_dmablit.c
trunk/sys/dev/drm/via_dmablit.h
trunk/sys/dev/drm/via_drm.h
trunk/sys/dev/drm/via_drv.c
trunk/sys/dev/drm/via_drv.h
trunk/sys/dev/drm/via_irq.c
trunk/sys/dev/drm/via_map.c
trunk/sys/dev/drm/via_mm.c
trunk/sys/dev/drm/via_verifier.c
trunk/sys/dev/drm/via_verifier.h
trunk/sys/dev/drm/via_video.c
Modified: trunk/sys/dev/drm/ati_pcigart.c
===================================================================
--- trunk/sys/dev/drm/ati_pcigart.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/ati_pcigart.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/ati_pcigart.c 207069 2010-04-22 18:47:30Z rnoland $");
/** @file ati_pcigart.c
* Implementation of ATI's PCIGART, which provides an aperture in card virtual
Modified: trunk/sys/dev/drm/drm.h
===================================================================
--- trunk/sys/dev/drm/drm.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm.h 183573 2008-10-03 16:59:11Z rnoland $");
/**
* \mainpage
Modified: trunk/sys/dev/drm/drmP.h
===================================================================
--- trunk/sys/dev/drm/drmP.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drmP.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drmP.h 248084 2013-03-09 02:32:23Z attilio $");
#ifndef _DRM_P_H_
#define _DRM_P_H_
@@ -59,6 +60,7 @@
#include <sys/fcntl.h>
#include <sys/uio.h>
#include <sys/filio.h>
+#include <sys/rwlock.h>
#include <sys/sysctl.h>
#include <sys/bus.h>
#include <sys/queue.h>
@@ -85,6 +87,11 @@
#endif
#include <machine/sysarch.h>
#include <sys/endian.h>
+#if _BYTE_ORDER == _BIG_ENDIAN
+#define __BIG_ENDIAN 1
+#else
+#define __LITTLE_ENDIAN 1
+#endif
#include <sys/mman.h>
#include <sys/rman.h>
#include <sys/memrange.h>
Modified: trunk/sys/dev/drm/drm_agpsupport.c
===================================================================
--- trunk/sys/dev/drm/drm_agpsupport.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_agpsupport.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_agpsupport.c 219902 2011-03-23 13:10:15Z jhb $");
/** @file drm_agpsupport.c
* Support code for tying the kernel AGP support to DRM drivers and
Modified: trunk/sys/dev/drm/drm_atomic.h
===================================================================
--- trunk/sys/dev/drm/drm_atomic.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_atomic.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_atomic.h 183573 2008-10-03 16:59:11Z rnoland $");
/* Many of these implementations are rather fake, but good enough. */
Modified: trunk/sys/dev/drm/drm_auth.c
===================================================================
--- trunk/sys/dev/drm/drm_auth.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_auth.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_auth.c 183833 2008-10-13 18:03:27Z rnoland $");
/** @file drm_auth.c
* Implementation of the get/authmagic ioctls implementing the authentication
Modified: trunk/sys/dev/drm/drm_bufs.c
===================================================================
--- trunk/sys/dev/drm/drm_bufs.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_bufs.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_bufs.c 331412 2018-03-23 02:38:31Z emaste $");
/** @file drm_bufs.c
* Implementation of the ioctls for setup of DRM mappings and DMA buffers.
@@ -935,6 +936,7 @@
if (dma->bufs[i].buf_count) {
struct drm_buf_desc from;
+ memset(&from, 0, sizeof(from));
from.count = dma->bufs[i].buf_count;
from.size = dma->bufs[i].buf_size;
from.low_mark = dma->bufs[i].freelist.low_mark;
Modified: trunk/sys/dev/drm/drm_context.c
===================================================================
--- trunk/sys/dev/drm/drm_context.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_context.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_context.c 207066 2010-04-22 18:21:25Z rnoland $");
/** @file drm_context.c
* Implementation of the context management ioctls.
Modified: trunk/sys/dev/drm/drm_dma.c
===================================================================
--- trunk/sys/dev/drm/drm_dma.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_dma.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_dma.c 183833 2008-10-13 18:03:27Z rnoland $");
/** @file drm_dma.c
* Support code for DMA buffer management.
Modified: trunk/sys/dev/drm/drm_drawable.c
===================================================================
--- trunk/sys/dev/drm/drm_drawable.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_drawable.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_drawable.c 183834 2008-10-13 18:06:33Z rnoland $");
/** @file drm_drawable.c
* This file implements ioctls to store information along with DRM drawables,
Modified: trunk/sys/dev/drm/drm_drv.c
===================================================================
--- trunk/sys/dev/drm/drm_drv.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_drv.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_drv.c 215367 2010-11-16 03:43:06Z nwhitehorn $");
/** @file drm_drv.c
* The catch-all file for DRM device support, including module setup/teardown,
Modified: trunk/sys/dev/drm/drm_fops.c
===================================================================
--- trunk/sys/dev/drm/drm_fops.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_fops.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_fops.c 239303 2012-08-15 16:19:39Z hselasky $");
/** @file drm_fops.c
* Support code for dealing with the file privates associated with each
Modified: trunk/sys/dev/drm/drm_hashtab.c
===================================================================
--- trunk/sys/dev/drm/drm_hashtab.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_hashtab.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_hashtab.c 207118 2010-04-23 14:48:30Z rnoland $");
/*
* Simple open hash tab implementation.
Modified: trunk/sys/dev/drm/drm_hashtab.h
===================================================================
--- trunk/sys/dev/drm/drm_hashtab.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_hashtab.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_hashtab.h 203287 2010-01-31 14:25:29Z rnoland $");
/*
* Simple open hash tab implementation.
Modified: trunk/sys/dev/drm/drm_internal.h
===================================================================
--- trunk/sys/dev/drm/drm_internal.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_internal.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_internal.h 182080 2008-08-23 20:59:12Z rnoland $");
/* 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/drm/drm_ioctl.c
===================================================================
--- trunk/sys/dev/drm/drm_ioctl.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_ioctl.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_ioctl.c 183833 2008-10-13 18:03:27Z rnoland $");
/** @file drm_ioctl.c
* Varios minor DRM ioctls not applicable to other files, such as versioning
Modified: trunk/sys/dev/drm/drm_irq.c
===================================================================
--- trunk/sys/dev/drm/drm_irq.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_irq.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2003 Eric Anholt
* All Rights Reserved.
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/drm_irq.c 331410 2018-03-23 02:34:45Z emaste $");
/** @file drm_irq.c
* Support code for handling setup/teardown of interrupt handlers and
@@ -357,7 +358,7 @@
goto out;
crtc = modeset->crtc;
- if (crtc >= dev->num_crtcs) {
+ if (crtc < 0 || crtc >= dev->num_crtcs) {
ret = EINVAL;
goto out;
}
Modified: trunk/sys/dev/drm/drm_linux_list.h
===================================================================
--- trunk/sys/dev/drm/drm_linux_list.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_linux_list.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_linux_list.h 203287 2010-01-31 14:25:29Z rnoland $");
#ifndef _DRM_LINUX_LIST_H_
#define _DRM_LINUX_LIST_H_
Modified: trunk/sys/dev/drm/drm_lock.c
===================================================================
--- trunk/sys/dev/drm/drm_lock.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_lock.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_lock.c 190023 2009-03-19 08:36:08Z rnoland $");
/** @file drm_lock.c
* Implementation of the ioctls and other support code for dealing with the
Modified: trunk/sys/dev/drm/drm_memory.c
===================================================================
--- trunk/sys/dev/drm/drm_memory.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_memory.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_memory.c 215367 2010-11-16 03:43:06Z nwhitehorn $");
/** @file drm_memory.c
* Wrappers for kernel memory allocation routines, and MTRR management support.
Modified: trunk/sys/dev/drm/drm_mm.c
===================================================================
--- trunk/sys/dev/drm/drm_mm.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_mm.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_mm.c 207118 2010-04-23 14:48:30Z rnoland $");
/*
* Generic simple memory manager implementation. Intended to be used as a base
Modified: trunk/sys/dev/drm/drm_mm.h
===================================================================
--- trunk/sys/dev/drm/drm_mm.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_mm.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_mm.h 203287 2010-01-31 14:25:29Z rnoland $");
/*
* Authors:
Modified: trunk/sys/dev/drm/drm_pci.c
===================================================================
--- trunk/sys/dev/drm/drm_pci.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_pci.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2003 Eric Anholt.
* All Rights Reserved.
@@ -22,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/drm_pci.c 190565 2009-03-30 18:01:42Z rnoland $");
/**
* \file drm_pci.h
Modified: trunk/sys/dev/drm/drm_pciids.h
===================================================================
--- trunk/sys/dev/drm/drm_pciids.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_pciids.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/drm/drm_pciids.h 210819 2010-08-03 16:30:56Z olli $
*/
/*
This file is auto-generated from the drm_pciids.txt in the DRM CVS
Modified: trunk/sys/dev/drm/drm_sarea.h
===================================================================
--- trunk/sys/dev/drm/drm_sarea.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_sarea.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/**
* \file drm_sarea.h
* \brief SAREA definitions
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/drm_sarea.h 182080 2008-08-23 20:59:12Z rnoland $");
#ifndef _DRM_SAREA_H_
#define _DRM_SAREA_H_
Modified: trunk/sys/dev/drm/drm_scatter.c
===================================================================
--- trunk/sys/dev/drm/drm_scatter.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_scatter.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_scatter.c 254025 2013-08-07 06:21:20Z jeff $");
/** @file drm_scatter.c
* Allocation of memory for scatter-gather mappings by the graphics chip.
@@ -52,7 +53,7 @@
entry->busaddr = malloc(entry->pages * sizeof(*entry->busaddr),
DRM_MEM_SGLISTS, M_WAITOK | M_ZERO);
- entry->vaddr = kmem_alloc_attr(kernel_map, size, M_WAITOK | M_ZERO,
+ entry->vaddr = kmem_alloc_attr(kernel_arena, size, M_WAITOK | M_ZERO,
0, BUS_SPACE_MAXADDR_32BIT, VM_MEMATTR_WRITE_COMBINING);
if (entry->vaddr == 0) {
drm_sg_cleanup(entry);
@@ -99,7 +100,7 @@
return;
if (entry->vaddr != 0)
- kmem_free(kernel_map, entry->vaddr, IDX_TO_OFF(entry->pages));
+ kmem_free(kernel_arena, entry->vaddr, IDX_TO_OFF(entry->pages));
free(entry->busaddr, DRM_MEM_SGLISTS);
free(entry, DRM_MEM_DRIVER);
Modified: trunk/sys/dev/drm/drm_sman.c
===================================================================
--- trunk/sys/dev/drm/drm_sman.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_sman.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_sman.c 207118 2010-04-23 14:48:30Z rnoland $");
/*
* Simple memory manager interface that keeps track on allocate regions on a
Modified: trunk/sys/dev/drm/drm_sman.h
===================================================================
--- trunk/sys/dev/drm/drm_sman.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_sman.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -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: stable/10/sys/dev/drm/drm_sman.h 203287 2010-01-31 14:25:29Z rnoland $");
/*
* Simple memory MANager interface that keeps track on allocate regions on a
Modified: trunk/sys/dev/drm/drm_sysctl.c
===================================================================
--- trunk/sys/dev/drm/drm_sysctl.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_sysctl.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2003 Eric Anholt
* All Rights Reserved.
@@ -22,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/drm_sysctl.c 220979 2011-04-23 23:11:44Z kib $");
/** @file drm_sysctl.c
* Implementation of various sysctls for controlling DRM behavior and reporting
Modified: trunk/sys/dev/drm/drm_vm.c
===================================================================
--- trunk/sys/dev/drm/drm_vm.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/drm_vm.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2003 Eric Anholt
* All Rights Reserved.
@@ -22,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/drm_vm.c 207066 2010-04-22 18:21:25Z rnoland $");
/** @file drm_vm.c
* Support code for mmaping of DRM maps.
Modified: trunk/sys/dev/drm/i915_dma.c
===================================================================
--- trunk/sys/dev/drm/i915_dma.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/i915_dma.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* i915_dma.c -- DMA support for the I915 -*- linux-c -*-
*/
/*-
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/i915_dma.c 207066 2010-04-22 18:21:25Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/i915_drm.h
===================================================================
--- trunk/sys/dev/drm/i915_drm.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/i915_drm.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/i915_drm.h 183573 2008-10-03 16:59:11Z rnoland $");
#ifndef _I915_DRM_H_
#define _I915_DRM_H_
Modified: trunk/sys/dev/drm/i915_drv.c
===================================================================
--- trunk/sys/dev/drm/i915_drv.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/i915_drv.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* i915_drv.c -- Intel i915 driver -*- linux-c -*-
* Created: Wed Feb 14 17:10:04 2001 by gareth at valinux.com
*/
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/i915_drv.c 203287 2010-01-31 14:25:29Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/i915_drv.h
===================================================================
--- trunk/sys/dev/drm/i915_drv.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/i915_drv.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
*/
/*
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/i915_drv.h 228443 2011-12-12 18:43:24Z mdf $");
#ifndef _I915_DRV_H_
#define _I915_DRV_H_
Modified: trunk/sys/dev/drm/i915_irq.c
===================================================================
--- trunk/sys/dev/drm/i915_irq.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/i915_irq.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* i915_irq.c -- IRQ support for the I915 -*- linux-c -*-
*/
/*-
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/i915_irq.c 194986 2009-06-25 18:27:08Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/i915_mem.c
===================================================================
--- trunk/sys/dev/drm/i915_mem.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/i915_mem.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* i915_mem.c -- Simple agp/fb memory manager for i915 -*- linux-c -*-
*/
/*-
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/i915_mem.c 182080 2008-08-23 20:59:12Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/i915_reg.h
===================================================================
--- trunk/sys/dev/drm/i915_reg.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/i915_reg.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
*
@@ -23,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/i915_reg.h 261455 2014-02-04 03:36:42Z eadler $");
#ifndef _I915_REG_H_
#define _I915_REG_H_
@@ -349,7 +350,7 @@
#define VGA1_PD_P1_MASK (0x1f << 8)
#define DPLL_A 0x06014
#define DPLL_B 0x06018
-#define DPLL_VCO_ENABLE (1 << 31)
+#define DPLL_VCO_ENABLE (1U << 31)
#define DPLL_DVO_HIGH_SPEED (1 << 30)
#define DPLL_SYNCLOCK_ENABLE (1 << 29)
#define DPLL_VGA_MODE_DIS (1 << 28)
@@ -653,7 +654,7 @@
/* SDVO port control */
#define SDVOB 0x61140
#define SDVOC 0x61160
-#define SDVO_ENABLE (1 << 31)
+#define SDVO_ENABLE (1U << 31)
#define SDVO_PIPE_B_SELECT (1 << 30)
#define SDVO_STALL_SELECT (1 << 29)
#define SDVO_INTERRUPT_ENABLE (1 << 26)
@@ -690,7 +691,7 @@
#define DVOA 0x61120
#define DVOB 0x61140
#define DVOC 0x61160
-#define DVO_ENABLE (1 << 31)
+#define DVO_ENABLE (1U << 31)
#define DVO_PIPE_B_SELECT (1 << 30)
#define DVO_PIPE_STALL_UNUSED (0 << 28)
#define DVO_PIPE_STALL (1 << 28)
@@ -726,7 +727,7 @@
* Enables the LVDS port. This bit must be set before DPLLs are enabled, as
* the DPLL semantics change when the LVDS is assigned to that pipe.
*/
-#define LVDS_PORT_EN (1 << 31)
+#define LVDS_PORT_EN (1U << 31)
/* Selects pipe B for LVDS data. Must be set on pre-965. */
#define LVDS_PIPEB_SELECT (1 << 30)
/*
@@ -762,7 +763,7 @@
/* Panel power sequencing */
#define PP_STATUS 0x61200
-#define PP_ON (1 << 31)
+#define PP_ON (1U << 31)
/*
* Indicates that all dependencies of the panel are on:
*
@@ -783,7 +784,7 @@
/* Panel fitting */
#define PFIT_CONTROL 0x61230
-#define PFIT_ENABLE (1 << 31)
+#define PFIT_ENABLE (1U << 31)
#define PFIT_PIPE_MASK (3 << 29)
#define PFIT_PIPE_SHIFT 29
#define VERT_INTERP_DISABLE (0 << 10)
@@ -826,7 +827,7 @@
/* TV port control */
#define TV_CTL 0x68000
/** Enables the TV encoder */
-# define TV_ENC_ENABLE (1 << 31)
+# define TV_ENC_ENABLE (1U << 31)
/** Sources the TV encoder input from pipe B instead of A. */
# define TV_ENC_PIPEB_SELECT (1 << 30)
/** Outputs composite video (DAC A only) */
@@ -897,7 +898,7 @@
*
* This gets cleared when TV_DAC_STATE_EN is cleared
*/
-# define TVDAC_STATE_CHG (1 << 31)
+# define TVDAC_STATE_CHG (1U << 31)
# define TVDAC_SENSE_MASK (7 << 28)
/** Reports that DAC A voltage is above the detect threshold */
# define TVDAC_A_SENSE (1 << 30)
@@ -1024,7 +1025,7 @@
#define TV_H_CTL_2 0x68034
/** Enables the colorburst (needed for non-component color) */
-# define TV_BURST_ENA (1 << 31)
+# define TV_BURST_ENA (1U << 31)
/** Offset of the colorburst from the start of hsync, in pixels minus one. */
# define TV_HBURST_START_SHIFT 16
# define TV_HBURST_START_MASK 0x1fff0000
@@ -1069,7 +1070,7 @@
#define TV_V_CTL_3 0x68044
/** Enables generation of the equalization signal */
-# define TV_EQUAL_ENA (1 << 31)
+# define TV_EQUAL_ENA (1U << 31)
/** Length of vsync, in half lines */
# define TV_VEQ_LEN_MASK 0x007f0000
# define TV_VEQ_LEN_SHIFT 16
@@ -1143,7 +1144,7 @@
#define TV_SC_CTL_1 0x68060
/** Turns on the first subcarrier phase generation DDA */
-# define TV_SC_DDA1_EN (1 << 31)
+# define TV_SC_DDA1_EN (1U << 31)
/** Turns on the first subcarrier phase generation DDA */
# define TV_SC_DDA2_EN (1 << 30)
/** Turns on the first subcarrier phase generation DDA */
@@ -1206,7 +1207,7 @@
* If set, the rest of the registers are ignored, and the calculated values can
* be read back from the register.
*/
-# define TV_AUTO_SCALE (1 << 31)
+# define TV_AUTO_SCALE (1U << 31)
/**
* Disables the vertical filter.
*
@@ -1269,7 +1270,7 @@
# define TV_VSCALE_IP_FRAC_SHIFT 0
#define TV_CC_CONTROL 0x68090
-# define TV_CC_ENABLE (1 << 31)
+# define TV_CC_ENABLE (1U << 31)
/**
* Specifies which field to send the CC data in.
*
@@ -1285,7 +1286,7 @@
# define TV_CC_LINE_SHIFT 0
#define TV_CC_DATA 0x68094
-# define TV_CC_RDY (1 << 31)
+# define TV_CC_RDY (1U << 31)
/** Second word of CC data to be transmitted. */
# define TV_CC_DATA_2_MASK 0x007f0000
# define TV_CC_DATA_2_SHIFT 16
@@ -1469,7 +1470,7 @@
/* VBIOS regs */
#define VGACNTRL 0x71400
-# define VGA_DISP_DISABLE (1 << 31)
+# define VGA_DISP_DISABLE (1U << 31)
# define VGA_2X_MODE (1 << 30)
# define VGA_PIPE_B_SELECT (1 << 29)
Modified: trunk/sys/dev/drm/i915_suspend.c
===================================================================
--- trunk/sys/dev/drm/i915_suspend.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/i915_suspend.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* i915_suspend.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
*/
/*
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/i915_suspend.c 190164 2009-03-20 17:51:26Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/mach64_dma.c
===================================================================
--- trunk/sys/dev/drm/mach64_dma.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/mach64_dma.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* mach64_dma.c -- DMA support for mach64 (Rage Pro) driver -*- linux-c -*- */
/**
* \file mach64_dma.c
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/mach64_dma.c 260100 2013-12-30 20:27:58Z dim $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
@@ -512,7 +513,7 @@
DRM_INFO("\n");
- if (ring->head >= 0 && ring->head < ring->size / sizeof(u32)) {
+ if (ring->head < ring->size / sizeof(u32)) {
struct list_head *ptr;
u32 addr = le32_to_cpu(((u32 *) ring->start)[ring->head + 1]);
@@ -559,54 +560,6 @@
/*@{*/
/**
- * Add the end mark to the ring's new tail position.
- *
- * The bus master engine will keep processing the DMA buffers listed in the ring
- * until it finds this mark, making it stop.
- *
- * \sa mach64_clear_dma_eol
- */
-static __inline__ void mach64_set_dma_eol(volatile u32 *addr)
-{
-#if defined(__i386__)
- int nr = 31;
-
- /* Taken from include/asm-i386/bitops.h linux header */
- __asm__ __volatile__("lock;" "btsl %1,%0":"=m"(*addr)
- :"Ir"(nr));
-#elif defined(__powerpc__)
- u32 old;
- u32 mask = cpu_to_le32(MACH64_DMA_EOL);
-
- /* Taken from the include/asm-ppc/bitops.h linux header */
- __asm__ __volatile__("\n\
-1: lwarx %0,0,%3 \n\
- or %0,%0,%2 \n\
- stwcx. %0,0,%3 \n\
- bne- 1b":"=&r"(old), "=m"(*addr)
- :"r"(mask), "r"(addr), "m"(*addr)
- :"cc");
-#elif defined(__alpha__)
- u32 temp;
- u32 mask = MACH64_DMA_EOL;
-
- /* Taken from the include/asm-alpha/bitops.h linux header */
- __asm__ __volatile__("1: ldl_l %0,%3\n"
- " bis %0,%2,%0\n"
- " stl_c %0,%1\n"
- " beq %0,2f\n"
- ".subsection 2\n"
- "2: br 1b\n"
- ".previous":"=&r"(temp), "=m"(*addr)
- :"Ir"(mask), "m"(*addr));
-#else
- u32 mask = cpu_to_le32(MACH64_DMA_EOL);
-
- *addr |= mask;
-#endif
-}
-
-/**
* Remove the end mark from the ring's old tail position.
*
* It should be called after calling mach64_set_dma_eol to mark the ring's new
@@ -1276,7 +1229,7 @@
entry = list_entry(ptr, drm_mach64_freelist_t, list);
buf = entry->buf;
offset = buf_addr - GETBUFADDR(buf);
- if (offset >= 0 && offset < MACH64_BUFFER_SIZE) {
+ if (offset < MACH64_BUFFER_SIZE) {
found = 1;
break;
}
Modified: trunk/sys/dev/drm/mach64_drm.h
===================================================================
--- trunk/sys/dev/drm/mach64_drm.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/mach64_drm.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* mach64_drm.h -- Public header for the mach64 driver -*- linux-c -*-
* Created: Thu Nov 30 20:04:32 2000 by gareth at valinux.com
*/
@@ -32,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/mach64_drm.h 182080 2008-08-23 20:59:12Z rnoland $");
#ifndef __MACH64_DRM_H__
#define __MACH64_DRM_H__
Modified: trunk/sys/dev/drm/mach64_drv.c
===================================================================
--- trunk/sys/dev/drm/mach64_drv.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/mach64_drv.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* mach64_drv.c -- ATI Rage 128 driver -*- linux-c -*-
* Created: Mon Dec 13 09:47:27 1999 by faith at precisioninsight.com
*/
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/mach64_drv.c 189563 2009-03-09 07:55:18Z rnoland $");
#include <sys/types.h>
Modified: trunk/sys/dev/drm/mach64_drv.h
===================================================================
--- trunk/sys/dev/drm/mach64_drv.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/mach64_drv.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* mach64_drv.h -- Private header for mach64 driver -*- linux-c -*-
* Created: Fri Nov 24 22:07:58 2000 by gareth at valinux.com
*/
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/mach64_drv.h 261455 2014-02-04 03:36:42Z eadler $");
#ifndef __MACH64_DRV_H__
#define __MACH64_DRV_H__
@@ -202,7 +203,7 @@
# define MACH64_CIRCULAR_BUF_SIZE_32KB (1 << 0)
# define MACH64_CIRCULAR_BUF_SIZE_64KB (2 << 0)
# define MACH64_CIRCULAR_BUF_SIZE_128KB (3 << 0)
-# define MACH64_LAST_DESCRIPTOR (1 << 31)
+# define MACH64_LAST_DESCRIPTOR (1U << 31)
#define MACH64_BM_HOSTDATA 0x0644
#define MACH64_BM_STATUS 0x018c
#define MACH64_BM_SYSTEM_MEM_ADDR 0x0184
@@ -316,7 +317,7 @@
#define MACH64_FIFO_STAT 0x0710
# define MACH64_FIFO_SLOT_MASK 0x0000ffff
-# define MACH64_FIFO_ERR (1 << 31)
+# define MACH64_FIFO_ERR (1U << 31)
#define MACH64_GEN_TEST_CNTL 0x04d0
# define MACH64_GUI_ENGINE_ENABLE (1 << 8)
@@ -442,7 +443,7 @@
# define MACH64_CRTC2_VLINE_SYNC (1 << 28) /* LT Pro */ /* 0=even, 1=odd */
# define MACH64_CRTC_SNAPSHOT2_INT_EN (1 << 29) /* LT Pro */
# define MACH64_CRTC_SNAPSHOT2_INT (1 << 30) /* LT Pro */
-# define MACH64_CRTC_VBLANK2_INT (1 << 31)
+# define MACH64_CRTC_VBLANK2_INT (1U << 31)
# define MACH64_CRTC_INT_ENS \
( \
MACH64_CRTC_VBLANK_INT_EN | \
Modified: trunk/sys/dev/drm/mach64_irq.c
===================================================================
--- trunk/sys/dev/drm/mach64_irq.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/mach64_irq.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* mach64_irq.c -- IRQ handling for ATI Mach64 -*- linux-c -*-
* Created: Tue Feb 25, 2003 by Leif Delgass, based on radeon_irq.c/r128_irq.c
*/
@@ -36,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/mach64_irq.c 189130 2009-02-28 02:37:55Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/mach64_state.c
===================================================================
--- trunk/sys/dev/drm/mach64_state.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/mach64_state.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* mach64_state.c -- State support for mach64 (Rage Pro) driver -*- linux-c -*-
* Created: Sun Dec 03 19:20:26 2000 by gareth at valinux.com
*/
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/mach64_state.c 198332 2009-10-21 15:54:45Z brueffer $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/mga_dma.c
===================================================================
--- trunk/sys/dev/drm/mga_dma.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/mga_dma.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* mga_dma.c -- DMA support for mga g200/g400 -*- linux-c -*-
* Created: Mon Dec 13 01:50:01 1999 by jhartmann at precisioninsight.com
*/
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/mga_dma.c 207066 2010-04-22 18:21:25Z rnoland $");
/**
* \file mga_dma.c
Modified: trunk/sys/dev/drm/mga_drm.h
===================================================================
--- trunk/sys/dev/drm/mga_drm.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/mga_drm.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* mga_drm.h -- Public header for the Matrox g200/g400 driver -*- linux-c -*-
* Created: Tue Jan 25 01:50:01 1999 by jhartmann at precisioninsight.com
*
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/mga_drm.h 182080 2008-08-23 20:59:12Z rnoland $");
#ifndef __MGA_DRM_H__
#define __MGA_DRM_H__
Modified: trunk/sys/dev/drm/mga_drv.c
===================================================================
--- trunk/sys/dev/drm/mga_drv.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/mga_drv.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* mga_drv.c -- Matrox G200/G400 driver -*- linux-c -*-
* Created: Mon Dec 13 01:56:22 1999 by jhartmann at precisioninsight.com
*/
@@ -32,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/mga_drv.c 189563 2009-03-09 07:55:18Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/mga_drv.h
===================================================================
--- trunk/sys/dev/drm/mga_drv.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/mga_drv.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* mga_drv.h -- Private header for the Matrox G200/G400 driver -*- linux-c -*-
* Created: Mon Dec 13 01:50:01 1999 by jhartmann at precisioninsight.com
*
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/mga_drv.h 261455 2014-02-04 03:36:42Z eadler $");
#ifndef __MGA_DRV_H__
#define __MGA_DRV_H__
@@ -458,7 +459,7 @@
# define MGA_BLTMOD_BU24RGB (15 << 25)
# define MGA_PATTERN (1 << 29)
# define MGA_TRANSC (1 << 30)
-# define MGA_CLIPDIS (1 << 31)
+# define MGA_CLIPDIS (1U << 31)
#define MGA_DWGSYNC 0x2c4c
#define MGA_FCOL 0x1c24
@@ -526,7 +527,7 @@
#define MGA_TEXCTL2 0x2c3c
# define MGA_DUALTEX (1 << 7)
# define MGA_G400_TC2_MAGIC (1 << 15)
-# define MGA_MAP1_ENABLE (1 << 31)
+# define MGA_MAP1_ENABLE (1U << 31)
#define MGA_TEXFILTER 0x2c58
#define MGA_TEXHEIGHT 0x2c2c
#define MGA_TEXORG 0x2c24
Modified: trunk/sys/dev/drm/mga_irq.c
===================================================================
--- trunk/sys/dev/drm/mga_irq.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/mga_irq.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* mga_irq.c -- IRQ handling for radeon -*- linux-c -*-
*/
/*-
@@ -32,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/mga_irq.c 190023 2009-03-19 08:36:08Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/mga_state.c
===================================================================
--- trunk/sys/dev/drm/mga_state.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/mga_state.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* mga_state.c -- State support for MGA G200/G400 -*- linux-c -*-
* Created: Thu Jan 27 02:53:43 2000 by jhartmann at precisioninsight.com
*/
@@ -34,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/mga_state.c 182080 2008-08-23 20:59:12Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/mga_ucode.h
===================================================================
--- trunk/sys/dev/drm/mga_ucode.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/mga_ucode.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* mga_ucode.h -- Matrox G200/G400 WARP engine microcode -*- linux-c -*-
* Created: Thu Jan 11 21:20:43 2001 by gareth at valinux.com
*
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/mga_ucode.h 152909 2005-11-28 23:13:57Z anholt $");
/*
* WARP pipes are named according to the functions they perform, where:
Modified: trunk/sys/dev/drm/mga_warp.c
===================================================================
--- trunk/sys/dev/drm/mga_warp.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/mga_warp.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* mga_warp.c -- Matrox G200/G400 WARP engine management -*- linux-c -*-
* Created: Thu Jan 11 21:29:32 2001 by gareth at valinux.com
*/
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/mga_warp.c 207066 2010-04-22 18:21:25Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/r128_cce.c
===================================================================
--- trunk/sys/dev/drm/r128_cce.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/r128_cce.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* r128_cce.c -- ATI Rage 128 driver -*- linux-c -*-
* Created: Wed Apr 5 19:24:19 2000 by kevin at precisioninsight.com
*/
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/r128_cce.c 207067 2010-04-22 18:44:23Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/r128_drm.h
===================================================================
--- trunk/sys/dev/drm/r128_drm.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/r128_drm.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* r128_drm.h -- Public header for the r128 driver -*- linux-c -*-
* Created: Wed Apr 5 19:24:19 2000 by kevin at precisioninsight.com
*/
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/r128_drm.h 182080 2008-08-23 20:59:12Z rnoland $");
#ifndef __R128_DRM_H__
#define __R128_DRM_H__
Modified: trunk/sys/dev/drm/r128_drv.c
===================================================================
--- trunk/sys/dev/drm/r128_drv.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/r128_drv.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* r128_drv.c -- ATI Rage 128 driver -*- linux-c -*-
* Created: Mon Dec 13 09:47:27 1999 by faith at precisioninsight.com
*/
@@ -32,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/r128_drv.c 189563 2009-03-09 07:55:18Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/r128_drv.h
===================================================================
--- trunk/sys/dev/drm/r128_drv.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/r128_drv.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* r128_drv.h -- Private header for r128 driver -*- linux-c -*-
* Created: Mon Dec 13 09:51:11 1999 by faith at precisioninsight.com
*/
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/r128_drv.h 261455 2014-02-04 03:36:42Z eadler $");
#ifndef __R128_DRV_H__
#define __R128_DRV_H__
@@ -227,7 +228,7 @@
# define R128_ROP3_P 0x00f00000
#define R128_DP_WRITE_MASK 0x16cc
#define R128_DST_PITCH_OFFSET_C 0x1c80
-# define R128_DST_TILE (1 << 31)
+# define R128_DST_TILE (1U << 31)
#define R128_GEN_INT_CNTL 0x0040
# define R128_CRTC_VBLANK_INT_EN (1 << 0)
@@ -246,7 +247,7 @@
#define R128_GUI_STAT 0x1740
# define R128_GUI_FIFOCNT_MASK 0x0fff
-# define R128_GUI_ACTIVE (1 << 31)
+# define R128_GUI_ACTIVE (1U << 31)
#define R128_MCLK_CNTL 0x000f
# define R128_FORCE_GCP (1 << 16)
@@ -258,7 +259,7 @@
# define R128_PC_FLUSH_GUI (3 << 0)
# define R128_PC_RI_GUI (1 << 2)
# define R128_PC_FLUSH_ALL 0x00ff
-# define R128_PC_BUSY (1 << 31)
+# define R128_PC_BUSY (1U << 31)
#define R128_PCI_GART_PAGE 0x017c
#define R128_PRIM_TEX_CNTL_C 0x1cb0
@@ -302,7 +303,7 @@
#define R128_PM4_BUFFER_DL_RPTR_ADDR 0x070c
#define R128_PM4_BUFFER_DL_RPTR 0x0710
#define R128_PM4_BUFFER_DL_WPTR 0x0714
-# define R128_PM4_BUFFER_DL_DONE (1 << 31)
+# define R128_PM4_BUFFER_DL_DONE (1U << 31)
#define R128_PM4_VC_FPU_SETUP 0x071c
@@ -312,7 +313,7 @@
#define R128_PM4_STAT 0x07b8
# define R128_PM4_FIFOCNT_MASK 0x0fff
# define R128_PM4_BUSY (1 << 16)
-# define R128_PM4_GUI_ACTIVE (1 << 31)
+# define R128_PM4_GUI_ACTIVE (1U << 31)
#define R128_PM4_MICROCODE_ADDR 0x07d4
#define R128_PM4_MICROCODE_RADDR 0x07d8
Modified: trunk/sys/dev/drm/r128_irq.c
===================================================================
--- trunk/sys/dev/drm/r128_irq.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/r128_irq.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* r128_irq.c -- IRQ handling for radeon -*- linux-c -*- */
/*-
* Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/r128_irq.c 189130 2009-02-28 02:37:55Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/r128_state.c
===================================================================
--- trunk/sys/dev/drm/r128_state.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/r128_state.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* r128_state.c -- State support for r128 -*- linux-c -*-
* Created: Thu Jan 27 02:53:43 2000 by gareth at valinux.com
*/
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/r128_state.c 207066 2010-04-22 18:21:25Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/r300_cmdbuf.c
===================================================================
--- trunk/sys/dev/drm/r300_cmdbuf.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/r300_cmdbuf.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* r300_cmdbuf.c -- Command buffer emission for R300 -*- linux-c -*-
*
* Copyright (C) The Weather Channel, Inc. 2002.
@@ -32,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/r300_cmdbuf.c 190833 2009-04-07 22:26:53Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/r300_reg.h
===================================================================
--- trunk/sys/dev/drm/r300_reg.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/r300_reg.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/**************************************************************************
Copyright (C) 2004-2005 Nicolai Haehnle et al.
@@ -24,7 +25,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/r300_reg.h 261455 2014-02-04 03:36:42Z eadler $");
/* *INDENT-OFF* */
@@ -1205,7 +1206,7 @@
# define R300_FPI0_OUTC_FRC (9 << 23)
# define R300_FPI0_OUTC_REPL_ALPHA (10 << 23)
# define R300_FPI0_OUTC_SAT (1 << 30)
-# define R300_FPI0_INSERT_NOP (1 << 31)
+# define R300_FPI0_INSERT_NOP (1U << 31)
#define R300_PFS_INSTR2_0 0x49C0
# define R300_FPI2_ARGA_SRC0C_X 0
@@ -1252,7 +1253,7 @@
# define R300_FPI2_OUTA_RCP (10 << 23)
# define R300_FPI2_OUTA_RSQ (11 << 23)
# define R300_FPI2_OUTA_SAT (1 << 30)
-# define R300_FPI2_UNKNOWN_31 (1 << 31)
+# define R300_FPI2_UNKNOWN_31 (1U << 31)
/* END: Fragment program instruction set */
/* Fog state and color */
@@ -1452,7 +1453,7 @@
# define R300_ZB_ZCACHE_CTLSTAT_ZC_FREE_NO_EFFECT (0 << 1)
# define R300_ZB_ZCACHE_CTLSTAT_ZC_FREE_FREE (1 << 1)
# define R300_ZB_ZCACHE_CTLSTAT_ZC_BUSY_IDLE (0 << 31)
-# define R300_ZB_ZCACHE_CTLSTAT_ZC_BUSY_BUSY (1 << 31)
+# define R300_ZB_ZCACHE_CTLSTAT_ZC_BUSY_BUSY (1U << 31)
#define R300_ZB_BW_CNTL 0x4f1c
# define R300_HIZ_DISABLE (0 << 0)
Modified: trunk/sys/dev/drm/r600_blit.c
===================================================================
--- trunk/sys/dev/drm/r600_blit.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/r600_blit.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2009 Advanced Micro Devices, Inc.
*
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/r600_blit.c 261455 2014-02-04 03:36:42Z eadler $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
@@ -1428,12 +1429,12 @@
OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 2));
OUT_RING((R600_PA_SC_GENERIC_SCISSOR_TL - R600_SET_CONTEXT_REG_OFFSET) >> 2);
- OUT_RING((x1 << 0) | (y1 << 16) | (1 << 31));
+ OUT_RING((x1 << 0) | (y1 << 16) | (1U << 31));
OUT_RING((x2 << 0) | (y2 << 16));
OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 2));
OUT_RING((R600_PA_SC_WINDOW_SCISSOR_TL - R600_SET_CONTEXT_REG_OFFSET) >> 2);
- OUT_RING((x1 << 0) | (y1 << 16) | (1 << 31));
+ OUT_RING((x1 << 0) | (y1 << 16) | (1U << 31));
OUT_RING((x2 << 0) | (y2 << 16));
ADVANCE_RING();
}
Modified: trunk/sys/dev/drm/r600_cp.c
===================================================================
--- trunk/sys/dev/drm/r600_cp.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/r600_cp.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2008-2009 Advanced Micro Devices, Inc.
* Copyright 2008 Red Hat Inc.
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/r600_cp.c 207069 2010-04-22 18:47:30Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/r600_microcode.h
===================================================================
--- trunk/sys/dev/drm/r600_microcode.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/r600_microcode.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2007 Advanced Micro Devices, Inc.
* All Rights Reserved.
@@ -24,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/r600_microcode.h 189499 2009-03-07 21:36:57Z rnoland $");
static const int ME_JUMP_TABLE_START = 1764;
static const int ME_JUMP_TABLE_END = 1792;
Modified: trunk/sys/dev/drm/radeon_cp.c
===================================================================
--- trunk/sys/dev/drm/radeon_cp.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/radeon_cp.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Fremont, California.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/radeon_cp.c 261455 2014-02-04 03:36:42Z eadler $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
@@ -542,7 +543,7 @@
#if 0
u32 tmp;
- tmp = RADEON_READ(RADEON_CP_RB_WPTR) | (1 << 31);
+ tmp = RADEON_READ(RADEON_CP_RB_WPTR) | (1U << 31);
RADEON_WRITE(RADEON_CP_RB_WPTR, tmp);
#endif
}
Modified: trunk/sys/dev/drm/radeon_cs.c
===================================================================
--- trunk/sys/dev/drm/radeon_cs.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/radeon_cs.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2008 Jerome Glisse.
* All Rights Reserved.
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/radeon_cs.c 215367 2010-11-16 03:43:06Z nwhitehorn $");
#include "dev/drm/drmP.h"
#include "dev/drm/radeon_drm.h"
#include "dev/drm/radeon_drv.h"
Modified: trunk/sys/dev/drm/radeon_drm.h
===================================================================
--- trunk/sys/dev/drm/radeon_drm.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/radeon_drm.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* radeon_drm.h -- Public header for the radeon driver -*- linux-c -*-
*
* Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/radeon_drm.h 196471 2009-08-23 15:02:58Z rnoland $");
#ifndef __RADEON_DRM_H__
#define __RADEON_DRM_H__
Modified: trunk/sys/dev/drm/radeon_drv.c
===================================================================
--- trunk/sys/dev/drm/radeon_drv.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/radeon_drv.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* radeon_drv.c -- ATI Radeon driver -*- linux-c -*-
* Created: Wed Feb 14 17:10:04 2001 by gareth at valinux.com
*/
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/radeon_drv.c 189563 2009-03-09 07:55:18Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/radeon_drv.h
===================================================================
--- trunk/sys/dev/drm/radeon_drv.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/radeon_drv.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* radeon_drv.h -- Private header for radeon driver -*- linux-c -*-
*
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/radeon_drv.h 261455 2014-02-04 03:36:42Z eadler $");
#ifndef __RADEON_DRV_H__
#define __RADEON_DRV_H__
@@ -659,7 +660,7 @@
# define RS480_GTW_LAC_EN (1 << 25)
# define RS480_2LEVEL_GART (0 << 30)
# define RS480_1LEVEL_GART (1 << 30)
-# define RS480_PDC_EN (1 << 31)
+# define RS480_PDC_EN (1U << 31)
#define RS480_GART_BASE 0x2c
#define RS480_GART_CACHE_CNTRL 0x2e
# define RS480_GART_CACHE_INVALIDATE (1 << 0) /* wait for it to clear */
@@ -775,7 +776,7 @@
# define R300_SUBPIXEL_1_12 (0 << 16)
# define R300_SUBPIXEL_1_16 (1 << 16)
#define R300_DST_PIPE_CONFIG 0x170c
-# define R300_PIPE_AUTO_CONFIG (1 << 31)
+# define R300_PIPE_AUTO_CONFIG (1U << 31)
#define R300_RB2D_DSTCACHE_MODE 0x3428
# define R300_DC_AUTOFLUSH_ENABLE (1 << 8)
# define R300_DC_DC_DISABLE_IGNORE_PE (1 << 17)
@@ -807,8 +808,8 @@
#define RADEON_DST_PITCH_OFFSET_C 0x1c80
# define RADEON_DST_TILE_LINEAR (0 << 30)
# define RADEON_DST_TILE_MACRO (1 << 30)
-# define RADEON_DST_TILE_MICRO (2 << 30)
-# define RADEON_DST_TILE_BOTH (3 << 30)
+# define RADEON_DST_TILE_MICRO (2U << 30)
+# define RADEON_DST_TILE_BOTH (3U << 30)
#define RADEON_SCRATCH_REG0 0x15e0
#define RADEON_SCRATCH_REG1 0x15e4
@@ -902,7 +903,7 @@
# define R300_RB2D_DC_FLUSH (3 << 0)
# define R300_RB2D_DC_FREE (3 << 2)
# define R300_RB2D_DC_FLUSH_ALL 0xf
-# define R300_RB2D_DC_BUSY (1 << 31)
+# define R300_RB2D_DC_BUSY (1U << 31)
#define RADEON_RB3D_CNTL 0x1c3c
# define RADEON_ALPHA_BLEND_ENABLE (1 << 0)
# define RADEON_PLANE_MASK_ENABLE (1 << 1)
@@ -924,16 +925,16 @@
# define RADEON_RB3D_ZC_FLUSH (1 << 0)
# define RADEON_RB3D_ZC_FREE (1 << 2)
# define RADEON_RB3D_ZC_FLUSH_ALL 0x5
-# define RADEON_RB3D_ZC_BUSY (1 << 31)
+# define RADEON_RB3D_ZC_BUSY (1U << 31)
#define R300_ZB_ZCACHE_CTLSTAT 0x4f18
# define R300_ZC_FLUSH (1 << 0)
# define R300_ZC_FREE (1 << 1)
-# define R300_ZC_BUSY (1 << 31)
+# define R300_ZC_BUSY (1U << 31)
#define RADEON_RB3D_DSTCACHE_CTLSTAT 0x325c
# define RADEON_RB3D_DC_FLUSH (3 << 0)
# define RADEON_RB3D_DC_FREE (3 << 2)
# define RADEON_RB3D_DC_FLUSH_ALL 0xf
-# define RADEON_RB3D_DC_BUSY (1 << 31)
+# define RADEON_RB3D_DC_BUSY (1U << 31)
#define R300_RB3D_DSTCACHE_CTLSTAT 0x4e4c
# define R300_RB3D_DC_FLUSH (2 << 0)
# define R300_RB3D_DC_FREE (2 << 2)
@@ -949,7 +950,7 @@
# define RADEON_Z_COMPRESSION_ENABLE (1 << 28)
# define RADEON_FORCE_Z_DIRTY (1 << 29)
# define RADEON_Z_WRITE_ENABLE (1 << 30)
-# define RADEON_Z_DECOMPRESSION_ENABLE (1 << 31)
+# define RADEON_Z_DECOMPRESSION_ENABLE (1U << 31)
#define RADEON_RBBM_SOFT_RESET 0x00f0
# define RADEON_SOFT_RESET_CP (1 << 0)
# define RADEON_SOFT_RESET_HI (1 << 1)
@@ -1003,7 +1004,7 @@
# define RADEON_TIM_BUSY (1 << 25) /* not used on r300 */
# define RADEON_GA_BUSY (1 << 26)
# define RADEON_CBA2D_BUSY (1 << 27)
-# define RADEON_RBBM_ACTIVE (1 << 31)
+# define RADEON_RBBM_ACTIVE (1U << 31)
#define RADEON_RE_LINE_PATTERN 0x1cd0
#define RADEON_RE_MISC 0x26c4
#define RADEON_RE_TOP_LEFT 0x26c0
@@ -1117,7 +1118,7 @@
#define RADEON_CP_RB_CNTL 0x0704
# define RADEON_BUF_SWAP_32BIT (2 << 16)
# define RADEON_RB_NO_UPDATE (1 << 27)
-# define RADEON_RB_RPTR_WR_ENA (1 << 31)
+# define RADEON_RB_RPTR_WR_ENA (1U << 31)
#define RADEON_CP_RB_RPTR_ADDR 0x070c
#define RADEON_CP_RB_RPTR 0x0710
#define RADEON_CP_RB_WPTR 0x0714
@@ -1193,7 +1194,7 @@
#define RADEON_CP_PACKET1_REG0_MASK 0x000007ff
#define RADEON_CP_PACKET1_REG1_MASK 0x003ff800
-#define RADEON_VTX_Z_PRESENT (1 << 31)
+#define RADEON_VTX_Z_PRESENT (1U << 31)
#define RADEON_VTX_PKCOLOR_PRESENT (1 << 3)
#define RADEON_PRIM_TYPE_NONE (0 << 0)
@@ -1524,7 +1525,7 @@
#define R600_GRBM_STATUS 0x8010
# define R600_CMDFIFO_AVAIL_MASK 0x1f
# define R700_CMDFIFO_AVAIL_MASK 0xf
-# define R600_GUI_ACTIVE (1 << 31)
+# define R600_GUI_ACTIVE (1U << 31)
#define R600_GRBM_STATUS2 0x8014
#define R600_GRBM_SOFT_RESET 0x8020
# define R600_SOFT_RESET_CP (1 << 0)
@@ -1546,7 +1547,7 @@
# define R600_RB_BUFSZ(x) ((x) << 0)
# define R600_RB_BLKSZ(x) ((x) << 8)
# define R600_RB_NO_UPDATE (1 << 27)
-# define R600_RB_RPTR_WR_ENA (1 << 31)
+# define R600_RB_RPTR_WR_ENA (1U << 31)
#define R600_CP_RB_RPTR_WR 0xc108
#define R600_CP_RB_RPTR_ADDR 0xc10c
#define R600_CP_RB_RPTR_ADDR_HI 0xc110
@@ -1619,7 +1620,7 @@
#define R600_SX_MISC 0x28350
#define R600_DB_DEBUG 0x9830
-# define R600_PREZ_MUST_WAIT_FOR_POSTZ_DONE (1 << 31)
+# define R600_PREZ_MUST_WAIT_FOR_POSTZ_DONE (1U << 31)
#define R600_DB_WATERMARKS 0x9838
# define R600_DEPTH_FREE(x) ((x) << 0)
# define R600_DEPTH_FLUSH(x) ((x) << 5)
@@ -1679,7 +1680,7 @@
# define R600_SYNC_WALKER (1 << 25)
# define R600_SYNC_ALIGNER (1 << 26)
# define R600_BILINEAR_PRECISION_6_BIT (0 << 31)
-# define R600_BILINEAR_PRECISION_8_BIT (1 << 31)
+# define R600_BILINEAR_PRECISION_8_BIT (1U << 31)
#define R700_TCP_CNTL 0x9610
@@ -1753,7 +1754,7 @@
# define R600_PERSP_GRADIENT_ENA (1 << 28)
# define R600_LINEAR_GRADIENT_ENA (1 << 29)
# define R600_POSITION_SAMPLE (1 << 30)
-# define R600_BARYC_AT_SAMPLE_ENA (1 << 31)
+# define R600_BARYC_AT_SAMPLE_ENA (1U << 31)
#define R600_SPI_PS_IN_CONTROL_1 0x286d0
# define R600_GEN_INDEX_PIX (1 << 0)
# define R600_GEN_INDEX_PIX_ADDR(x) ((x) << 1)
Modified: trunk/sys/dev/drm/radeon_irq.c
===================================================================
--- trunk/sys/dev/drm/radeon_irq.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/radeon_irq.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* radeon_irq.c -- IRQ handling for radeon -*- linux-c -*- */
/*-
* Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/radeon_irq.c 197603 2009-09-28 22:37:07Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/radeon_mem.c
===================================================================
--- trunk/sys/dev/drm/radeon_mem.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/radeon_mem.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* radeon_mem.c -- Simple GART/fb memory manager for radeon -*- linux-c -*- */
/*-
* Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/radeon_mem.c 182080 2008-08-23 20:59:12Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/radeon_microcode.h
===================================================================
--- trunk/sys/dev/drm/radeon_microcode.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/radeon_microcode.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2007 Advanced Micro Devices, Inc.
* All Rights Reserved.
@@ -24,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/radeon_microcode.h 182080 2008-08-23 20:59:12Z rnoland $");
#ifndef RADEON_MICROCODE_H
#define RADEON_MICROCODE_H
Modified: trunk/sys/dev/drm/radeon_state.c
===================================================================
--- trunk/sys/dev/drm/radeon_state.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/radeon_state.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2000 VA Linux Systems, Inc., Fremont, California.
* All Rights Reserved.
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/radeon_state.c 228979 2011-12-30 02:07:50Z dim $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/savage_bci.c
===================================================================
--- trunk/sys/dev/drm/savage_bci.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/savage_bci.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* savage_bci.c -- BCI support for Savage
*
* Copyright 2004 Felix Kuehling
@@ -24,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/savage_bci.c 207066 2010-04-22 18:21:25Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/savage_drm.h"
#include "dev/drm/savage_drv.h"
Modified: trunk/sys/dev/drm/savage_drm.h
===================================================================
--- trunk/sys/dev/drm/savage_drm.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/savage_drm.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* savage_drm.h -- Public header for the savage driver
*
* Copyright 2004 Felix Kuehling
@@ -24,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/savage_drm.h 182080 2008-08-23 20:59:12Z rnoland $");
#ifndef __SAVAGE_DRM_H__
#define __SAVAGE_DRM_H__
Modified: trunk/sys/dev/drm/savage_drv.c
===================================================================
--- trunk/sys/dev/drm/savage_drv.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/savage_drv.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* savage_drv.c -- Savage DRI driver
*/
/*-
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/savage_drv.c 189563 2009-03-09 07:55:18Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/savage_drv.h
===================================================================
--- trunk/sys/dev/drm/savage_drv.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/savage_drv.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* savage_drv.h -- Private header for the savage driver */
/*-
* Copyright 2004 Felix Kuehling
@@ -24,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/savage_drv.h 182080 2008-08-23 20:59:12Z rnoland $");
#ifndef __SAVAGE_DRV_H__
#define __SAVAGE_DRV_H__
Modified: trunk/sys/dev/drm/savage_state.c
===================================================================
--- trunk/sys/dev/drm/savage_state.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/savage_state.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* savage_state.c -- State and drawing support for Savage
*
* Copyright 2004 Felix Kuehling
@@ -24,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/savage_state.c 182080 2008-08-23 20:59:12Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/savage_drm.h"
#include "dev/drm/savage_drv.h"
Modified: trunk/sys/dev/drm/sis_drm.h
===================================================================
--- trunk/sys/dev/drm/sis_drm.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/sis_drm.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* sis_drv.h -- Private header for sis driver -*- linux-c -*- */
/*-
* Copyright 2005 Eric Anholt
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/sis_drm.h 152909 2005-11-28 23:13:57Z anholt $");
#ifndef __SIS_DRM_H__
#define __SIS_DRM_H__
Modified: trunk/sys/dev/drm/sis_drv.c
===================================================================
--- trunk/sys/dev/drm/sis_drv.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/sis_drv.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* sis.c -- sis driver -*- linux-c -*-
*/
/*-
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/sis_drv.c 189563 2009-03-09 07:55:18Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/sis_drm.h"
Modified: trunk/sys/dev/drm/sis_drv.h
===================================================================
--- trunk/sys/dev/drm/sis_drv.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/sis_drv.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* sis_drv.h -- Private header for sis driver -*- linux-c -*- */
/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/sis_drv.h 182080 2008-08-23 20:59:12Z rnoland $");
#ifndef _SIS_DRV_H_
#define _SIS_DRV_H_
Modified: trunk/sys/dev/drm/sis_ds.c
===================================================================
--- trunk/sys/dev/drm/sis_ds.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/sis_ds.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* sis_ds.c -- Private header for Direct Rendering Manager -*- linux-c -*-
* Created: Mon Jan 4 10:05:05 1999 by sclin at sis.com.tw
*
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/sis_ds.c 157617 2006-04-09 20:45:45Z anholt $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/sis_ds.h
===================================================================
--- trunk/sys/dev/drm/sis_ds.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/sis_ds.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* sis_ds.h -- Private header for Direct Rendering Manager -*- linux-c -*-
* Created: Mon Jan 4 10:05:05 1999 by sclin at sis.com.tw
*/
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/sis_ds.h 157617 2006-04-09 20:45:45Z anholt $");
#ifndef __SIS_DS_H__
#define __SIS_DS_H__
Modified: trunk/sys/dev/drm/sis_mm.c
===================================================================
--- trunk/sys/dev/drm/sis_mm.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/sis_mm.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* sis_mm.c -- Private header for Direct Rendering Manager -*- linux-c -*-
* Created: Mon Jan 4 10:05:05 1999 by sclin at sis.com.tw
*
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/sis_mm.c 182080 2008-08-23 20:59:12Z rnoland $");
#if defined(__linux__) && defined(CONFIG_FB_SIS)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
Modified: trunk/sys/dev/drm/tdfx_drv.c
===================================================================
--- trunk/sys/dev/drm/tdfx_drv.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/tdfx_drv.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* tdfx_drv.c -- tdfx driver -*- linux-c -*-
* Created: Thu Oct 7 10:38:32 1999 by faith at precisioninsight.com
*/
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/tdfx_drv.c 189563 2009-03-09 07:55:18Z rnoland $");
#include "dev/drm/tdfx_drv.h"
#include "dev/drm/drmP.h"
Modified: trunk/sys/dev/drm/tdfx_drv.h
===================================================================
--- trunk/sys/dev/drm/tdfx_drv.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/tdfx_drv.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* tdfx.h -- 3dfx DRM template customization -*- linux-c -*-
* Created: Wed Feb 14 12:32:32 2001 by gareth at valinux.com
*/
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/tdfx_drv.h 152909 2005-11-28 23:13:57Z anholt $");
#ifndef __TDFX_H__
#define __TDFX_H__
Modified: trunk/sys/dev/drm/via_3d_reg.h
===================================================================
--- trunk/sys/dev/drm/via_3d_reg.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/via_3d_reg.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
@@ -23,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/via_3d_reg.h 203288 2010-01-31 14:30:39Z rnoland $");
#ifndef VIA_3D_REG_H
#define VIA_3D_REG_H
Modified: trunk/sys/dev/drm/via_dma.c
===================================================================
--- trunk/sys/dev/drm/via_dma.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/via_dma.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* via_dma.c -- DMA support for the VIA Unichrome/Pro
*
* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/via_dma.c 242825 2012-11-09 14:46:23Z rdivacky $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
@@ -481,7 +482,7 @@
VIA_WRITE(VIA_REG_TRANSET, (HC_ParaType_PreCR << 16));
VIA_WRITE(VIA_REG_TRANSPACE, pause_addr_hi);
VIA_WRITE(VIA_REG_TRANSPACE, pause_addr_lo);
- VIA_READ(VIA_REG_TRANSPACE);
+ (void)VIA_READ(VIA_REG_TRANSPACE);
}
}
return paused;
@@ -569,7 +570,7 @@
VIA_WRITE(VIA_REG_TRANSPACE, pause_addr_lo);
DRM_WRITEMEMORYBARRIER();
VIA_WRITE(VIA_REG_TRANSPACE, command | HC_HAGPCMNT_MASK);
- VIA_READ(VIA_REG_TRANSPACE);
+ (void)VIA_READ(VIA_REG_TRANSPACE);
dev_priv->dma_diff = 0;
Modified: trunk/sys/dev/drm/via_dmablit.c
===================================================================
--- trunk/sys/dev/drm/via_dmablit.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/via_dmablit.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* via_dmablit.c -- PCI DMA BitBlt support for the VIA Unichrome/Pro
*
* Copyright (C) 2005 Thomas Hellstrom, All Rights Reserved.
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/via_dmablit.c 242825 2012-11-09 14:46:23Z rdivacky $");
/*
* Unmaps the DMA mappings.
@@ -210,7 +211,7 @@
VIA_WRITE(VIA_PCI_DMA_DPR0 + engine*0x10, vsg->chain_start);
DRM_WRITEMEMORYBARRIER();
VIA_WRITE(VIA_PCI_DMA_CSR0 + engine*0x04, VIA_DMA_CSR_DE | VIA_DMA_CSR_TS);
- VIA_READ(VIA_PCI_DMA_CSR0 + engine*0x04);
+ (void)VIA_READ(VIA_PCI_DMA_CSR0 + engine*0x04);
}
Modified: trunk/sys/dev/drm/via_dmablit.h
===================================================================
--- trunk/sys/dev/drm/via_dmablit.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/via_dmablit.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* via_dmablit.h -- PCI DMA BitBlt support for the VIA Unichrome/Pro
*
* Copyright 2005 Thomas Hellstrom.
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/via_dmablit.h 203288 2010-01-31 14:30:39Z rnoland $");
#ifndef _VIA_DMABLIT_H
#define _VIA_DMABLIT_H
Modified: trunk/sys/dev/drm/via_drm.h
===================================================================
--- trunk/sys/dev/drm/via_drm.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/via_drm.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
@@ -23,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/via_drm.h 203288 2010-01-31 14:30:39Z rnoland $");
#ifndef _VIA_DRM_H_
#define _VIA_DRM_H_
Modified: trunk/sys/dev/drm/via_drv.c
===================================================================
--- trunk/sys/dev/drm/via_drv.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/via_drv.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* via_drv.c -- VIA unichrome driver -*- linux-c -*-
* Created: Fri Aug 12 2005 by anholt at FreeBSD.org
*/
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/via_drv.c 203288 2010-01-31 14:30:39Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
Modified: trunk/sys/dev/drm/via_drv.h
===================================================================
--- trunk/sys/dev/drm/via_drv.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/via_drv.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
@@ -23,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/via_drv.h 203288 2010-01-31 14:30:39Z rnoland $");
#ifndef _VIA_DRV_H_
#define _VIA_DRV_H_
Modified: trunk/sys/dev/drm/via_irq.c
===================================================================
--- trunk/sys/dev/drm/via_irq.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/via_irq.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* via_irq.c
*
* Copyright 2004 BEAM Ltd.
@@ -36,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/via_irq.c 261455 2014-02-04 03:36:42Z eadler $");
#include "dev/drm/drmP.h"
#include "dev/drm/drm.h"
@@ -46,7 +47,7 @@
#define VIA_REG_INTERRUPT 0x200
/* VIA_REG_INTERRUPT */
-#define VIA_IRQ_GLOBAL (1 << 31)
+#define VIA_IRQ_GLOBAL (1U << 31)
#define VIA_IRQ_VBLANK_ENABLE (1 << 19)
#define VIA_IRQ_VBLANK_PENDING (1 << 3)
#define VIA_IRQ_HQV0_ENABLE (1 << 11)
Modified: trunk/sys/dev/drm/via_map.c
===================================================================
--- trunk/sys/dev/drm/via_map.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/via_map.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
@@ -23,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/via_map.c 207066 2010-04-22 18:21:25Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/via_drm.h"
Modified: trunk/sys/dev/drm/via_mm.c
===================================================================
--- trunk/sys/dev/drm/via_mm.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/via_mm.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2006 Tungsten Graphics Inc., Bismarck, ND., USA.
* All rights reserved.
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/via_mm.c 207066 2010-04-22 18:21:25Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/via_drm.h"
Modified: trunk/sys/dev/drm/via_verifier.c
===================================================================
--- trunk/sys/dev/drm/via_verifier.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/via_verifier.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2004 The Unichrome Project. All Rights Reserved.
* Copyright 2005 Thomas Hellstrom. All Rights Reserved.
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/via_verifier.c 203288 2010-01-31 14:30:39Z rnoland $");
#include "dev/drm/via_3d_reg.h"
#include "dev/drm/drmP.h"
Modified: trunk/sys/dev/drm/via_verifier.h
===================================================================
--- trunk/sys/dev/drm/via_verifier.h 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/via_verifier.h 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2004 The Unichrome Project. All Rights Reserved.
*
@@ -24,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/via_verifier.h 203288 2010-01-31 14:30:39Z rnoland $");
#ifndef _VIA_VERIFIER_H_
#define _VIA_VERIFIER_H_
Modified: trunk/sys/dev/drm/via_video.c
===================================================================
--- trunk/sys/dev/drm/via_video.c 2018-05-28 00:14:41 UTC (rev 10118)
+++ trunk/sys/dev/drm/via_video.c 2018-05-28 00:14:50 UTC (rev 10119)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2005 Thomas Hellstrom. All Rights Reserved.
*
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/drm/via_video.c 207318 2010-04-28 10:33:41Z rnoland $");
#include "dev/drm/drmP.h"
#include "dev/drm/via_drm.h"
More information about the Midnightbsd-cvs
mailing list