BTW: I'm working of fixing the underlying issue in general. But this is going to need some more time. Regards, Christian. Am 06.09.2017 um 05:08 schrieb zhoucm1: > +Monk. > > Moving push_job out of reservation lock indeed not a good idea. > > Hi Monk, > > How about Christian's revert? > > Regards, > David Zhou > > On 2017å¹´09æ??05æ?¥ 21:14, Christian König wrote: >> From: Christian König <christian.koenig at amd.com> >> >> This reverts commit 10e709cb296c98424c03408d23e3addeddcd4088. >> >> The patch doesn't work at all: >> 1. The CS can still be blocked because of amdgpu_ctx_add_fence(). >> 2. The order of submission isn't correct any more. >> 3. We could end up using freed up memory because we now drop the >> ctx reference to early. >> >> This needs to be fixed cleanly by doing the context handling after >> the BO >> handling, but this is a larger task just avoid the obvious crashes >> for now. >> >> Signed-off-by: Christian König <christian.koenig at amd.com> >> --- >> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 ---- >> 1 file changed, 4 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c >> index b96776c..2db4010 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c >> @@ -1061,7 +1061,6 @@ static int amdgpu_cs_submit(struct >> amdgpu_cs_parser *p, >> cs->out.handle = amdgpu_ctx_add_fence(p->ctx, ring, p->fence); >> job->uf_sequence = cs->out.handle; >> amdgpu_job_free_resources(job); >> - amdgpu_cs_parser_fini(p, 0, true); >> trace_amdgpu_cs_ioctl(job); >> amd_sched_entity_push_job(&job->base); >> @@ -1120,10 +1119,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, >> void *data, struct drm_file *filp) >> goto out; >> r = amdgpu_cs_submit(&parser, cs); >> - if (r) >> - goto out; >> - return 0; >> out: >> amdgpu_cs_parser_fini(&parser, r, reserved_buffers); >> return r; > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
