diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1976-drm-amdgpu-make-amdgpu_to_sched_priority-detect-inva.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1976-drm-amdgpu-make-amdgpu_to_sched_priority-detect-inva.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1976-drm-amdgpu-make-amdgpu_to_sched_priority-detect-inva.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1976-drm-amdgpu-make-amdgpu_to_sched_priority-detect-inva.patch new file mode 100644 index 00000000..4d757520 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1976-drm-amdgpu-make-amdgpu_to_sched_priority-detect-inva.patch @@ -0,0 +1,64 @@ +From 4678b8893506cec0a02aff77c08aaa9f9e094f1b Mon Sep 17 00:00:00 2001 +From: Andres Rodriguez <andresx7@gmail.com> +Date: Wed, 24 May 2017 17:00:10 -0400 +Subject: [PATCH 1976/4131] drm/amdgpu: make amdgpu_to_sched_priority detect + invalid parameters +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Returning invalid priorities as _NORMAL is a backwards compatibility +quirk of amdgpu_ctx_ioctl(). Move this detail one layer up where it +belongs. + +Signed-off-by: Andres Rodriguez <andresx7@gmail.com> +Acked-by: Christian König <christian.koenig@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 8 +++++--- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 3 ++- + 2 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +index 3427205..b10f6f8 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +@@ -249,7 +249,7 @@ static enum amd_sched_priority amdgpu_to_sched_priority(int amdgpu_priority) + return AMD_SCHED_PRIORITY_LOW; + default: + WARN(1, "Invalid context priority %d\n", amdgpu_priority); +- return AMD_SCHED_PRIORITY_NORMAL; ++ return AMD_SCHED_PRIORITY_INVALID; + } + } + +@@ -268,8 +268,10 @@ int amdgpu_ctx_ioctl(struct drm_device *dev, void *data, + id = args->in.ctx_id; + priority = amdgpu_to_sched_priority(args->in.priority); + +- if (priority >= AMD_SCHED_PRIORITY_MAX) +- return -EINVAL; ++ /* For backwards compatibility reasons, we need to accept ++ * ioctls with garbage in the priority field */ ++ if (priority == AMD_SCHED_PRIORITY_INVALID) ++ priority = AMD_SCHED_PRIORITY_NORMAL; + + switch (args->in.op) { + case AMDGPU_CTX_OP_ALLOC_CTX: +diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h +index 19d5e97..cf7e92d 100644 +--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h ++++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h +@@ -119,7 +119,8 @@ enum amd_sched_priority { + AMD_SCHED_PRIORITY_HIGH_SW, + AMD_SCHED_PRIORITY_HIGH_HW, + AMD_SCHED_PRIORITY_KERNEL, +- AMD_SCHED_PRIORITY_MAX ++ AMD_SCHED_PRIORITY_MAX, ++ AMD_SCHED_PRIORITY_INVALID = -1 + }; + + /** +-- +2.7.4 + |