Re: [pull] amdgpu, amdkfd, radeon drm-next-5.12
On Thu, Apr 8, 2021 at 6:03 AM Daniel Vetter wrote: > > On Thu, Apr 01, 2021 at 06:56:09AM +1000, Dave Airlie wrote: > > I think this is due to this pull, on arm32. > > > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_srv.c: > > In function ‘dmub_srv_hw_init’: > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_srv.c:519:44: > > warning: cast from pointer to integer of different size > > [-Wpointer-to-int-cast] > > outbox0_rb_params.base_address = (void > > *)((uint64_t)(tracebuff_fb->cpu_addr) + TRACE_BUFFER_ENTRY_OFFSET); > > ^ > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_srv.c:519:35: > > warning: cast to pointer from integer of different size > > [-Wint-to-pointer-cast] > > outbox0_rb_params.base_address = (void > > *)((uint64_t)(tracebuff_fb->cpu_addr) + TRACE_BUFFER_ENTRY_OFFSET); > > Uh I build test, but always ignore the warnings :-/ Sorry about that. This is fixed in my current PR if I can finally get it sorted out. Alex > -Daniel > > > > > Dave. > > > > On Sat, 27 Mar 2021 at 05:16, Zhuo, Qingqing wrote: > > > > > > [AMD Public Use] > > > > > > On Thu, Feb 18, 2021 at 11:15 PM Alex Deucher > > > wrote: > > > >> > > > >> Hi Dave, Daniel, > > > >> > > > >> Fixes for 5.12. > > > >> > > > >> The following changes since commit > > > >> 4c3a3292730c56591472717d8c5c0faf74f6c6bb: > > > >> > > > >> drm/amd/display: fix unused variable warning (2021-02-05 09:49:44 > > > >> +1000) > > > >> > > > >> are available in the Git repository at: > > > >> > > > >> > > > >> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitl > > > >> ab.freedesktop.org%2Fagd5f%2Flinux.gitdata=04%7C01%7Cqingqing.zhu > > > >> o%40amd.com%7Cce0d1ee6a18b4a95366008d8f082048e%7C3dd8961fe4884e608e11a > > > >> 82d994e183d%7C0%7C0%7C637523789263486288%7CUnknown%7CTWFpbGZsb3d8eyJWI > > > >> joiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000 > > > >> mp;sdata=Ig3OkPN0X8OtCOHDJqV%2FZSEOsL7gPs8OMh9sXDniR2w%3Dreserved > > > >> =0 tags/amd-drm-next-5.12-2021-02-18 > > > >> > > > >> for you to fetch changes up to > > > >> 6e80fb8ab04f6c4f377e2fd422bdd1855beb7371: > > > >> > > > >> drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2) (2021-02-18 > > > >> 16:43:09 -0500) > > > > > > > Pulled into drm-next, with some conflicts, please double-check. > > > > > > > I also spotted > > > > > > > commit ea3b4242bc9ca197762119382b37e125815bd67f > > > > Author: Qingqing Zhuo > > > > Date: Tue Feb 9 16:36:41 2021 -0500 > > > > > > > drm/amd/display: Fix system hang after multiple hotplugs (v3) > > > > > > > I think it would be good if that could use the drm_vblank_work stuff > > > > from Lyude instead of hand-rolling your own. > > > > -Daniel > > > > > > Hi Daniel, > > > > > > Thank you for the suggestion! I need to look into further and will do so > > > as soon as I have bandwidth. > > > > > > Thanks, > > > Lillian > > > > > > >> > > > >> > > > >> amd-drm-next-5.12-2021-02-18: > > > >> > > > >> amdgpu: > > > >> - Prefer Bhawan's unused variable fix > > > >> - Fixes for high priority queues on gfx8,9 > > > >> - swSMU fixes for sienna cichlid > > > >> - swSMU fixes for renoir > > > >> - mmhub client id fixes for arcturus > > > >> - SMUIO fixes for navi family > > > >> - swSMU fixes for vangogh > > > >> - GPU reset cleanup > > > >> - Display fixes > > > >> - GFX harvesting fix for sienna cichlid > > > >> - Fix reference clock on Renoir > > > >> - Misc fixes and cleanups > > > >> > > > >> amdkfd: > > > >> - Fix for unique id query > > > >> - Fix recursive lock warnings > > > >> > > > >> radeon: > > > >> - Remove confusing VCE messages on Oland > > > >> > > > >> > > > >> Alex Deucher (16): > > > >> Revert "drm/amd/display: fix unused variable warning" > > > >> drm/amdgpu/smu12: fix power reporting on renoir > > > >> drm/amdgpu/gmc9: fix mmhub client mapping for arcturus > > > >> drm/amdgpu/si: minor clean up of reset code > > > >> drm/amdgpu/cik: minor clean up of reset code > > > >> drm/amdgpu/vi: minor clean up of reset code > > > >> drm/amdgpu: add generic pci reset as an option > > > >> drm/amdgpu/si: add PCI reset support > > > >> drm/amdgpu/soc15: add PCI reset support > > > >> drm/amdgpu/nv: add PCI reset support > > > >> drm/amdgpu: drop extra drm_kms_helper_poll_enable/disable calls > > > >> drm/amdgpu: use runpm flag rather than fbcon for kfd runtime > > > >> suspend (v2) > > > >> drm/amdgpu: reset runpm flag if device suspend fails > > > >> Revert "drm/amd/display: Update NV1x SR latency values" > > > >> drm/radeon: OLAND boards don't have VCE > > > >> drm/amdgpu: Set reference clock to 100Mhz on
Re: [pull] amdgpu, amdkfd, radeon drm-next-5.12
On Thu, Apr 01, 2021 at 06:56:09AM +1000, Dave Airlie wrote: > I think this is due to this pull, on arm32. > > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_srv.c: > In function ‘dmub_srv_hw_init’: > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_srv.c:519:44: > warning: cast from pointer to integer of different size > [-Wpointer-to-int-cast] > outbox0_rb_params.base_address = (void > *)((uint64_t)(tracebuff_fb->cpu_addr) + TRACE_BUFFER_ENTRY_OFFSET); > ^ > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_srv.c:519:35: > warning: cast to pointer from integer of different size > [-Wint-to-pointer-cast] > outbox0_rb_params.base_address = (void > *)((uint64_t)(tracebuff_fb->cpu_addr) + TRACE_BUFFER_ENTRY_OFFSET); Uh I build test, but always ignore the warnings :-/ -Daniel > > Dave. > > On Sat, 27 Mar 2021 at 05:16, Zhuo, Qingqing wrote: > > > > [AMD Public Use] > > > > On Thu, Feb 18, 2021 at 11:15 PM Alex Deucher wrote: > > >> > > >> Hi Dave, Daniel, > > >> > > >> Fixes for 5.12. > > >> > > >> The following changes since commit > > >> 4c3a3292730c56591472717d8c5c0faf74f6c6bb: > > >> > > >> drm/amd/display: fix unused variable warning (2021-02-05 09:49:44 > > >> +1000) > > >> > > >> are available in the Git repository at: > > >> > > >> > > >> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitl > > >> ab.freedesktop.org%2Fagd5f%2Flinux.gitdata=04%7C01%7Cqingqing.zhu > > >> o%40amd.com%7Cce0d1ee6a18b4a95366008d8f082048e%7C3dd8961fe4884e608e11a > > >> 82d994e183d%7C0%7C0%7C637523789263486288%7CUnknown%7CTWFpbGZsb3d8eyJWI > > >> joiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000 > > >> mp;sdata=Ig3OkPN0X8OtCOHDJqV%2FZSEOsL7gPs8OMh9sXDniR2w%3Dreserved > > >> =0 tags/amd-drm-next-5.12-2021-02-18 > > >> > > >> for you to fetch changes up to 6e80fb8ab04f6c4f377e2fd422bdd1855beb7371: > > >> > > >> drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2) (2021-02-18 > > >> 16:43:09 -0500) > > > > > Pulled into drm-next, with some conflicts, please double-check. > > > > > I also spotted > > > > > commit ea3b4242bc9ca197762119382b37e125815bd67f > > > Author: Qingqing Zhuo > > > Date: Tue Feb 9 16:36:41 2021 -0500 > > > > > drm/amd/display: Fix system hang after multiple hotplugs (v3) > > > > > I think it would be good if that could use the drm_vblank_work stuff from > > > Lyude instead of hand-rolling your own. > > > -Daniel > > > > Hi Daniel, > > > > Thank you for the suggestion! I need to look into further and will do so as > > soon as I have bandwidth. > > > > Thanks, > > Lillian > > > > >> > > >> > > >> amd-drm-next-5.12-2021-02-18: > > >> > > >> amdgpu: > > >> - Prefer Bhawan's unused variable fix > > >> - Fixes for high priority queues on gfx8,9 > > >> - swSMU fixes for sienna cichlid > > >> - swSMU fixes for renoir > > >> - mmhub client id fixes for arcturus > > >> - SMUIO fixes for navi family > > >> - swSMU fixes for vangogh > > >> - GPU reset cleanup > > >> - Display fixes > > >> - GFX harvesting fix for sienna cichlid > > >> - Fix reference clock on Renoir > > >> - Misc fixes and cleanups > > >> > > >> amdkfd: > > >> - Fix for unique id query > > >> - Fix recursive lock warnings > > >> > > >> radeon: > > >> - Remove confusing VCE messages on Oland > > >> > > >> > > >> Alex Deucher (16): > > >> Revert "drm/amd/display: fix unused variable warning" > > >> drm/amdgpu/smu12: fix power reporting on renoir > > >> drm/amdgpu/gmc9: fix mmhub client mapping for arcturus > > >> drm/amdgpu/si: minor clean up of reset code > > >> drm/amdgpu/cik: minor clean up of reset code > > >> drm/amdgpu/vi: minor clean up of reset code > > >> drm/amdgpu: add generic pci reset as an option > > >> drm/amdgpu/si: add PCI reset support > > >> drm/amdgpu/soc15: add PCI reset support > > >> drm/amdgpu/nv: add PCI reset support > > >> drm/amdgpu: drop extra drm_kms_helper_poll_enable/disable calls > > >> drm/amdgpu: use runpm flag rather than fbcon for kfd runtime > > >> suspend (v2) > > >> drm/amdgpu: reset runpm flag if device suspend fails > > >> Revert "drm/amd/display: Update NV1x SR latency values" > > >> drm/radeon: OLAND boards don't have VCE > > >> drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2) > > >> > > >> Anthony Koo (1): > > >> drm/amd/display: [FW Promotion] Release 0.0.51 > > >> > > >> Aric Cyr (1): > > >> drm/amd/display: 3.2.122 > > >> > > >> Bhawanpreet Lakha (1): > > >> drm/amd/display: Fix unused variable warning > > >> > > >> Dale Zhao (1): > > >> drm/amd/display: fix type mismatch error for return variable > > >> > > >> Derek Lai (1): > > >>
Re: [pull] amdgpu, amdkfd, radeon drm-next-5.12
I think this is due to this pull, on arm32. /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_srv.c: In function ‘dmub_srv_hw_init’: /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_srv.c:519:44: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] outbox0_rb_params.base_address = (void *)((uint64_t)(tracebuff_fb->cpu_addr) + TRACE_BUFFER_ENTRY_OFFSET); ^ /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_srv.c:519:35: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] outbox0_rb_params.base_address = (void *)((uint64_t)(tracebuff_fb->cpu_addr) + TRACE_BUFFER_ENTRY_OFFSET); Dave. On Sat, 27 Mar 2021 at 05:16, Zhuo, Qingqing wrote: > > [AMD Public Use] > > On Thu, Feb 18, 2021 at 11:15 PM Alex Deucher wrote: > >> > >> Hi Dave, Daniel, > >> > >> Fixes for 5.12. > >> > >> The following changes since commit > >> 4c3a3292730c56591472717d8c5c0faf74f6c6bb: > >> > >> drm/amd/display: fix unused variable warning (2021-02-05 09:49:44 > >> +1000) > >> > >> are available in the Git repository at: > >> > >> > >> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitl > >> ab.freedesktop.org%2Fagd5f%2Flinux.gitdata=04%7C01%7Cqingqing.zhu > >> o%40amd.com%7Cce0d1ee6a18b4a95366008d8f082048e%7C3dd8961fe4884e608e11a > >> 82d994e183d%7C0%7C0%7C637523789263486288%7CUnknown%7CTWFpbGZsb3d8eyJWI > >> joiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000 > >> mp;sdata=Ig3OkPN0X8OtCOHDJqV%2FZSEOsL7gPs8OMh9sXDniR2w%3Dreserved > >> =0 tags/amd-drm-next-5.12-2021-02-18 > >> > >> for you to fetch changes up to 6e80fb8ab04f6c4f377e2fd422bdd1855beb7371: > >> > >> drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2) (2021-02-18 > >> 16:43:09 -0500) > > > Pulled into drm-next, with some conflicts, please double-check. > > > I also spotted > > > commit ea3b4242bc9ca197762119382b37e125815bd67f > > Author: Qingqing Zhuo > > Date: Tue Feb 9 16:36:41 2021 -0500 > > > drm/amd/display: Fix system hang after multiple hotplugs (v3) > > > I think it would be good if that could use the drm_vblank_work stuff from > > Lyude instead of hand-rolling your own. > > -Daniel > > Hi Daniel, > > Thank you for the suggestion! I need to look into further and will do so as > soon as I have bandwidth. > > Thanks, > Lillian > > >> > >> > >> amd-drm-next-5.12-2021-02-18: > >> > >> amdgpu: > >> - Prefer Bhawan's unused variable fix > >> - Fixes for high priority queues on gfx8,9 > >> - swSMU fixes for sienna cichlid > >> - swSMU fixes for renoir > >> - mmhub client id fixes for arcturus > >> - SMUIO fixes for navi family > >> - swSMU fixes for vangogh > >> - GPU reset cleanup > >> - Display fixes > >> - GFX harvesting fix for sienna cichlid > >> - Fix reference clock on Renoir > >> - Misc fixes and cleanups > >> > >> amdkfd: > >> - Fix for unique id query > >> - Fix recursive lock warnings > >> > >> radeon: > >> - Remove confusing VCE messages on Oland > >> > >> > >> Alex Deucher (16): > >> Revert "drm/amd/display: fix unused variable warning" > >> drm/amdgpu/smu12: fix power reporting on renoir > >> drm/amdgpu/gmc9: fix mmhub client mapping for arcturus > >> drm/amdgpu/si: minor clean up of reset code > >> drm/amdgpu/cik: minor clean up of reset code > >> drm/amdgpu/vi: minor clean up of reset code > >> drm/amdgpu: add generic pci reset as an option > >> drm/amdgpu/si: add PCI reset support > >> drm/amdgpu/soc15: add PCI reset support > >> drm/amdgpu/nv: add PCI reset support > >> drm/amdgpu: drop extra drm_kms_helper_poll_enable/disable calls > >> drm/amdgpu: use runpm flag rather than fbcon for kfd runtime suspend > >> (v2) > >> drm/amdgpu: reset runpm flag if device suspend fails > >> Revert "drm/amd/display: Update NV1x SR latency values" > >> drm/radeon: OLAND boards don't have VCE > >> drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2) > >> > >> Anthony Koo (1): > >> drm/amd/display: [FW Promotion] Release 0.0.51 > >> > >> Aric Cyr (1): > >> drm/amd/display: 3.2.122 > >> > >> Bhawanpreet Lakha (1): > >> drm/amd/display: Fix unused variable warning > >> > >> Dale Zhao (1): > >> drm/amd/display: fix type mismatch error for return variable > >> > >> Derek Lai (1): > >> drm/amd/display: Add DIG_CLOCK_PATTERN in the transmitter > >> control > >> > >> Eric Yang (1): > >> drm/amd/display: move edp sink present detection to hw init > >> > >> Fangzhi Zuo (1): > >> drm/amd/display: Add return code instead of boolean for future > >> use > >> > >> Felix Kuehling (1): > >> drm/amdkfd: Fix recursive lock warnings > >> > >> Gustavo A.
RE: [pull] amdgpu, amdkfd, radeon drm-next-5.12
[AMD Public Use] On Thu, Feb 18, 2021 at 11:15 PM Alex Deucher wrote: >> >> Hi Dave, Daniel, >> >> Fixes for 5.12. >> >> The following changes since commit 4c3a3292730c56591472717d8c5c0faf74f6c6bb: >> >> drm/amd/display: fix unused variable warning (2021-02-05 09:49:44 >> +1000) >> >> are available in the Git repository at: >> >> >> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitl >> ab.freedesktop.org%2Fagd5f%2Flinux.gitdata=04%7C01%7Cqingqing.zhu >> o%40amd.com%7Cce0d1ee6a18b4a95366008d8f082048e%7C3dd8961fe4884e608e11a >> 82d994e183d%7C0%7C0%7C637523789263486288%7CUnknown%7CTWFpbGZsb3d8eyJWI >> joiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000 >> mp;sdata=Ig3OkPN0X8OtCOHDJqV%2FZSEOsL7gPs8OMh9sXDniR2w%3Dreserved >> =0 tags/amd-drm-next-5.12-2021-02-18 >> >> for you to fetch changes up to 6e80fb8ab04f6c4f377e2fd422bdd1855beb7371: >> >> drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2) (2021-02-18 >> 16:43:09 -0500) > Pulled into drm-next, with some conflicts, please double-check. > I also spotted > commit ea3b4242bc9ca197762119382b37e125815bd67f > Author: Qingqing Zhuo > Date: Tue Feb 9 16:36:41 2021 -0500 > drm/amd/display: Fix system hang after multiple hotplugs (v3) > I think it would be good if that could use the drm_vblank_work stuff from > Lyude instead of hand-rolling your own. > -Daniel Hi Daniel, Thank you for the suggestion! I need to look into further and will do so as soon as I have bandwidth. Thanks, Lillian >> >> >> amd-drm-next-5.12-2021-02-18: >> >> amdgpu: >> - Prefer Bhawan's unused variable fix >> - Fixes for high priority queues on gfx8,9 >> - swSMU fixes for sienna cichlid >> - swSMU fixes for renoir >> - mmhub client id fixes for arcturus >> - SMUIO fixes for navi family >> - swSMU fixes for vangogh >> - GPU reset cleanup >> - Display fixes >> - GFX harvesting fix for sienna cichlid >> - Fix reference clock on Renoir >> - Misc fixes and cleanups >> >> amdkfd: >> - Fix for unique id query >> - Fix recursive lock warnings >> >> radeon: >> - Remove confusing VCE messages on Oland >> >> >> Alex Deucher (16): >> Revert "drm/amd/display: fix unused variable warning" >> drm/amdgpu/smu12: fix power reporting on renoir >> drm/amdgpu/gmc9: fix mmhub client mapping for arcturus >> drm/amdgpu/si: minor clean up of reset code >> drm/amdgpu/cik: minor clean up of reset code >> drm/amdgpu/vi: minor clean up of reset code >> drm/amdgpu: add generic pci reset as an option >> drm/amdgpu/si: add PCI reset support >> drm/amdgpu/soc15: add PCI reset support >> drm/amdgpu/nv: add PCI reset support >> drm/amdgpu: drop extra drm_kms_helper_poll_enable/disable calls >> drm/amdgpu: use runpm flag rather than fbcon for kfd runtime suspend >> (v2) >> drm/amdgpu: reset runpm flag if device suspend fails >> Revert "drm/amd/display: Update NV1x SR latency values" >> drm/radeon: OLAND boards don't have VCE >> drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2) >> >> Anthony Koo (1): >> drm/amd/display: [FW Promotion] Release 0.0.51 >> >> Aric Cyr (1): >> drm/amd/display: 3.2.122 >> >> Bhawanpreet Lakha (1): >> drm/amd/display: Fix unused variable warning >> >> Dale Zhao (1): >> drm/amd/display: fix type mismatch error for return variable >> >> Derek Lai (1): >> drm/amd/display: Add DIG_CLOCK_PATTERN in the transmitter >> control >> >> Eric Yang (1): >> drm/amd/display: move edp sink present detection to hw init >> >> Fangzhi Zuo (1): >> drm/amd/display: Add return code instead of boolean for future >> use >> >> Felix Kuehling (1): >> drm/amdkfd: Fix recursive lock warnings >> >> Gustavo A. R. Silva (1): >> drm/amd/display: Fix potential integer overflow >> >> Jan Kokemüller (1): >> drm/amd/display: Add FPU wrappers to dcn21_validate_bandwidth() >> >> Jiapeng Chong (2): >> drm/amd/display: Simplify bool comparison >> drm/radeon: Simplify bool comparison >> >> Jiawei Gu (1): >> drm/amdgpu: extend MAX_KIQ_REG_TRY to 1000 >> >> Jun Lei (1): >> drm/amd/display: revert support for DID2.0 dsc passthrough >> >> Kenneth Feng (3): >> drm/amd/pm: enable ACDC feature >> drm/amd/pm: enable DCS >> drm/amd/pm: enable LCLK DS >> >> Kent Russell (1): >> drm/amdkfd: Get unique_id dynamically v2 >> >> Kevin Wang (2): >> drm/amd/pm/swsmu: unify the init soft gpu metrics function >> drm/amdgpu: optimize list operation in amdgpu_xgmi >> >> Lang Yu (1): >> drm/amd/display: fix 64bit division issue on 32bit OS >> >> Likun Gao (5): >> drm/amdgpu: support ASPM for some specific ASIC >> drm/amdgpu: add SMUIO 11.0.6 register headers >> drm/amdgpu: implement smuio v11_0_6 callbacks >>
Re: [pull] amdgpu, amdkfd, radeon drm-next-5.12
On Thu, Feb 18, 2021 at 11:15 PM Alex Deucher wrote: > > Hi Dave, Daniel, > > Fixes for 5.12. > > The following changes since commit 4c3a3292730c56591472717d8c5c0faf74f6c6bb: > > drm/amd/display: fix unused variable warning (2021-02-05 09:49:44 +1000) > > are available in the Git repository at: > > https://gitlab.freedesktop.org/agd5f/linux.git > tags/amd-drm-next-5.12-2021-02-18 > > for you to fetch changes up to 6e80fb8ab04f6c4f377e2fd422bdd1855beb7371: > > drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2) (2021-02-18 > 16:43:09 -0500) Pulled into drm-next, with some conflicts, please double-check. I also spotted commit ea3b4242bc9ca197762119382b37e125815bd67f Author: Qingqing Zhuo Date: Tue Feb 9 16:36:41 2021 -0500 drm/amd/display: Fix system hang after multiple hotplugs (v3) I think it would be good if that could use the drm_vblank_work stuff from Lyude instead of hand-rolling your own. -Daniel > > > amd-drm-next-5.12-2021-02-18: > > amdgpu: > - Prefer Bhawan's unused variable fix > - Fixes for high priority queues on gfx8,9 > - swSMU fixes for sienna cichlid > - swSMU fixes for renoir > - mmhub client id fixes for arcturus > - SMUIO fixes for navi family > - swSMU fixes for vangogh > - GPU reset cleanup > - Display fixes > - GFX harvesting fix for sienna cichlid > - Fix reference clock on Renoir > - Misc fixes and cleanups > > amdkfd: > - Fix for unique id query > - Fix recursive lock warnings > > radeon: > - Remove confusing VCE messages on Oland > > > Alex Deucher (16): > Revert "drm/amd/display: fix unused variable warning" > drm/amdgpu/smu12: fix power reporting on renoir > drm/amdgpu/gmc9: fix mmhub client mapping for arcturus > drm/amdgpu/si: minor clean up of reset code > drm/amdgpu/cik: minor clean up of reset code > drm/amdgpu/vi: minor clean up of reset code > drm/amdgpu: add generic pci reset as an option > drm/amdgpu/si: add PCI reset support > drm/amdgpu/soc15: add PCI reset support > drm/amdgpu/nv: add PCI reset support > drm/amdgpu: drop extra drm_kms_helper_poll_enable/disable calls > drm/amdgpu: use runpm flag rather than fbcon for kfd runtime suspend > (v2) > drm/amdgpu: reset runpm flag if device suspend fails > Revert "drm/amd/display: Update NV1x SR latency values" > drm/radeon: OLAND boards don't have VCE > drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2) > > Anthony Koo (1): > drm/amd/display: [FW Promotion] Release 0.0.51 > > Aric Cyr (1): > drm/amd/display: 3.2.122 > > Bhawanpreet Lakha (1): > drm/amd/display: Fix unused variable warning > > Dale Zhao (1): > drm/amd/display: fix type mismatch error for return variable > > Derek Lai (1): > drm/amd/display: Add DIG_CLOCK_PATTERN in the transmitter control > > Eric Yang (1): > drm/amd/display: move edp sink present detection to hw init > > Fangzhi Zuo (1): > drm/amd/display: Add return code instead of boolean for future use > > Felix Kuehling (1): > drm/amdkfd: Fix recursive lock warnings > > Gustavo A. R. Silva (1): > drm/amd/display: Fix potential integer overflow > > Jan Kokemüller (1): > drm/amd/display: Add FPU wrappers to dcn21_validate_bandwidth() > > Jiapeng Chong (2): > drm/amd/display: Simplify bool comparison > drm/radeon: Simplify bool comparison > > Jiawei Gu (1): > drm/amdgpu: extend MAX_KIQ_REG_TRY to 1000 > > Jun Lei (1): > drm/amd/display: revert support for DID2.0 dsc passthrough > > Kenneth Feng (3): > drm/amd/pm: enable ACDC feature > drm/amd/pm: enable DCS > drm/amd/pm: enable LCLK DS > > Kent Russell (1): > drm/amdkfd: Get unique_id dynamically v2 > > Kevin Wang (2): > drm/amd/pm/swsmu: unify the init soft gpu metrics function > drm/amdgpu: optimize list operation in amdgpu_xgmi > > Lang Yu (1): > drm/amd/display: fix 64bit division issue on 32bit OS > > Likun Gao (5): > drm/amdgpu: support ASPM for some specific ASIC > drm/amdgpu: add SMUIO 11.0.6 register headers > drm/amdgpu: implement smuio v11_0_6 callbacks > drm/amdgpu: switch to use smuio callbacks for NV family > drm/amdgpu: support rom clockgating related function for NV family > > Marek Olšák (1): > drm/amdgpu: fix CGTS_TCC_DISABLE register offset on gfx10.3 > > Nirmoy Das (6): > drm/amdgpu: cleanup struct amdgpu_ring > drm/amdgpu: enable only one high prio compute queue > drm/amdgpu: add wave limit functionality for gfx8,9 > drm/amdgpu: enable gfx wave limiting for high priority compute jobs > drm/amdgpu: enable wave limit on non high prio cs pipes > drm/amdgpu/display: remove hdcp_srm sysfs on device removal > > Qingqing Zhuo (1): > drm/amd/display: DP HDCP Compliance 1A-08/09 tests
[pull] amdgpu, amdkfd, radeon drm-next-5.12
Hi Dave, Daniel, Fixes for 5.12. The following changes since commit 4c3a3292730c56591472717d8c5c0faf74f6c6bb: drm/amd/display: fix unused variable warning (2021-02-05 09:49:44 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.12-2021-02-18 for you to fetch changes up to 6e80fb8ab04f6c4f377e2fd422bdd1855beb7371: drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2) (2021-02-18 16:43:09 -0500) amd-drm-next-5.12-2021-02-18: amdgpu: - Prefer Bhawan's unused variable fix - Fixes for high priority queues on gfx8,9 - swSMU fixes for sienna cichlid - swSMU fixes for renoir - mmhub client id fixes for arcturus - SMUIO fixes for navi family - swSMU fixes for vangogh - GPU reset cleanup - Display fixes - GFX harvesting fix for sienna cichlid - Fix reference clock on Renoir - Misc fixes and cleanups amdkfd: - Fix for unique id query - Fix recursive lock warnings radeon: - Remove confusing VCE messages on Oland Alex Deucher (16): Revert "drm/amd/display: fix unused variable warning" drm/amdgpu/smu12: fix power reporting on renoir drm/amdgpu/gmc9: fix mmhub client mapping for arcturus drm/amdgpu/si: minor clean up of reset code drm/amdgpu/cik: minor clean up of reset code drm/amdgpu/vi: minor clean up of reset code drm/amdgpu: add generic pci reset as an option drm/amdgpu/si: add PCI reset support drm/amdgpu/soc15: add PCI reset support drm/amdgpu/nv: add PCI reset support drm/amdgpu: drop extra drm_kms_helper_poll_enable/disable calls drm/amdgpu: use runpm flag rather than fbcon for kfd runtime suspend (v2) drm/amdgpu: reset runpm flag if device suspend fails Revert "drm/amd/display: Update NV1x SR latency values" drm/radeon: OLAND boards don't have VCE drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2) Anthony Koo (1): drm/amd/display: [FW Promotion] Release 0.0.51 Aric Cyr (1): drm/amd/display: 3.2.122 Bhawanpreet Lakha (1): drm/amd/display: Fix unused variable warning Dale Zhao (1): drm/amd/display: fix type mismatch error for return variable Derek Lai (1): drm/amd/display: Add DIG_CLOCK_PATTERN in the transmitter control Eric Yang (1): drm/amd/display: move edp sink present detection to hw init Fangzhi Zuo (1): drm/amd/display: Add return code instead of boolean for future use Felix Kuehling (1): drm/amdkfd: Fix recursive lock warnings Gustavo A. R. Silva (1): drm/amd/display: Fix potential integer overflow Jan Kokemüller (1): drm/amd/display: Add FPU wrappers to dcn21_validate_bandwidth() Jiapeng Chong (2): drm/amd/display: Simplify bool comparison drm/radeon: Simplify bool comparison Jiawei Gu (1): drm/amdgpu: extend MAX_KIQ_REG_TRY to 1000 Jun Lei (1): drm/amd/display: revert support for DID2.0 dsc passthrough Kenneth Feng (3): drm/amd/pm: enable ACDC feature drm/amd/pm: enable DCS drm/amd/pm: enable LCLK DS Kent Russell (1): drm/amdkfd: Get unique_id dynamically v2 Kevin Wang (2): drm/amd/pm/swsmu: unify the init soft gpu metrics function drm/amdgpu: optimize list operation in amdgpu_xgmi Lang Yu (1): drm/amd/display: fix 64bit division issue on 32bit OS Likun Gao (5): drm/amdgpu: support ASPM for some specific ASIC drm/amdgpu: add SMUIO 11.0.6 register headers drm/amdgpu: implement smuio v11_0_6 callbacks drm/amdgpu: switch to use smuio callbacks for NV family drm/amdgpu: support rom clockgating related function for NV family Marek Olšák (1): drm/amdgpu: fix CGTS_TCC_DISABLE register offset on gfx10.3 Nirmoy Das (6): drm/amdgpu: cleanup struct amdgpu_ring drm/amdgpu: enable only one high prio compute queue drm/amdgpu: add wave limit functionality for gfx8,9 drm/amdgpu: enable gfx wave limiting for high priority compute jobs drm/amdgpu: enable wave limit on non high prio cs pipes drm/amdgpu/display: remove hdcp_srm sysfs on device removal Qingqing Zhuo (1): drm/amd/display: DP HDCP Compliance 1A-08/09 tests fail Tao Zhou (1): drm/amdgpu: enable gpu recovery for dimgrey_cavefish Tian Tao (1): drm/amdgpu: fix unnecessary NULL check warnings Wayne Lin (2): drm/amdgpu: Add otg vertical IRQ Source drm/amd/display: Add otg vertical interrupt0 support in DCN1.0 Wesley Chalmers (1): drm/amd/display: DIO Supported for virtual displays Wyatt Wood (1): drm/amd/display: Initialize dmub_rb_cmd unions to 0 Xiaojian Du (1): drm/amd/pm: make the error log more clear for fine grain tuning function Xiaomeng Hou (3): drm/amd/pm: update the smu v11.5 smc header for vangogh drm/amd/pm: modify the power limit level parameter from bool to
