Merge tag 'drm-next-5.3-2019-07-18' of git://people.freedesktop.org/~agd5f/linux into drm-next
drm-next-5.3-2019-07-18: amdgpu: - Navi DC fix for secondary adapters - Fix Navi flickering with high res panels - Navi SMU fixes - Vega20 SMU fixes - Fixes for audio hotplug on HG systems - Fix for potential integer overflows on large buffer migrations - debugfs fixes for umr - Various other small fixes amdkfd: - Apply noretry setting consistently - Fix hang in eviction - Properly clean up GWS on uninit UAPI: - clarify a comment on ctx priority Signed-off-by: Dave Airlie <airlied@redhat.com> From: Alex Deucher <alexdeucher@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190718211525.3374-1-alexander.deucher@amd.com
This commit is contained in:
@@ -219,7 +219,10 @@ union drm_amdgpu_bo_list {
|
||||
#define AMDGPU_CTX_PRIORITY_VERY_LOW -1023
|
||||
#define AMDGPU_CTX_PRIORITY_LOW -512
|
||||
#define AMDGPU_CTX_PRIORITY_NORMAL 0
|
||||
/* Selecting a priority above NORMAL requires CAP_SYS_NICE or DRM_MASTER */
|
||||
/*
|
||||
* When used in struct drm_amdgpu_ctx_in, a priority above NORMAL requires
|
||||
* CAP_SYS_NICE or DRM_MASTER
|
||||
*/
|
||||
#define AMDGPU_CTX_PRIORITY_HIGH 512
|
||||
#define AMDGPU_CTX_PRIORITY_VERY_HIGH 1023
|
||||
|
||||
@@ -229,6 +232,7 @@ struct drm_amdgpu_ctx_in {
|
||||
/** For future use, no flags defined so far */
|
||||
__u32 flags;
|
||||
__u32 ctx_id;
|
||||
/** AMDGPU_CTX_PRIORITY_* */
|
||||
__s32 priority;
|
||||
};
|
||||
|
||||
@@ -281,6 +285,7 @@ struct drm_amdgpu_sched_in {
|
||||
/* AMDGPU_SCHED_OP_* */
|
||||
__u32 op;
|
||||
__u32 fd;
|
||||
/** AMDGPU_CTX_PRIORITY_* */
|
||||
__s32 priority;
|
||||
__u32 ctx_id;
|
||||
};
|
||||
|
Reference in New Issue
Block a user