linux-next: manual merge of the amdgpu tree with the drm tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the amdgpu tree got a conflict in:

  drivers/gpu/drm/amd/amdgpu/amdgpu_job.c

between commits:

  1b2d5eda5ad7 ("drm/amdgpu: move explicit sync check into the CS")
  1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS")

from the drm tree and commit:

  a61bf2f7299a ("drm/amdgpu: fix use-after-free during gpu recovery")

from the amdgpu tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index ffaac1c21c91,f4a3122352de..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@@ -173,8 -166,14 +173,13 @@@ static void amdgpu_job_free_cb(struct d
  
  	drm_sched_job_cleanup(s_job);
  
 -	amdgpu_sync_free(&job->sync);
 -	amdgpu_sync_free(&job->sched_sync);
 +	amdgpu_sync_free(&job->explicit_sync);
- 	dma_fence_put(&job->hw_fence);
+ 
+ 	/* only put the hw fence if has embedded fence */
+ 	if (!job->hw_fence.ops)
+ 		kfree(job);
+ 	else
+ 		dma_fence_put(&job->hw_fence);
  }
  
  void amdgpu_job_set_gang_leader(struct amdgpu_job *job,

Attachment: pgpnlHHiKUKyu.pgp
Description: OpenPGP digital signature