diff options
| author | Michel Daenzer <michel@daenzer.net> | 2002-10-29 13:49:26 +0000 |
|---|---|---|
| committer | Michel Daenzer <michel@daenzer.net> | 2002-10-29 13:49:26 +0000 |
| commit | 5e1b8ed88ae8fb8b697515140f7a00d022ac2db0 (patch) | |
| tree | 95553095ecb8905672e40c7bc153e73aa07e4478 /shared/radeon_drv.h | |
| parent | 10900dab7caa593a54d76e5f6abdc3df9bdd0a04 (diff) | |
preserve CRTC{,2}_OFFSET_CNTL in 2D driver to avoid bad effects whennv-0-0-1-branch
pageflipping after a mode switch
take current page into account in AdjustFrame(); writing the CRTC offset
via the CP was probably a bad idea as this can happen asynchronously,
reverted
take frame offset into account when flipping pages
handle CRTC2 as well for pageflipping (untested)
preserve GEN_INT_CNTL on mode switches to prevent interrupts from getting
disabled
Diffstat (limited to 'shared/radeon_drv.h')
| -rw-r--r-- | shared/radeon_drv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared/radeon_drv.h b/shared/radeon_drv.h index 81615a781..65f3c9265 100644 --- a/shared/radeon_drv.h +++ b/shared/radeon_drv.h @@ -109,8 +109,6 @@ typedef struct drm_radeon_private { int do_boxes; int page_flipping; int current_page; - u32 crtc_offset; - u32 crtc_offset_cntl; u32 color_fmt; unsigned int front_offset; @@ -230,6 +228,8 @@ extern int radeon_emit_irq(drm_device_t *dev); #define RADEON_CRTC_OFFSET_CNTL 0x0228 # define RADEON_CRTC_TILE_EN (1 << 15) # define RADEON_CRTC_OFFSET_FLIP_CNTL (1 << 16) +#define RADEON_CRTC2_OFFSET 0x0324 +#define RADEON_CRTC2_OFFSET_CNTL 0x0328 #define RADEON_RB3D_COLORPITCH 0x1c48 |