diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-02-26 10:15:24 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-13 14:24:16 +1000 |
| commit | a7d13ad0e2c1b0572492fd53ca1a090794e2f8e2 (patch) | |
| tree | 02bc31289c61385a02ea173226f23eaf05ed09e6 /drivers | |
| parent | eb1d91954ededc00ddcfb51e2626f114ff351524 (diff) | |
| download | kernel_samsung_aries-a7d13ad0e2c1b0572492fd53ca1a090794e2f8e2.zip kernel_samsung_aries-a7d13ad0e2c1b0572492fd53ca1a090794e2f8e2.tar.gz kernel_samsung_aries-a7d13ad0e2c1b0572492fd53ca1a090794e2f8e2.tar.bz2 | |
drm/r600: fix rptr address along lines of previous fixes to radeon.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_cp.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c index 54ea867..37249b2 100644 --- a/drivers/gpu/drm/radeon/r600_cp.c +++ b/drivers/gpu/drm/radeon/r600_cp.c @@ -1689,18 +1689,12 @@ static void r600_cp_init_ring_buffer(struct drm_device *dev, } else #endif { - struct drm_sg_mem *entry = dev->sg; - unsigned long tmp_ofs, page_ofs; - - tmp_ofs = dev_priv->ring_rptr->offset - - (unsigned long)dev->sg->virtual; - page_ofs = tmp_ofs >> PAGE_SHIFT; + RADEON_WRITE(R600_CP_RB_RPTR_ADDR, + dev_priv->ring_rptr->offset + - ((unsigned long) dev->sg->virtual) + + dev_priv->gart_vm_start); - RADEON_WRITE(R600_CP_RB_RPTR_ADDR, entry->busaddr[page_ofs] >> 8); RADEON_WRITE(R600_CP_RB_RPTR_ADDR_HI, 0); - DRM_DEBUG("ring rptr: offset=0x%08lx handle=0x%08lx\n", - (unsigned long)entry->busaddr[page_ofs], - entry->handle + tmp_ofs); } #ifdef __BIG_ENDIAN |