aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/via_drm.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-08-19 03:40:50 -0400
committerDave Airlie <airlied@linux.ie>2006-09-21 15:32:33 -0400
commitd40c8533a5b8ca1887f81ae1c81136f3c40a8488 (patch)
tree53790b7313dbab36de615cf369949438cfb06010 /drivers/char/drm/via_drm.h
parent1f4eccfdb2a5f8b2751aea8cf2d6b00401c156e0 (diff)
drm: realign via driver with drm git tree
This just realigns some code/whitespace between the kernel and main tree Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/via_drm.h')
-rw-r--r--drivers/char/drm/via_drm.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/char/drm/via_drm.h b/drivers/char/drm/via_drm.h
index 47f0b5b26379..e4ee97d7156f 100644
--- a/drivers/char/drm/via_drm.h
+++ b/drivers/char/drm/via_drm.h
@@ -250,6 +250,12 @@ typedef struct drm_via_blitsync {
250 unsigned engine; 250 unsigned engine;
251} drm_via_blitsync_t; 251} drm_via_blitsync_t;
252 252
253/* - * Below,"flags" is currently unused but will be used for possible future
254 * extensions like kernel space bounce buffers for bad alignments and
255 * blit engine busy-wait polling for better latency in the absence of
256 * interrupts.
257 */
258
253typedef struct drm_via_dmablit { 259typedef struct drm_via_dmablit {
254 uint32_t num_lines; 260 uint32_t num_lines;
255 uint32_t line_length; 261 uint32_t line_length;
@@ -260,7 +266,7 @@ typedef struct drm_via_dmablit {
260 unsigned char *mem_addr; 266 unsigned char *mem_addr;
261 uint32_t mem_stride; 267 uint32_t mem_stride;
262 268
263 int bounce_buffer; 269 uint32_t flags;
264 int to_fb; 270 int to_fb;
265 271
266 drm_via_blitsync_t sync; 272 drm_via_blitsync_t sync;