diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-12-15 22:15:18 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-12-15 22:15:18 +0000 |
| commit | 652a187664902399d34f5b3a084fdbb51b2ca12f (patch) | |
| tree | a2ecda4e8167c94a31d22442360401418c2abab6 /include/uapi/drm | |
| parent | 9add1ac3dd256ad12e266f8403daf928be19953f (diff) | |
| parent | dd54fee7d440c4a9756cce2c24a50c15e4c17ccb (diff) | |
| download | linux-652a187664902399d34f5b3a084fdbb51b2ca12f.tar.bz2 | |
Merge branch 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next
Fix regression, and some locking races, also as CS support
for the DMA engines.
* 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux:
radeon: fix regression with eviction since evict caching changes
drm/radeon: add more pedantic checks in the CP DMA checker
drm/radeon: bump version for CS ioctl support for async DMA
drm/radeon: enable the async DMA rings in the CS ioctl
drm/radeon: add VM CS parser support for async DMA on cayman/TN/SI
drm/radeon/kms: add evergreen/cayman CS parser for async DMA (v2)
drm/radeon/kms: add 6xx/7xx CS parser for async DMA (v2)
drm/radeon: fix htile buffer size computation for command stream checker
drm/radeon: fix fence locking in the pageflip callback
drm/radeon: make indirect register access concurrency-safe
drm/radeon: add W|RREG32_IDX for MM_INDEX|DATA based mmio accesss
Diffstat (limited to 'include/uapi/drm')
| -rw-r--r-- | include/uapi/drm/radeon_drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h index 5645a878faec..eeda91774c8a 100644 --- a/include/uapi/drm/radeon_drm.h +++ b/include/uapi/drm/radeon_drm.h @@ -917,6 +917,7 @@ struct drm_radeon_gem_va { /* The second dword of RADEON_CHUNK_ID_FLAGS is a uint32 that sets the ring type */ #define RADEON_CS_RING_GFX 0 #define RADEON_CS_RING_COMPUTE 1 +#define RADEON_CS_RING_DMA 2 /* The third dword of RADEON_CHUNK_ID_FLAGS is a sint32 that sets the priority */ /* 0 = normal, + = higher priority, - = lower priority */ |