mbox series

[pull] amdgpu, amdkfd drm-fixes-6.3

Message ID 20230309043816.7840-1-alexander.deucher@amd.com (mailing list archive)
State New, archived
Headers show
Series [pull] amdgpu, amdkfd drm-fixes-6.3 | expand

Pull-request

https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-6.3-2023-03-08

Message

Alex Deucher March 9, 2023, 4:38 a.m. UTC
Hi Dave, Daniel,

Fixes for 6.3.

The following changes since commit 66305069eb6d17d9190cbcd196f3f7487df47ae8:

  Merge tag 'drm-misc-fixes-2023-02-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2023-03-07 05:42:34 +1000)

are available in the Git repository at:

  https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-6.3-2023-03-08

for you to fetch changes up to 41f95a0e40903fcf70463fcc060b7faf761b23f6:

  drm/amdgpu/soc21: Add video cap query support for VCN_4_0_4 (2023-03-08 14:39:09 -0500)

----------------------------------------------------------------
amd-drm-fixes-6.3-2023-03-08:

amdgpu:
- Misc display fixes
- UMC 8.10 fixes
- Driver unload fixes
- NBIO 7.3.0 fix
- Error checking fixes for soc15, nv, soc21 read register interface
- Fix video cap query for VCN 4.0.4

amdkfd:
- Fix BO offset for multi-VMA page migration
- Fix return check in doorbell handling

----------------------------------------------------------------
Alex Deucher (3):
      drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc15
      drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc21
      drm/amdgpu: fix error checking in amdgpu_read_mm_registers for nv

Candice Li (2):
      drm/amdgpu: Support umc node harvest config on umc v8_10
      drm/amd/pm: Enable ecc_info table support for smu v13_0_10

Harry Wentland (2):
      drm/display: Don't block HDR_OUTPUT_METADATA on unknown EOTF
      drm/connector: print max_requested_bpc in state debugfs

Mario Limonciello (1):
      drm/amd: Fix initialization mistake for NBIO 7.3.0

Shashank Sharma (1):
      drm/amdgpu: fix return value check in kfd

Swapnil Patel (1):
      drm/amd/display: Update clock table to include highest clock setting

Veerabadhran Gopalakrishnan (1):
      drm/amdgpu/soc21: Add video cap query support for VCN_4_0_4

Xiaogang Chen (1):
      drm/amdkfd: Fix BO offset for multi-VMA page migration

lyndonli (2):
      drm/amdgpu: Fix call trace warning and hang when removing amdgpu device
      drm/amdgpu: Fix the warning info when removing amdgpu device

 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      | 10 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            | 17 +----
 drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h            |  7 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c             |  1 -
 drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c             | 14 ++--
 drivers/gpu/drm/amd/amdgpu/nv.c                    |  7 +-
 drivers/gpu/drm/amd/amdgpu/soc15.c                 |  5 +-
 drivers/gpu/drm/amd/amdgpu/soc21.c                 |  8 ++-
 drivers/gpu/drm/amd/amdgpu/umc_v8_10.h             |  4 +-
 drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c          |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c           | 17 +++--
 .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 19 +++++-
 .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c   | 75 ++++++++++++++++++++++
 drivers/gpu/drm/display/drm_hdmi_helper.c          |  6 +-
 drivers/gpu/drm/drm_atomic.c                       |  1 +
 16 files changed, 146 insertions(+), 49 deletions(-)

Comments

