diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-02-22 06:56:35 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-02-22 06:56:42 +0100 |
| commit | fbac3c48fa6b4cfa43eaae39d5a53269bff7ec5f (patch) | |
| tree | dddd2843ec69dceda451de060d68ac21629d10ab /include/uapi/drm | |
| parent | Merge https://gitlab.freedesktop.org/drm/msm into drm-next (diff) | |
| parent | drm/amdgpu: Bump amdgpu version for context priority override. (diff) | |
| download | linux-fbac3c48fa6b4cfa43eaae39d5a53269bff7ec5f.tar.xz linux-fbac3c48fa6b4cfa43eaae39d5a53269bff7ec5f.zip | |
Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next
Fixes for 5.1:
amdgpu:
- Fix missing fw declaration after dropping old CI DPM code
- Fix debugfs access to registers beyond the MMIO bar size
- Fix context priority handling
- Add missing license on some new files
- Various cleanups and bug fixes
radeon:
- Fix missing break in CS parser for evergreen
- Various cleanups and bug fixes
sched:
- Fix entities with 0 run queues
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190221214134.3308-1-alexander.deucher@amd.com
Diffstat (limited to 'include/uapi/drm')
| -rw-r--r-- | include/uapi/drm/amdgpu_drm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h index 2acbc8bc465b..4a53f6cfa034 100644 --- a/include/uapi/drm/amdgpu_drm.h +++ b/include/uapi/drm/amdgpu_drm.h @@ -272,13 +272,14 @@ union drm_amdgpu_vm { /* sched ioctl */ #define AMDGPU_SCHED_OP_PROCESS_PRIORITY_OVERRIDE 1 +#define AMDGPU_SCHED_OP_CONTEXT_PRIORITY_OVERRIDE 2 struct drm_amdgpu_sched_in { /* AMDGPU_SCHED_OP_* */ __u32 op; __u32 fd; __s32 priority; - __u32 flags; + __u32 ctx_id; }; union drm_amdgpu_sched { |