diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-08-22 07:29:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-08-22 07:29:25 +1000 |
| commit | c3735aeb657c18200b5d67bd3306cddcac1a71c8 (patch) | |
| tree | 821008e2e2100dbe06f665527dabee3ee860f755 /include | |
| parent | c39502c5508fb0106167f80a037c444701faa65f (diff) | |
| parent | b738ca5d68e4051c86e32f46f67a69f3bb9cee5e (diff) | |
Merge branch 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux
more radeon fixes
* 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux:
Revert "drm/radeon: Use write-combined CPU mappings of ring buffers with PCIe"
drm/radeon: fix active_cu mask on SI and CIK after re-init (v3)
drm/radeon: fix active cu count for SI and CIK
drm/radeon: re-enable selective GPUVM flushing
drm/radeon: Sync ME and PFP after CP semaphore waits v4
drm/radeon: fix display handling in radeon_gpu_reset
drm/radeon: fix pm handling in radeon_gpu_reset
drm/radeon: Only flush HDP cache for indirect buffers from userspace
drm/radeon: properly document reloc priority mask
Diffstat (limited to 'include')
| -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 509b2d7a41b7..fea6099608ef 100644 --- a/include/uapi/drm/radeon_drm.h +++ b/include/uapi/drm/radeon_drm.h @@ -944,6 +944,7 @@ struct drm_radeon_cs_chunk { }; /* drm_radeon_cs_reloc.flags */ +#define RADEON_RELOC_PRIO_MASK (0xf << 0) struct drm_radeon_cs_reloc { uint32_t handle; |
