lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/r600: fix rptr address along lines of previous fixes to radeon.

Browse Source 
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2009-02-26 10:15:24 +10:00
parent eb1d91954e
commit a7d13ad0e2
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/radeon/r600_cp.c
View File

@@ -1689,18 +1689,12 @@ static void r600_cp_init_ring_buffer(struct drm_device *dev,
} else } else
#endif #endif
{ {
struct drm_sg_mem *entry = dev->sg; RADEON_WRITE(R600_CP_RB_RPTR_ADDR,
unsigned long tmp_ofs, page_ofs; dev_priv->ring_rptr->offset
- ((unsigned long) dev->sg->virtual)
+ dev_priv->gart_vm_start);
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, entry->busaddr[page_ofs] >> 8);
RADEON_WRITE(R600_CP_RB_RPTR_ADDR_HI, 0); 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 #ifdef __BIG_ENDIAN