Wed Jul 24 02:59:29 2013 UTC ()
intel_ringbuffer.h needs <asm/bug.h>.


(riastradh)
diff -r1.1.1.1.2.2 -r1.1.1.1.2.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h
cvs diff -r1.1.1.1.2.2 -r1.1.1.1.2.3 src/sys/external/bsd/drm2/dist/drm/i915/Attic/intel_ringbuffer.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/dist/drm/i915/Attic/intel_ringbuffer.h 2013/07/23 21:28:22 1.1.1.1.2.2
+++ src/sys/external/bsd/drm2/dist/drm/i915/Attic/intel_ringbuffer.h 2013/07/24 02:59:29 1.1.1.1.2.3
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1#ifndef _INTEL_RINGBUFFER_H_ 1#ifndef _INTEL_RINGBUFFER_H_
2#define _INTEL_RINGBUFFER_H_ 2#define _INTEL_RINGBUFFER_H_
3 3
 4#include <asm/bug.h>
 5
4/* 6/*
5 * Gen2 BSpec "1. Programming Environment" / 1.4.4.6 "Ring Buffer Use" 7 * Gen2 BSpec "1. Programming Environment" / 1.4.4.6 "Ring Buffer Use"
6 * Gen3 BSpec "vol1c Memory Interface Functions" / 2.3.4.5 "Ring Buffer Use" 8 * Gen3 BSpec "vol1c Memory Interface Functions" / 2.3.4.5 "Ring Buffer Use"
7 * Gen4+ BSpec "vol1c Memory Interface and Command Stream" / 5.3.4.5 "Ring Buffer Use" 9 * Gen4+ BSpec "vol1c Memory Interface and Command Stream" / 5.3.4.5 "Ring Buffer Use"
8 * 10 *
9 * "If the Ring Buffer Head Pointer and the Tail Pointer are on the same 11 * "If the Ring Buffer Head Pointer and the Tail Pointer are on the same
10 * cacheline, the Head Pointer must not be greater than the Tail 12 * cacheline, the Head Pointer must not be greater than the Tail
11 * Pointer." 13 * Pointer."
12 */ 14 */
13#define I915_RING_FREE_SPACE 64 15#define I915_RING_FREE_SPACE 64
14 16
15struct intel_hw_status_page { 17struct intel_hw_status_page {
16 u32 *page_addr; 18 u32 *page_addr;