diff options
| author | electronghost <electronghost> | 2002-07-02 21:34:25 +0000 |
|---|---|---|
| committer | electronghost <electronghost> | 2002-07-02 21:34:25 +0000 |
| commit | 70f598ca7ca4c25121de9d32b5f895f95d746763 (patch) | |
| tree | b73d67e76d20c2815deb3705265a644b5b052aa3 | |
| parent | e961ffa114fb5de441049aa8823b47a0ba2d4a23 (diff) | |
Fix lockup on faster machines when drawing in multiple clip rectangles (e.g. when part of a 3D window is obscured by another window)trunk-20020703
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drv.h | 1 | ||||
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_state.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drv.h b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drv.h index 31e598b27..457c183a0 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drv.h +++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drv.h @@ -477,6 +477,7 @@ extern int radeon_cp_flip( struct inode *inode, struct file *filp, # define RADEON_CNTL_HOSTDATA_BLT 0x00009400 # define RADEON_CNTL_PAINT_MULTI 0x00009A00 # define RADEON_CNTL_BITBLT_MULTI 0x00009B00 +# define RADEON_CNTL_SET_SCISSORS 0xC0001E00 #define RADEON_CP_PACKET_MASK 0xC0000000 #define RADEON_CP_PACKET_COUNT_MASK 0x3fff0000 diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_state.c b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_state.c index ff2fd66d0..a5fb0c3f7 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_state.c +++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_state.c @@ -48,10 +48,9 @@ static inline void radeon_emit_clip_rect( drm_radeon_private_t *dev_priv, DRM_DEBUG( " box: x1=%d y1=%d x2=%d y2=%d\n", box->x1, box->y1, box->x2, box->y2 ); - BEGIN_RING( 4 ); - OUT_RING( CP_PACKET0( RADEON_RE_TOP_LEFT, 0 ) ); + BEGIN_RING( 3 ); + OUT_RING( CP_PACKET3( RADEON_CNTL_SET_SCISSORS, 1 )); OUT_RING( (box->y1 << 16) | box->x1 ); - OUT_RING( CP_PACKET0( RADEON_RE_WIDTH_HEIGHT, 0 ) ); /* OUT_RING( ((box->y2 - 1) << 16) | (box->x2 - 1) );*/ OUT_RING( (box->y2 << 16) | box->x2 ); ADVANCE_RING(); |