diff options
Diffstat (limited to 'drivers/char/drm/drm_sarea.h')
-rw-r--r-- | drivers/char/drm/drm_sarea.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/char/drm/drm_sarea.h b/drivers/char/drm/drm_sarea.h index de782ed2f03a..e94297b751b8 100644 --- a/drivers/char/drm/drm_sarea.h +++ b/drivers/char/drm/drm_sarea.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * \file drm_sarea.h | 2 | * \file drm_sarea.h |
3 | * \brief SAREA definitions | 3 | * \brief SAREA definitions |
4 | * | 4 | * |
5 | * \author Michel Dänzer <michel@daenzer.net> | 5 | * \author Michel Dänzer <michel@daenzer.net> |
@@ -38,7 +38,7 @@ | |||
38 | #if defined(__alpha__) | 38 | #if defined(__alpha__) |
39 | #define SAREA_MAX 0x2000 | 39 | #define SAREA_MAX 0x2000 |
40 | #elif defined(__ia64__) | 40 | #elif defined(__ia64__) |
41 | #define SAREA_MAX 0x10000 /* 64kB */ | 41 | #define SAREA_MAX 0x10000 /* 64kB */ |
42 | #else | 42 | #else |
43 | /* Intel 830M driver needs at least 8k SAREA */ | 43 | /* Intel 830M driver needs at least 8k SAREA */ |
44 | #define SAREA_MAX 0x2000 | 44 | #define SAREA_MAX 0x2000 |
@@ -51,28 +51,28 @@ | |||
51 | 51 | ||
52 | /** SAREA drawable */ | 52 | /** SAREA drawable */ |
53 | typedef struct drm_sarea_drawable { | 53 | typedef struct drm_sarea_drawable { |
54 | unsigned int stamp; | 54 | unsigned int stamp; |
55 | unsigned int flags; | 55 | unsigned int flags; |
56 | } drm_sarea_drawable_t; | 56 | } drm_sarea_drawable_t; |
57 | 57 | ||
58 | /** SAREA frame */ | 58 | /** SAREA frame */ |
59 | typedef struct drm_sarea_frame { | 59 | typedef struct drm_sarea_frame { |
60 | unsigned int x; | 60 | unsigned int x; |
61 | unsigned int y; | 61 | unsigned int y; |
62 | unsigned int width; | 62 | unsigned int width; |
63 | unsigned int height; | 63 | unsigned int height; |
64 | unsigned int fullscreen; | 64 | unsigned int fullscreen; |
65 | } drm_sarea_frame_t; | 65 | } drm_sarea_frame_t; |
66 | 66 | ||
67 | /** SAREA */ | 67 | /** SAREA */ |
68 | typedef struct drm_sarea { | 68 | typedef struct drm_sarea { |
69 | /** first thing is always the DRM locking structure */ | 69 | /** first thing is always the DRM locking structure */ |
70 | drm_hw_lock_t lock; | 70 | drm_hw_lock_t lock; |
71 | /** \todo Use readers/writer lock for drm_sarea::drawable_lock */ | 71 | /** \todo Use readers/writer lock for drm_sarea::drawable_lock */ |
72 | drm_hw_lock_t drawable_lock; | 72 | drm_hw_lock_t drawable_lock; |
73 | drm_sarea_drawable_t drawableTable[SAREA_MAX_DRAWABLES]; /**< drawables */ | 73 | drm_sarea_drawable_t drawableTable[SAREA_MAX_DRAWABLES]; /**< drawables */ |
74 | drm_sarea_frame_t frame; /**< frame */ | 74 | drm_sarea_frame_t frame; /**< frame */ |
75 | drm_context_t dummy_context; | 75 | drm_context_t dummy_context; |
76 | } drm_sarea_t; | 76 | } drm_sarea_t; |
77 | 77 | ||
78 | #endif /* _DRM_SAREA_H_ */ | 78 | #endif /* _DRM_SAREA_H_ */ |