diff options
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_cp.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index 8a8a82a2c170..4a56e7d626a6 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c | |||
@@ -657,17 +657,10 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev, | |||
657 | } else | 657 | } else |
658 | #endif | 658 | #endif |
659 | { | 659 | { |
660 | struct drm_sg_mem *entry = dev->sg; | 660 | RADEON_WRITE(RADEON_CP_RB_RPTR_ADDR, |
661 | unsigned long tmp_ofs, page_ofs; | 661 | dev_priv->ring_rptr->offset |
662 | 662 | - ((unsigned long) dev->sg->virtual) | |
663 | tmp_ofs = dev_priv->ring_rptr->offset - | 663 | + dev_priv->gart_vm_start); |
664 | (unsigned long)dev->sg->virtual; | ||
665 | page_ofs = tmp_ofs >> PAGE_SHIFT; | ||
666 | |||
667 | RADEON_WRITE(RADEON_CP_RB_RPTR_ADDR, entry->busaddr[page_ofs]); | ||
668 | DRM_DEBUG("ring rptr: offset=0x%08lx handle=0x%08lx\n", | ||
669 | (unsigned long)entry->busaddr[page_ofs], | ||
670 | entry->handle + tmp_ofs); | ||
671 | } | 664 | } |
672 | 665 | ||
673 | /* Set ring buffer size */ | 666 | /* Set ring buffer size */ |