diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-21 06:33:06 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-21 06:33:06 -1000 |
| commit | e61cd5e2e36746e5a4e791b9232aed39bce52ded (patch) | |
| tree | 9a9ba4b291698f94e00aaedbe6e4c551d7a51f5a /drivers/gpu/drm/radeon/radeon_ring.c | |
| parent | 64a2f30a89a3c26a5152b09f4d390b9d91cab0cc (diff) | |
| parent | 9aa36876ddeb85dfb0bcf37be06bbdc62e954f16 (diff) | |
| download | linux-3.10-e61cd5e2e36746e5a4e791b9232aed39bce52ded.tar.gz linux-3.10-e61cd5e2e36746e5a4e791b9232aed39bce52ded.tar.bz2 linux-3.10-e61cd5e2e36746e5a4e791b9232aed39bce52ded.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm radeon fixes from Dave Airlie:
"One core fix, but mostly radeon fixes for s/r and big endian UVD
support, and a fix to stop the GPU being reset for no good reason, and
crashing people's machines."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/radeon: update lockup tracking when scheduling in empty ring
drm/prime: Honor requested file flags when exporting a buffer
drm/radeon: fix UVD on big endian
drm/radeon: fix write back suspend regression with uvd v2
drm/radeon: do not try to uselessly update virtual memory pagetable
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ring.c')
| -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 e17faa7cf73..82434018cbe 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); |