Module Name: src
Committed By: dyoung
Date: Fri Jan 21 21:57:17 UTC 2011
Modified Files:
src/sys/external/bsd/drm/dist/shared-core: i915_drv.h
Log Message:
unifdef -U__linux__ -U__FreeBSD__. No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/sys/external/bsd/drm/dist/shared-core/i915_drv.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm/dist/shared-core/i915_drv.h
diff -u src/sys/external/bsd/drm/dist/shared-core/i915_drv.h:1.1.1.4 src/sys/external/bsd/drm/dist/shared-core/i915_drv.h:1.2
--- src/sys/external/bsd/drm/dist/shared-core/i915_drv.h:1.1.1.4 Fri Jun 19 03:22:24 2009
+++ src/sys/external/bsd/drm/dist/shared-core/i915_drv.h Fri Jan 21 21:57:16 2011
@@ -232,9 +232,6 @@
u8 saveDACDATA[256*3]; /* 256 3-byte colors */
u8 saveCR[37];
struct {
-#ifdef __linux__
- struct drm_mm gtt_space;
-#endif
/**
* List of objects currently involved in rendering from the
* ringbuffer.
@@ -267,16 +264,6 @@
* outstanding.
*/
struct list_head request_list;
-#ifdef __linux__
- /**
- * We leave the user IRQ off as much as possible,
- * but this means that requests will finish and never
- * be retired once the system goes idle. Set a timer to
- * fire periodically while the ring is running. When it
- * fires, go retire requests.
- */
- struct delayed_work retire_work;
-#endif
uint32_t next_gem_seqno;
/**
@@ -556,10 +543,6 @@
LOCK_TEST_WITH_RETURN(dev, file_priv); \
} while (0)
-#if defined(__FreeBSD__)
-typedef boolean_t bool;
-#endif
-
#define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, (reg))
#define I915_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, (reg), (val))
#define I915_READ16(reg) DRM_READ16(dev_priv->mmio_map, (reg))
