diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0468-drm-amdgpu-prepare-job-should-be-common-code-path.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/0468-drm-amdgpu-prepare-job-should-be-common-code-path.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/common/recipes-kernel/linux/files/0468-drm-amdgpu-prepare-job-should-be-common-code-path.patch b/common/recipes-kernel/linux/files/0468-drm-amdgpu-prepare-job-should-be-common-code-path.patch deleted file mode 100644 index 85b0251d..00000000 --- a/common/recipes-kernel/linux/files/0468-drm-amdgpu-prepare-job-should-be-common-code-path.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4fe6311734986220e40afe4bf72d62383c1e8d6c Mon Sep 17 00:00:00 2001 -From: Chunming Zhou <david1.zhou@amd.com> -Date: Tue, 18 Aug 2015 16:12:15 +0800 -Subject: [PATCH 0468/1050] drm/amdgpu: prepare job should be common code path - -Signed-off-by: Chunming Zhou <david1.zhou@amd.com> -Reviewed-by: Christian K?nig <christian.koenig@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -index c8de4b6..7b4823d 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -@@ -891,13 +891,14 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) - return r; - } - -+ r = amdgpu_cs_parser_prepare_job(parser); -+ if (r) -+ goto out; -+ - if (amdgpu_enable_scheduler && parser->num_ibs) { - struct amdgpu_job *job; - struct amdgpu_ring * ring = - amdgpu_cs_parser_get_ring(adev, parser); -- r = amdgpu_cs_parser_prepare_job(parser); -- if (r) -- goto out; - job = kzalloc(sizeof(struct amdgpu_job), GFP_KERNEL); - if (!job) - return -ENOMEM; -@@ -939,9 +940,6 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) - up_read(&adev->exclusive_lock); - return 0; - } -- r = amdgpu_cs_parser_prepare_job(parser); -- if (r) -- goto out; - - cs->out.handle = parser->ibs[parser->num_ibs - 1].sequence; - out: --- -1.9.1 - |