geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i830 & mga contain minor changes from 4.2.0 for mesa 4.0 bsd merge

main
Alan Hourihane 2002-03-06 19:31:39 +00:00
parent 46cacdca85
commit 5e734a7ac8
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsd/i830/i830_dma.c
View File

@ -91,7 +91,7 @@ do { \
*(volatile unsigned int *)(virt + outring) = n; \ *(volatile unsigned int *)(virt + outring) = n; \
outring += 4; \ outring += 4; \
outring &= ringmask; \ outring &= ringmask; \
} while (0); } while (0)
static inline void i830_print_status_page(drm_device_t *dev) static inline void i830_print_status_page(drm_device_t *dev)
{ {

8
bsd/mga/mga_state.c
View File

@ -163,6 +163,9 @@ static __inline__ void mga_g400_emit_tex0( drm_mga_private_t *dev_priv )
drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[0]; drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[0];
DMA_LOCALS; DMA_LOCALS;
/* printk("mga_g400_emit_tex0 %x %x %x\n", tex->texorg, */
/* tex->texctl, tex->texctl2); */
BEGIN_DMA( 6 ); BEGIN_DMA( 6 );
DMA_BLOCK( MGA_TEXCTL2, tex->texctl2 | MGA_G400_TC2_MAGIC, DMA_BLOCK( MGA_TEXCTL2, tex->texctl2 | MGA_G400_TC2_MAGIC,
@ -204,6 +207,9 @@ static __inline__ void mga_g400_emit_tex1( drm_mga_private_t *dev_priv )
drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[1]; drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[1];
DMA_LOCALS; DMA_LOCALS;
/* printk("mga_g400_emit_tex1 %x %x %x\n", tex->texorg, */
/* tex->texctl, tex->texctl2); */
BEGIN_DMA( 5 ); BEGIN_DMA( 5 );
DMA_BLOCK( MGA_TEXCTL2, (tex->texctl2 | DMA_BLOCK( MGA_TEXCTL2, (tex->texctl2 |
@ -272,6 +278,8 @@ static __inline__ void mga_g400_emit_pipe( drm_mga_private_t *dev_priv )
unsigned int pipe = sarea_priv->warp_pipe; unsigned int pipe = sarea_priv->warp_pipe;
DMA_LOCALS; DMA_LOCALS;
/* printk("mga_g400_emit_pipe %x\n", pipe); */
BEGIN_DMA( 10 ); BEGIN_DMA( 10 );
DMA_BLOCK( MGA_WIADDR2, MGA_WMODE_SUSPEND, DMA_BLOCK( MGA_WIADDR2, MGA_WMODE_SUSPEND,