diff options
| author | Jon Smirl <jonsmirl@yahoo.com> | 2004-03-12 21:22:52 +0000 |
|---|---|---|
| committer | Jon Smirl <jonsmirl@yahoo.com> | 2004-03-12 21:22:52 +0000 |
| commit | 24115068e465cf0d788d870a3c1c24bb68a9cb14 (patch) | |
| tree | 419ce4e7f37af3a1f6ce5e18f7cc266006b9036d /shared-core/drm_sarea.h | |
| parent | f47ed991432672b7353e73b9d3194f255b957bee (diff) | |
Fixes need to clean up the mess I made with the mesa merge. This code
allows the mesa drivers to use a single definition of the DRM
sarea/IOCTLS located in the drm driver directory. Adjustments were made
to the 2D drivers to not include these changes. Changes to the mesa
copy of DRM were copied to the DRI copy. XFree86 bug: Reported by:
Submitted by: Reviewed by: Obtained from:
Diffstat (limited to 'shared-core/drm_sarea.h')
| -rw-r--r-- | shared-core/drm_sarea.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/shared-core/drm_sarea.h b/shared-core/drm_sarea.h index dd3f617a..40f7d5f1 100644 --- a/shared-core/drm_sarea.h +++ b/shared-core/drm_sarea.h @@ -2,7 +2,7 @@ * \file drm_sarea.h * \brief SAREA definitions * - * \author Michel Dänzer <michel@daenzer.net> + * \author Michel D�zer <michel@daenzer.net> */ /* @@ -32,9 +32,23 @@ #ifndef _DRM_SAREA_H_ #define _DRM_SAREA_H_ +#include "drm.h" + +/* SAREA area needs to be at least a page */ +#if defined(__alpha__) +#define SAREA_MAX 0x2000 +#elif defined(__ia64__) +#define SAREA_MAX 0x10000 /* 64kB */ +#else +/* Intel 830M driver needs at least 8k SAREA */ +#define SAREA_MAX 0x2000 +#endif + /** Maximum number of drawables in the SAREA */ #define SAREA_MAX_DRAWABLES 256 +#define SAREA_DRAWABLE_CLAIMED_ENTRY 0x80000000 + /** SAREA drawable */ typedef struct drm_sarea_drawable { unsigned int stamp; |