diff options
| author | Kevin E Martin <kem@kem.org> | 2000-05-18 06:14:27 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2000-05-18 06:14:27 +0000 |
| commit | 99efe3c247f726909f0a9a43e59835ebfc2d121f (patch) | |
| tree | 6b98cfe82f03a049971956e9b9d738f74a7b453a /linux-core/drmP.h | |
| parent | e79f86b2540527fd5261aae9e251d582282914dc (diff) | |
Merged ati-4-0-1ati-4-0-1-20000518-merge
Diffstat (limited to 'linux-core/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index f8e78eab..43670e28 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -1,8 +1,7 @@ /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com - * Revised: Sun Feb 13 23:34:30 2000 by kevin@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -228,8 +227,8 @@ typedef struct drm_magic_entry { } drm_magic_entry_t; typedef struct drm_magic_head { - struct drm_magic_entry *head; - struct drm_magic_entry *tail; + struct drm_magic_entry *head; + struct drm_magic_entry *tail; } drm_magic_head_t; typedef struct drm_vma_entry { @@ -262,16 +261,15 @@ typedef struct drm_buf { DRM_LIST_RECLAIM = 5 } list; /* Which list we're on */ - - void *dev_private; - int dev_priv_size; - #if DRM_DMA_HISTOGRAM cycles_t time_queued; /* Queued to kernel DMA queue */ cycles_t time_dispatched; /* Dispatched to hardware */ cycles_t time_completed; /* Completed by hardware */ cycles_t time_freed; /* Back on freelist */ #endif + + int dev_priv_size; /* Size of buffer private stoarge */ + void *dev_private; /* Per-buffer private storage */ } drm_buf_t; #if DRM_DMA_HISTOGRAM |