Felix Kuehling March 9, 2023, 5:15 p.m. UTC | #1
Am 2023-03-08 um 23:38 schrieb Alex Deucher:
> Hi Dave, Daniel,
>
> Fixes for 6.3.
>
> The following changes since commit 66305069eb6d17d9190cbcd196f3f7487df47ae8:
>
>    Merge tag 'drm-misc-fixes-2023-02-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2023-03-07 05:42:34 +1000)
>
> are available in the Git repository at:
>
>    https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-6.3-2023-03-08
>
> for you to fetch changes up to 41f95a0e40903fcf70463fcc060b7faf761b23f6:
>
>    drm/amdgpu/soc21: Add video cap query support for VCN_4_0_4 (2023-03-08 14:39:09 -0500)
>
> ----------------------------------------------------------------
> amd-drm-fixes-6.3-2023-03-08:
>
> amdgpu:
> - Misc display fixes
> - UMC 8.10 fixes
> - Driver unload fixes
> - NBIO 7.3.0 fix
> - Error checking fixes for soc15, nv, soc21 read register interface
> - Fix video cap query for VCN 4.0.4
>
> amdkfd:
> - Fix BO offset for multi-VMA page migration
> - Fix return check in doorbell handling
>
> ----------------------------------------------------------------
> Alex Deucher (3):
>        drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc15
>        drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc21
>        drm/amdgpu: fix error checking in amdgpu_read_mm_registers for nv
>
> Candice Li (2):
>        drm/amdgpu: Support umc node harvest config on umc v8_10
>        drm/amd/pm: Enable ecc_info table support for smu v13_0_10
>
> Harry Wentland (2):
>        drm/display: Don't block HDR_OUTPUT_METADATA on unknown EOTF
>        drm/connector: print max_requested_bpc in state debugfs
>
> Mario Limonciello (1):
>        drm/amd: Fix initialization mistake for NBIO 7.3.0
>
> Shashank Sharma (1):
>        drm/amdgpu: fix return value check in kfd
>
> Swapnil Patel (1):
>        drm/amd/display: Update clock table to include highest clock setting
>
> Veerabadhran Gopalakrishnan (1):
>        drm/amdgpu/soc21: Add video cap query support for VCN_4_0_4
>
> Xiaogang Chen (1):
>        drm/amdkfd: Fix BO offset for multi-VMA page migration

This patch introduced a regression. Xiaogang is working on a followup 
fix. I would recommend not to merge it yet.

Xiaogang, please add a Fixes tag to your follow-up patch to make the 
connection clear.

Thanks,
   Felix


>
> lyndonli (2):
>        drm/amdgpu: Fix call trace warning and hang when removing amdgpu device
>        drm/amdgpu: Fix the warning info when removing amdgpu device
>
>   drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      | 10 ++-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |  2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            | 17 +----
>   drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h            |  7 +-
>   drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c             |  1 -
>   drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c             | 14 ++--
>   drivers/gpu/drm/amd/amdgpu/nv.c                    |  7 +-
>   drivers/gpu/drm/amd/amdgpu/soc15.c                 |  5 +-
>   drivers/gpu/drm/amd/amdgpu/soc21.c                 |  8 ++-
>   drivers/gpu/drm/amd/amdgpu/umc_v8_10.h             |  4 +-
>   drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c          |  2 +-
>   drivers/gpu/drm/amd/amdkfd/kfd_migrate.c           | 17 +++--
>   .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 19 +++++-
>   .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c   | 75 ++++++++++++++++++++++
>   drivers/gpu/drm/display/drm_hdmi_helper.c          |  6 +-
>   drivers/gpu/drm/drm_atomic.c                       |  1 +
>   16 files changed, 146 insertions(+), 49 deletions(-)
Alex Deucher March 9, 2023, 5:32 p.m. UTC | #2
On Thu, Mar 9, 2023 at 12:16 PM Felix Kuehling <felix.kuehling@amd.com> wrote:
>
>
> Am 2023-03-08 um 23:38 schrieb Alex Deucher:
> > Hi Dave, Daniel,
> >
> > Fixes for 6.3.
> >
> > The following changes since commit 66305069eb6d17d9190cbcd196f3f7487df47ae8:
> >
> >    Merge tag 'drm-misc-fixes-2023-02-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2023-03-07 05:42:34 +1000)
> >
> > are available in the Git repository at:
> >
> >    https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-6.3-2023-03-08
> >
> > for you to fetch changes up to 41f95a0e40903fcf70463fcc060b7faf761b23f6:
> >
> >    drm/amdgpu/soc21: Add video cap query support for VCN_4_0_4 (2023-03-08 14:39:09 -0500)
> >
> > ----------------------------------------------------------------
> > amd-drm-fixes-6.3-2023-03-08:
> >
> > amdgpu:
> > - Misc display fixes
> > - UMC 8.10 fixes
> > - Driver unload fixes
> > - NBIO 7.3.0 fix
> > - Error checking fixes for soc15, nv, soc21 read register interface
> > - Fix video cap query for VCN 4.0.4
> >
> > amdkfd:
> > - Fix BO offset for multi-VMA page migration
> > - Fix return check in doorbell handling
> >
> > ----------------------------------------------------------------
> > Alex Deucher (3):
> >        drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc15
> >        drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc21
> >        drm/amdgpu: fix error checking in amdgpu_read_mm_registers for nv
> >
> > Candice Li (2):
> >        drm/amdgpu: Support umc node harvest config on umc v8_10
> >        drm/amd/pm: Enable ecc_info table support for smu v13_0_10
> >
> > Harry Wentland (2):
> >        drm/display: Don't block HDR_OUTPUT_METADATA on unknown EOTF
> >        drm/connector: print max_requested_bpc in state debugfs
> >
> > Mario Limonciello (1):
> >        drm/amd: Fix initialization mistake for NBIO 7.3.0
> >
> > Shashank Sharma (1):
> >        drm/amdgpu: fix return value check in kfd
> >
> > Swapnil Patel (1):
> >        drm/amd/display: Update clock table to include highest clock setting
> >
> > Veerabadhran Gopalakrishnan (1):
> >        drm/amdgpu/soc21: Add video cap query support for VCN_4_0_4
> >
> > Xiaogang Chen (1):
> >        drm/amdkfd: Fix BO offset for multi-VMA page migration
>
> This patch introduced a regression. Xiaogang is working on a followup
> fix. I would recommend not to merge it yet.
>
> Xiaogang, please add a Fixes tag to your follow-up patch to make the
> connection clear.

