From e5fd39cad725a257dc067c5a82b9dad5c6a302ea Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Sat, 13 May 2023 02:53:57 +0200 Subject: [PATCH] linux 6.3.y: Add amdgpu fixup for vkd3d-proton to misc-additions https://patchwork.freedesktop.org/patch/534250/ --- .../6.3/0012-misc-additions.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/linux-tkg-patches/6.3/0012-misc-additions.patch b/linux-tkg-patches/6.3/0012-misc-additions.patch index 6591434..c55efbd 100644 --- a/linux-tkg-patches/6.3/0012-misc-additions.patch +++ b/linux-tkg-patches/6.3/0012-misc-additions.patch @@ -64,3 +64,41 @@ index 2c7171e0b0010..85de313ddec29 100644 select CPU_FREQ_GOV_PERFORMANCE help +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +index 08eced097bd8..2eb2c66843a8 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -1276,7 +1276,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, + r = drm_sched_job_add_dependency(&leader->base, fence); + if (r) { + dma_fence_put(fence); +- goto error_cleanup; ++ return r; + } + } + +@@ -1303,7 +1303,8 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, + } + if (r) { + r = -EAGAIN; +- goto error_unlock; ++ mutex_unlock(&p->adev->notifier_lock); ++ return r; + } + + p->fence = dma_fence_get(&leader->base.s_fence->finished); +@@ -1350,14 +1351,6 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, + mutex_unlock(&p->adev->notifier_lock); + mutex_unlock(&p->bo_list->bo_list_mutex); + return 0; +- +-error_unlock: +- mutex_unlock(&p->adev->notifier_lock); +- +-error_cleanup: +- for (i = 0; i < p->gang_size; ++i) +- drm_sched_job_cleanup(&p->jobs[i]->base); +- return r; + } + + /* Cleanup the parser structure */