diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-10-20 14:02:39 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-10-20 14:02:39 -0700 |
| commit | 9c9c216b1b2656b99846e9e899e108df36f4bedb (patch) | |
| tree | 6e8327d1dc9eb3fed9012e8694041e065c771692 /src/i830_common.h | |
| parent | 493fa4a86f6e9460305896076784a3b57a296ed8 (diff) | |
| parent | 55cb65c6fdcf932d09e97abfa5374ee574676798 (diff) | |
Merge branch 'master' into xf86-video-intel-2.5-branch
Diffstat (limited to 'src/i830_common.h')
| -rw-r--r-- | src/i830_common.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/i830_common.h b/src/i830_common.h index f3a7ea01..eeb2ed76 100644 --- a/src/i830_common.h +++ b/src/i830_common.h @@ -124,14 +124,14 @@ typedef struct { unsigned int rotated_tiled; unsigned int rotated2_tiled; - int planeA_x; - int planeA_y; - int planeA_w; - int planeA_h; - int planeB_x; - int planeB_y; - int planeB_w; - int planeB_h; + int pipeA_x; + int pipeA_y; + int pipeA_w; + int pipeA_h; + int pipeB_x; + int pipeB_y; + int pipeB_w; + int pipeB_h; /* Triple buffering */ drm_handle_t third_handle; |