aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChristian König <deathsimple@vodafone.de>2012-07-07 07:10:39 -0400
committerChristian König <deathsimple@vodafone.de>2012-07-17 04:32:21 -0400
commit31be6183d53e89ff95ec7cb70aac67fa5588e0df (patch)
treed0d680a3deb610d41b70c227cf541359052a1986 /drivers
parentbf66625e02ac8e4535627394bcfb237bbf8a157f (diff)
drm/radeon: fix fence init after resume
Start with last signaled fence number instead of last emitted one. Signed-off-by: Christian König <deathsimple@vodafone.de> Reviewed-by: Jerome Glisse <jglisse@redhat.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/radeon_fence.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index a194a142f898..76c5b22bfd22 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -578,7 +578,7 @@ int radeon_fence_driver_start_ring(struct radeon_device *rdev, int ring)
578 } 578 }
579 rdev->fence_drv[ring].cpu_addr = &rdev->wb.wb[index/4]; 579 rdev->fence_drv[ring].cpu_addr = &rdev->wb.wb[index/4];
580 rdev->fence_drv[ring].gpu_addr = rdev->wb.gpu_addr + index; 580 rdev->fence_drv[ring].gpu_addr = rdev->wb.gpu_addr + index;
581 radeon_fence_write(rdev, rdev->fence_drv[ring].sync_seq[ring], ring); 581 radeon_fence_write(rdev, atomic64_read(&rdev->fence_drv[ring].last_seq), ring);
582 rdev->fence_drv[ring].initialized = true; 582 rdev->fence_drv[ring].initialized = true;
583 dev_info(rdev->dev, "fence driver on ring %d use gpu addr 0x%016llx and cpu addr 0x%p\n", 583 dev_info(rdev->dev, "fence driver on ring %d use gpu addr 0x%016llx and cpu addr 0x%p\n",
584 ring, rdev->fence_drv[ring].gpu_addr, rdev->fence_drv[ring].cpu_addr); 584 ring, rdev->fence_drv[ring].gpu_addr, rdev->fence_drv[ring].cpu_addr);