Subject: linux-next: manual merge of the drm tree with the drm-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 10 Jul 2020 12:28:24 +1000

Hi all,

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

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

between commit:

  c564b8601ae9 ("drm/amdgpu: add TMR destory function for psp")

from the drm-fixes tree and commit:

  3bda8acd974e ("drm/amdgpu/sriov: Add clear vf fw support")

from the drm 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_psp.c
index ef3269c43d4f,9342a9e8cadf..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@@ -1825,6 -1866,9 +1912,7 @@@ static int psp_hw_fini(void *handle
  {
  	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
  	struct psp_context *psp = &adev->psp;
 -	void *tmr_buf;
 -	void **pptr;
+ 	int ret;
  
  	if (psp->adev->psp.ta_fw) {
  		psp_ras_terminate(psp);
@@@ -1833,10 -1877,16 +1921,15 @@@
  	}
  
  	psp_asd_unload(psp);
+ 	ret = psp_clear_vf_fw(psp);
+ 	if (ret) {
+ 		DRM_ERROR("PSP clear vf fw!\n");
+ 		return ret;
+ 	}
  
 +	psp_tmr_terminate(psp);
  	psp_ring_destroy(psp, PSP_RING_TYPE__KM);
  
 -	pptr = amdgpu_sriov_vf(psp->adev) ? &tmr_buf : NULL;
 -	amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, pptr);
  	amdgpu_bo_free_kernel(&psp->fw_pri_bo,
  			      &psp->fw_pri_mc_addr, &psp->fw_pri_buf);
  	amdgpu_bo_free_kernel(&psp->fence_buf_bo,