From: Stephen Rothwell <sfr@canb.auug.org.au> To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Cc: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Huang Rui <ray.huang@amd.com>, Emily Deng <Emily.Deng@amd.com>, Alex Deucher <alexander.deucher@amd.com> Subject: linux-next: manual merge of the drm tree with the drm-fixes tree Date: Fri, 10 Jul 2020 12:28:24 +1000 [thread overview] Message-ID: <20200710122824.3fe55d0c@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 1754 bytes --] 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, [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Cc: Alex Deucher <alexander.deucher@amd.com>, Emily Deng <Emily.Deng@amd.com>, Linux Next Mailing List <linux-next@vger.kernel.org>, Huang Rui <ray.huang@amd.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Subject: linux-next: manual merge of the drm tree with the drm-fixes tree Date: Fri, 10 Jul 2020 12:28:24 +1000 [thread overview] Message-ID: <20200710122824.3fe55d0c@canb.auug.org.au> (raw) [-- Attachment #1.1: Type: text/plain, Size: 1754 bytes --] 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, [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2020-07-10 2:28 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-10 2:28 Stephen Rothwell [this message] 2020-07-10 2:28 ` linux-next: manual merge of the drm tree with the drm-fixes tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2023-08-18 1:53 Stephen Rothwell 2023-08-18 1:53 ` Stephen Rothwell 2023-02-13 0:23 Stephen Rothwell 2023-02-13 0:23 ` Stephen Rothwell 2022-09-26 17:49 broonie 2022-09-26 17:49 ` broonie 2022-02-25 16:37 broonie 2022-02-25 16:37 ` broonie 2022-02-24 16:33 broonie 2022-02-24 16:33 ` broonie 2021-08-06 12:04 Mark Brown 2021-08-10 11:56 ` Geert Uytterhoeven 2021-08-10 11:56 ` Geert Uytterhoeven 2021-08-10 12:53 ` Stephen Rothwell 2019-08-23 3:20 Stephen Rothwell 2019-08-23 3:20 ` Stephen Rothwell 2019-07-05 2:50 Stephen Rothwell 2019-03-01 2:23 Stephen Rothwell 2019-03-01 23:29 ` Alex Deucher 2019-03-01 23:29 ` Alex Deucher 2019-03-04 0:54 ` Stephen Rothwell 2019-03-04 0:54 ` Stephen Rothwell 2019-03-11 12:36 ` Daniel Vetter 2019-03-11 12:36 ` Daniel Vetter 2018-12-14 1:51 Stephen Rothwell 2018-12-07 2:38 Stephen Rothwell 2018-12-07 2:38 ` Stephen Rothwell 2018-12-07 2:31 Stephen Rothwell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200710122824.3fe55d0c@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=Emily.Deng@amd.com \ --cc=airlied@linux.ie \ --cc=alexander.deucher@amd.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=ray.huang@amd.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.