Thanks.  If it lands today, I'll send an updated PR with the fix.  If
not, I'll send an updated PR with this patch dropped.

Alex


>
> Thanks,
>    Felix
>
>
> >
> > lyndonli (2):
> >        drm/amdgpu: Fix call trace warning and hang when removing amdgpu device
> >        drm/amdgpu: Fix the warning info when removing amdgpu device
> >
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      | 10 ++-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |  2 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            | 17 +----
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h            |  7 +-
> >   drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c             |  1 -
> >   drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c             | 14 ++--
> >   drivers/gpu/drm/amd/amdgpu/nv.c                    |  7 +-
> >   drivers/gpu/drm/amd/amdgpu/soc15.c                 |  5 +-
> >   drivers/gpu/drm/amd/amdgpu/soc21.c                 |  8 ++-
> >   drivers/gpu/drm/amd/amdgpu/umc_v8_10.h             |  4 +-
> >   drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c          |  2 +-
> >   drivers/gpu/drm/amd/amdkfd/kfd_migrate.c           | 17 +++--
> >   .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 19 +++++-
> >   .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c   | 75 ++++++++++++++++++++++
> >   drivers/gpu/drm/display/drm_hdmi_helper.c          |  6 +-
> >   drivers/gpu/drm/drm_atomic.c                       |  1 +
> >   16 files changed, 146 insertions(+), 49 deletions(-)
Chen, Xiaogang March 9, 2023, 6:04 p.m. UTC | #3
On 3/9/2023 11:32 AM, Alex Deucher wrote:
> Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.
>
>
> On Thu, Mar 9, 2023 at 12:16 PM Felix Kuehling <felix.kuehling@amd.com> wrote:
>>
>> Am 2023-03-08 um 23:38 schrieb Alex Deucher:
>>> Hi Dave, Daniel,
>>>
>>> Fixes for 6.3.
>>>
>>> The following changes since commit 66305069eb6d17d9190cbcd196f3f7487df47ae8:
>>>
>>>     Merge tag 'drm-misc-fixes-2023-02-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2023-03-07 05:42:34 +1000)
>>>
>>> are available in the Git repository at:
>>>
>>>     https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-6.3-2023-03-08
>>>
>>> for you to fetch changes up to 41f95a0e40903fcf70463fcc060b7faf761b23f6:
>>>
>>>     drm/amdgpu/soc21: Add video cap query support for VCN_4_0_4 (2023-03-08 14:39:09 -0500)
>>>
>>> ----------------------------------------------------------------
>>> amd-drm-fixes-6.3-2023-03-08:
>>>
>>> amdgpu:
>>> - Misc display fixes
>>> - UMC 8.10 fixes
>>> - Driver unload fixes
>>> - NBIO 7.3.0 fix
>>> - Error checking fixes for soc15, nv, soc21 read register interface
>>> - Fix video cap query for VCN 4.0.4
>>>
>>> amdkfd:
>>> - Fix BO offset for multi-VMA page migration
>>> - Fix return check in doorbell handling
>>>
>>> ----------------------------------------------------------------
>>> Alex Deucher (3):
>>>         drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc15
>>>         drm/amdgpu: fix error checking in amdgpu_read_mm_registers for soc21
>>>         drm/amdgpu: fix error checking in amdgpu_read_mm_registers for nv
>>>
>>> Candice Li (2):
>>>         drm/amdgpu: Support umc node harvest config on umc v8_10
>>>         drm/amd/pm: Enable ecc_info table support for smu v13_0_10
>>>
>>> Harry Wentland (2):
>>>         drm/display: Don't block HDR_OUTPUT_METADATA on unknown EOTF
>>>         drm/connector: print max_requested_bpc in state debugfs
>>>
>>> Mario Limonciello (1):
>>>         drm/amd: Fix initialization mistake for NBIO 7.3.0
>>>
>>> Shashank Sharma (1):
>>>         drm/amdgpu: fix return value check in kfd
>>>
>>> Swapnil Patel (1):
>>>         drm/amd/display: Update clock table to include highest clock setting
>>>
>>> Veerabadhran Gopalakrishnan (1):
>>>         drm/amdgpu/soc21: Add video cap query support for VCN_4_0_4
>>>
>>> Xiaogang Chen (1):
>>>         drm/amdkfd: Fix BO offset for multi-VMA page migration
>> This patch introduced a regression. Xiaogang is working on a followup
>> fix. I would recommend not to merge it yet.
>>
>> Xiaogang, please add a Fixes tag to your follow-up patch to make the
>> connection clear.
> Thanks.  If it lands today, I'll send an updated PR with the fix.  If
> not, I'll send an updated PR with this patch dropped.
>
> Alex
>
Will do it today and let you know.

