fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-05-05 07:48:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Move the initialization of the scratch register memory update to before

Browse source 
the scratch pad registers are initialized so that both the registers
    and their in-memory shadows are properly initialized (fixes lockup when
    first client is run)
This commit is contained in:
Kevin E Martin 2001-01-03 06:05:24 +00:00
parent f574c3ec77
commit 976bb1915b
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
linux/radeon_cp.c
View file

@ -600,15 +600,6 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev )
/* Set ring buffer size */
RADEON_WRITE( RADEON_CP_RB_CNTL, dev_priv->ring.size_l2qw );
/* Initialize the scratch register pointer.
* GH: We really want to do this, but it seems to be causing
* some instability. I'll look into this later on...
* GH: I'll remove the magic numbers when it works.
*/
RADEON_WRITE( RADEON_SCRATCH_ADDR, (dev_priv->ring_rptr->offset +
RADEON_SCRATCH_REG_OFFSET) );
RADEON_WRITE( RADEON_SCRATCH_UMSK, 0x7 );
radeon_do_wait_for_idle( dev_priv );
/* Turn off PCI GART */
@ -745,6 +736,15 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
dev_priv->ring.tail_mask =
(dev_priv->ring.size / sizeof(u32)) - 1;
/* Initialize the scratch register pointer.
* GH: We really want to do this, but it seems to be causing
* some instability. I'll look into this later on...
* GH: I'll remove the magic numbers when it works.
*/
RADEON_WRITE( RADEON_SCRATCH_ADDR, (dev_priv->ring_rptr->offset +
RADEON_SCRATCH_REG_OFFSET) );
RADEON_WRITE( RADEON_SCRATCH_UMSK, 0x7 );
dev_priv->scratch = ((__volatile__ u32 *)
dev_priv->ring_rptr->handle +
(RADEON_SCRATCH_REG_OFFSET / sizeof(u32)));