summaryrefslogtreecommitdiff
path: root/src/i830_common.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2008-10-18 19:37:09 -0700
committerKeith Packard <keithp@keithp.com>2008-10-19 15:23:52 -0700
commit28bb056f8cd326770590157412835318863b4134 (patch)
tree4c3e28bd6b8aec33a867bbf3647be11e8e396ad3 /src/i830_common.h
parent546e2aca5b8b5d9f486d119ea2872ccd2b056054 (diff)
Use pipes, not planes for sarea geometry data
Vblank in the kernel is far simpler if it deals with pipes instead of planes, so we're changing both user and kernel side. This is the user mode side. This fixes both i830_crtc_dpms and i830PipeSetBase, the two functions which copy geometry from the crtc to the sarea. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/i830_common.h')
-rw-r--r--src/i830_common.h16
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;