Xiaogang

>> Thanks,
>>     Felix
>>
>>
>>> lyndonli (2):
>>>         drm/amdgpu: Fix call trace warning and hang when removing amdgpu device
>>>         drm/amdgpu: Fix the warning info when removing amdgpu device
>>>
>>>    drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      | 10 ++-
>>>    drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |  2 +-
>>>    drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            | 17 +----
>>>    drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h            |  7 +-
>>>    drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c             |  1 -
>>>    drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c             | 14 ++--
>>>    drivers/gpu/drm/amd/amdgpu/nv.c                    |  7 +-
>>>    drivers/gpu/drm/amd/amdgpu/soc15.c                 |  5 +-
>>>    drivers/gpu/drm/amd/amdgpu/soc21.c                 |  8 ++-
>>>    drivers/gpu/drm/amd/amdgpu/umc_v8_10.h             |  4 +-
>>>    drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c          |  2 +-
>>>    drivers/gpu/drm/amd/amdkfd/kfd_migrate.c           | 17 +++--
>>>    .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 19 +++++-
>>>    .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c   | 75 ++++++++++++++++++++++
>>>    drivers/gpu/drm/display/drm_hdmi_helper.c          |  6 +-
>>>    drivers/gpu/drm/drm_atomic.c                       |  1 +
>>>    16 files changed, 146 insertions(+), 49 deletions(-)