diff options
Diffstat (limited to 'drivers/char/drm/drmP.h')
-rw-r--r-- | drivers/char/drm/drmP.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 63ee0538813f..83d7d14a6153 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h | |||
@@ -294,7 +294,7 @@ typedef struct drm_vma_entry { | |||
294 | /** | 294 | /** |
295 | * DMA buffer. | 295 | * DMA buffer. |
296 | */ | 296 | */ |
297 | typedef struct drm_buf { | 297 | struct drm_buf { |
298 | int idx; /**< Index into master buflist */ | 298 | int idx; /**< Index into master buflist */ |
299 | int total; /**< Buffer size */ | 299 | int total; /**< Buffer size */ |
300 | int order; /**< log-base-2(total) */ | 300 | int order; /**< log-base-2(total) */ |
@@ -320,15 +320,15 @@ typedef struct drm_buf { | |||
320 | 320 | ||
321 | int dev_priv_size; /**< Size of buffer private storage */ | 321 | int dev_priv_size; /**< Size of buffer private storage */ |
322 | void *dev_private; /**< Per-buffer private storage */ | 322 | void *dev_private; /**< Per-buffer private storage */ |
323 | } drm_buf_t; | 323 | }; |
324 | 324 | ||
325 | /** bufs is one longer than it has to be */ | 325 | /** bufs is one longer than it has to be */ |
326 | typedef struct drm_waitlist { | 326 | typedef struct drm_waitlist { |
327 | int count; /**< Number of possible buffers */ | 327 | int count; /**< Number of possible buffers */ |
328 | drm_buf_t **bufs; /**< List of pointers to buffers */ | 328 | struct drm_buf **bufs; /**< List of pointers to buffers */ |
329 | drm_buf_t **rp; /**< Read pointer */ | 329 | struct drm_buf **rp; /**< Read pointer */ |
330 | drm_buf_t **wp; /**< Write pointer */ | 330 | struct drm_buf **wp; /**< Write pointer */ |
331 | drm_buf_t **end; /**< End pointer */ | 331 | struct drm_buf **end; /**< End pointer */ |
332 | spinlock_t read_lock; | 332 | spinlock_t read_lock; |
333 | spinlock_t write_lock; | 333 | spinlock_t write_lock; |
334 | } drm_waitlist_t; | 334 | } drm_waitlist_t; |
@@ -336,7 +336,7 @@ typedef struct drm_waitlist { | |||
336 | typedef struct drm_freelist { | 336 | typedef struct drm_freelist { |
337 | int initialized; /**< Freelist in use */ | 337 | int initialized; /**< Freelist in use */ |
338 | atomic_t count; /**< Number of free buffers */ | 338 | atomic_t count; /**< Number of free buffers */ |
339 | drm_buf_t *next; /**< End pointer */ | 339 | struct drm_buf *next; /**< End pointer */ |
340 | 340 | ||
341 | wait_queue_head_t waiting; /**< Processes waiting on free bufs */ | 341 | wait_queue_head_t waiting; /**< Processes waiting on free bufs */ |
342 | int low_mark; /**< Low water mark */ | 342 | int low_mark; /**< Low water mark */ |
@@ -357,7 +357,7 @@ typedef struct drm_dma_handle { | |||
357 | typedef struct drm_buf_entry { | 357 | typedef struct drm_buf_entry { |
358 | int buf_size; /**< size */ | 358 | int buf_size; /**< size */ |
359 | int buf_count; /**< number of buffers */ | 359 | int buf_count; /**< number of buffers */ |
360 | drm_buf_t *buflist; /**< buffer list */ | 360 | struct drm_buf *buflist; /**< buffer list */ |
361 | int seg_count; | 361 | int seg_count; |
362 | int page_order; | 362 | int page_order; |
363 | drm_dma_handle_t **seglist; | 363 | drm_dma_handle_t **seglist; |
@@ -421,7 +421,7 @@ typedef struct drm_device_dma { | |||
421 | 421 | ||
422 | drm_buf_entry_t bufs[DRM_MAX_ORDER + 1]; /**< buffers, grouped by their size order */ | 422 | drm_buf_entry_t bufs[DRM_MAX_ORDER + 1]; /**< buffers, grouped by their size order */ |
423 | int buf_count; /**< total number of buffers */ | 423 | int buf_count; /**< total number of buffers */ |
424 | drm_buf_t **buflist; /**< Vector of pointers into drm_device_dma::bufs */ | 424 | struct drm_buf **buflist; /**< Vector of pointers into drm_device_dma::bufs */ |
425 | int seg_count; | 425 | int seg_count; |
426 | int page_count; /**< number of pages */ | 426 | int page_count; /**< number of pages */ |
427 | unsigned long *pagelist; /**< page list */ | 427 | unsigned long *pagelist; /**< page list */ |
@@ -964,7 +964,7 @@ extern unsigned long drm_get_resource_len(struct drm_device *dev, | |||
964 | /* DMA support (drm_dma.h) */ | 964 | /* DMA support (drm_dma.h) */ |
965 | extern int drm_dma_setup(struct drm_device *dev); | 965 | extern int drm_dma_setup(struct drm_device *dev); |
966 | extern void drm_dma_takedown(struct drm_device *dev); | 966 | extern void drm_dma_takedown(struct drm_device *dev); |
967 | extern void drm_free_buffer(struct drm_device *dev, drm_buf_t * buf); | 967 | extern void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf); |
968 | extern void drm_core_reclaim_buffers(struct drm_device *dev, struct file *filp); | 968 | extern void drm_core_reclaim_buffers(struct drm_device *dev, struct file *filp); |
969 | 969 | ||
970 | /* IRQ support (drm_irq.h) */ | 970 | /* IRQ support (drm_irq.h) */ |