diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-07-03 22:40:01 -0700 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2002-07-03 22:40:01 -0700 |
| commit | af8b48107f8eb52d56ea68e75620171e0e88a341 (patch) | |
| tree | d48153543f64b5bd79d3eea477219ff4c2fda19a | |
| parent | d3b1d20734ee5b26d9a3f4c5f919ff7cfe2b58a4 (diff) | |
Radeon DRI merge
| -rw-r--r-- | drivers/char/drm/radeon_drv.h | 1 | ||||
| -rw-r--r-- | drivers/char/drm/radeon_state.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h index 31e598b27c58..457c183a0601 100644 --- a/drivers/char/drm/radeon_drv.h +++ b/drivers/char/drm/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/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c index 3a73c5e563ac..db7bc9109e40 100644 --- a/drivers/char/drm/radeon_state.c +++ b/drivers/char/drm/radeon_state.c @@ -48,12 +48,10 @@ 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 ); + OUT_RING( ((box->y2 - 1) << 16) | (box->x2 - 1) ); ADVANCE_RING(); } |