diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-06-21 08:52:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-06-21 08:52:19 +1000 |
| commit | 9aa36876ddeb85dfb0bcf37be06bbdc62e954f16 (patch) | |
| tree | 5162ac17fb8814935f81d4f90c700f1e708138f6 /drivers/gpu | |
| parent | 784a4d5539eaff3316933f8f3dc2fdad5a9b9f4d (diff) | |
| parent | 8444d5c69549aa0f0b574cc608742d4669e1cc01 (diff) | |
| download | linux-9aa36876ddeb85dfb0bcf37be06bbdc62e954f16.tar.gz linux-9aa36876ddeb85dfb0bcf37be06bbdc62e954f16.tar.bz2 linux-9aa36876ddeb85dfb0bcf37be06bbdc62e954f16.zip | |
Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
One user visible fix to stop misreport GPU hangs and subsequent resets.
* 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: update lockup tracking when scheduling in empty ring
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_ring.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index e17faa7cf732..82434018cbe8 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c @@ -402,6 +402,13 @@ int radeon_ring_alloc(struct radeon_device *rdev, struct radeon_ring *ring, unsi return -ENOMEM; /* Align requested size with padding so unlock_commit can * pad safely */ + radeon_ring_free_size(rdev, ring); + if (ring->ring_free_dw == (ring->ring_size / 4)) { + /* This is an empty ring update lockup info to avoid + * false positive. + */ + radeon_ring_lockup_update(ring); + } ndw = (ndw + ring->align_mask) & ~ring->align_mask; while (ndw > (ring->ring_free_dw - 1)) { radeon_ring_free_size(rdev, ring); |