Rev 2997 | Rev 3192 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2997 | Rev 3031 | ||
---|---|---|---|
Line 349... | Line 349... | ||
349 | dev_warn(rdev->dev, "GPU lockup (waiting for 0x%016llx last fence id 0x%016llx)\n", |
349 | dev_warn(rdev->dev, "GPU lockup (waiting for 0x%016llx last fence id 0x%016llx)\n", |
350 | target_seq, seq); |
350 | target_seq, seq); |
Line 351... | Line 351... | ||
351 | 351 | ||
352 | /* change last activity so nobody else think there is a lockup */ |
352 | /* change last activity so nobody else think there is a lockup */ |
353 | for (i = 0; i < RADEON_NUM_RINGS; ++i) { |
353 | for (i = 0; i < RADEON_NUM_RINGS; ++i) { |
354 | rdev->fence_drv[i].last_activity = jiffies; |
354 | rdev->fence_drv[i].last_activity = GetTimerTicks(); |
Line 355... | Line 355... | ||
355 | } |
355 | } |
356 | 356 | ||
357 | /* mark the ring as not ready any more */ |
357 | /* mark the ring as not ready any more */ |
Line 809... | Line 809... | ||
809 | rdev->fence_drv[ring].cpu_addr = NULL; |
809 | rdev->fence_drv[ring].cpu_addr = NULL; |
810 | rdev->fence_drv[ring].gpu_addr = 0; |
810 | rdev->fence_drv[ring].gpu_addr = 0; |
811 | for (i = 0; i < RADEON_NUM_RINGS; ++i) |
811 | for (i = 0; i < RADEON_NUM_RINGS; ++i) |
812 | rdev->fence_drv[ring].sync_seq[i] = 0; |
812 | rdev->fence_drv[ring].sync_seq[i] = 0; |
813 | atomic64_set(&rdev->fence_drv[ring].last_seq, 0); |
813 | atomic64_set(&rdev->fence_drv[ring].last_seq, 0); |
814 | rdev->fence_drv[ring].last_activity = jiffies; |
814 | rdev->fence_drv[ring].last_activity = GetTimerTicks(); |
815 | rdev->fence_drv[ring].initialized = false; |
815 | rdev->fence_drv[ring].initialized = false; |
816 | } |
816 | } |
Line 817... | Line 817... | ||
817 | 817 | ||
818 | /** |
818 | /** |