mbox series

[git,pull] drm fixes for 6.15-rc1

Message ID CAPM=9tw5SBS_P1oX+ySAhNx-M_NeO4RzK249i6vtwSU0V4mbDA@mail.gmail.com (mailing list archive)
State New
Headers show
Series [git,pull] drm fixes for 6.15-rc1 | expand

Pull-request

https://gitlab.freedesktop.org/drm/kernel.git tags/drm-next-2025-04-05

Message

Dave Airlie April 5, 2025, 9:51 p.m. UTC
(resend including Linus this time, autocomplete picked the mailing list)

Hi Linus,

Weekly fixes, mostly from the end of last week, this week was very
quiet, maybe you scared everyone away. I probably should have
highlighted Jani's work more closely, but it never occured that anyone
would willingingly build a kernel without O=../toilet-builddir. This
doesn't contain any fixes for that stuff, Jani is working on it, and
hopefully you can help that make forward progress.

As for this, it's mostly amdgpu, and xe, with some i915, adp and
bridge bits, since I think this is overly quiet I'd expect rc2 to be a
bit more lively.

Regards,
Dave.

drm-next-2025-04-05:
drm fixes for 6.15-rc1

bridge:
- tda998x: Select CONFIG_DRM_KMS_HELPER

amdgpu:
- Guard against potential division by 0 in fan code
- Zero RPM support for SMU 14.0.2
- Properly handle SI and CIK support being disabled
- PSR fixes
- DML2 fixes
- DP Link training fix
- Vblank fixes
- RAS fixes
- Partitioning fix
- SDMA fix
- SMU 13.0.x fixes
- Rom fetching fix
- MES fixes
- Queue reset fix

xe:
- Fix NULL pointer dereference on error path
- Add missing HW workaround for BMG
- Fix survivability mode not triggering
- Fix build warning when DRM_FBDEV_EMULATION is not set

i915:
- Bounds check for scalers in DSC prefill latency computation
- Fix build by adding a missing include

adp:
- Fix error handling in plane setup
The following changes since commit cf05922d63e2ae6a9b1b52ff5236a44c3b29f78c:

  Merge tag 'drm-intel-gt-next-2025-03-12' of
https://gitlab.freedesktop.org/drm/i915/kernel into drm-next
(2025-03-25 08:21:07 +1000)

are available in the Git repository at:

  https://gitlab.freedesktop.org/drm/kernel.git tags/drm-next-2025-04-05

for you to fetch changes up to e2cb28ea3e01cb25095d1a341459901363dc39e9:

  Merge tag 'drm-misc-next-fixes-2025-04-04' of
https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
(2025-04-05 06:28:03 +1000)

----------------------------------------------------------------
drm fixes for 6.15-rc1

bridge:
- tda998x: Select CONFIG_DRM_KMS_HELPER

amdgpu:
- Guard against potential division by 0 in fan code
- Zero RPM support for SMU 14.0.2
- Properly handle SI and CIK support being disabled
- PSR fixes
- DML2 fixes
- DP Link training fix
- Vblank fixes
- RAS fixes
- Partitioning fix
- SDMA fix
- SMU 13.0.x fixes
- Rom fetching fix
- MES fixes
- Queue reset fix

xe:
- Fix NULL pointer dereference on error path
- Add missing HW workaround for BMG
- Fix survivability mode not triggering
- Fix build warning when DRM_FBDEV_EMULATION is not set

i915:
- Bounds check for scalers in DSC prefill latency computation
- Fix build by adding a missing include

adp:
- Fix error handling in plane setup

----------------------------------------------------------------
Alex Deucher (2):
      drm/amdgpu/gfx11: fix num_mec
      drm/amdgpu/gfx12: fix num_mec

Ankit Nautiyal (1):
      drm/i915/watermark: Check bounds for scaler_users for dsc prefill latency

Arnd Bergmann (1):
      drm/i2c: tda998x: select CONFIG_DRM_KMS_HELPER

Asad Kamal (3):
      drm/amd/pm: Remove host limit metrics support
      drm/amd/pm: Update smu metrics table for smu_v13_0_6
      drm/amd/pm: Add gpu_metrics_v1_8

Brendan Tam (1):
      drm/amd/display: prevent hang on link training fail

Candice Li (1):
      Remove unnecessary firmware version check for gc v9_4_2

Charlene Liu (1):
      Revert "drm/amd/display: dml2 soc dscclk use DPM table clk setting"

Christian König (1):
      drm/amdgpu: stop unmapping MQD for kernel queues v3

Dan Carpenter (1):
      drm: adp: Fix NULL vs IS_ERR() check in adp_plane_new()

Dave Airlie (5):
      Merge tag 'drm-misc-next-fixes-2025-03-27' of
https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
      Merge tag 'drm-intel-next-fixes-2025-03-25' of
https://gitlab.freedesktop.org/drm/i915/kernel into drm-next
      Merge tag 'drm-xe-next-fixes-2025-03-27' of
https://gitlab.freedesktop.org/drm/xe/kernel into drm-next
      Merge tag 'amd-drm-next-6.15-2025-03-27' of
https://gitlab.freedesktop.org/agd5f/linux into drm-next
      Merge tag 'drm-misc-next-fixes-2025-04-04' of
https://gitlab.freedesktop.org/drm/misc/kernel into drm-next

Denis Arefev (5):
      drm/amd/pm: Prevent division by zero
      drm/amd/pm: Prevent division by zero
      drm/amd/pm: Prevent division by zero
      drm/amd/pm: Prevent division by zero
      drm/amd/pm: Prevent division by zero

Harish Chegondi (1):
      drm/xe/eustall: Fix a possible pointer dereference after free

Jesse.zhang@amd.com (1):
      Revert "drm/amdgpu/sdma_v4_4_2: update VM flush implementation for SDMA"

Leo Li (2):
      drm/amd/display: Increase vblank offdelay for PSR panels
      drm/amd/display: Actually do immediate vblank disable

Lijo Lazar (2):
      drm/amdgpu: Add NPS2 to DPX compatible mode
      drm/amdgpu: Prefer shadow rom when available

Lucas De Marchi (2):
      drm/xe: Move survivability back to xe
      drm/xe: Set survivability mode before heci init

Mario Limonciello (1):
      drm/amd: Handle being compiled without SI or CIK support better

Michal Wajdeczko (1):
      drm/xe/vf: Don't check CTC_MODE[0] if VF

Stanley.Yang (1):
      drm/amdgpu: Update ta ras block

Tomasz Pakuła (1):
      drm/amd/pm: Add zero RPM enabled OD setting support for SMU14.0.2

Vinay Belgaumkar (1):
      drm/xe: Apply Wa_16023105232

Xiang Liu (2):
      drm/amdgpu: Use correct gfx deferred error count
      drm/amdgpu: Parse all deferred errors with UMC aca handle

Yue Haibing (2):
      drm/i915/display: Fix build error without DRM_FBDEV_EMULATION
      drm/xe: Fix unmet direct dependencies warning

 drivers/gpu/drm/adp/adp_drv.c                      |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c            |   4 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h            |   8 --
 drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c           |  34 ++++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |  44 ++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            |   1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h            |   7 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c           |  58 ++---------
 drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c           |   2 +-
 drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c         |   3 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c             |  88 ++--------------
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c             |  90 ++--------------
 drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c             | 104 +++----------------
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c              |  45 +-------
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |  58 ++---------
 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c            |  66 +++---------
 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c           |   2 +-
 drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c            |   2 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c           |  79 +++-----------
 drivers/gpu/drm/amd/amdgpu/ta_ras_if.h             |   3 +
 drivers/gpu/drm/amd/amdgpu/umc_v12_0.c             |   3 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c            |   2 +-
 drivers/gpu/drm/amd/amdgpu/vega10_sdma_pkt_open.h  |  70 -------------
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |  41 ++++++--
 .../amd/display/dc/dml2/dml2_translation_helper.c  |   2 +-
 .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c    |   6 +-
 .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c  |   7 +-
 drivers/gpu/drm/amd/include/kgd_pp_interface.h     | 114 +++++++++++++++++++++
 .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c  |   4 +-
 .../drm/amd/pm/powerplay/hwmgr/vega10_thermal.c    |   4 +-
 .../drm/amd/pm/powerplay/hwmgr/vega20_thermal.c    |   2 +-
 .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h    |   7 +-
 drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c  |   3 +
 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c     |   2 +-
 .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c   |  15 ---
 .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c   |  55 +++++++++-
 drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c             |   3 +
 drivers/gpu/drm/bridge/Kconfig                     |  13 +--
 drivers/gpu/drm/i915/display/intel_fbdev.h         |   2 +
 drivers/gpu/drm/i915/display/skl_watermark.c       |   5 +-
 drivers/gpu/drm/xe/Kconfig                         |   2 +-
 drivers/gpu/drm/xe/regs/xe_engine_regs.h           |   4 +
 drivers/gpu/drm/xe/xe_device.c                     |  17 ++-
 drivers/gpu/drm/xe/xe_eu_stall.c                   |   8 +-
 drivers/gpu/drm/xe/xe_gt_clock.c                   |  54 +++++++---
 drivers/gpu/drm/xe/xe_gt_types.h                   |   2 +
 drivers/gpu/drm/xe/xe_hw_engine.c                  |  33 ++++++
 drivers/gpu/drm/xe/xe_pci.c                        |  16 ++-
 drivers/gpu/drm/xe/xe_survivability_mode.c         |  31 ++++--
 drivers/gpu/drm/xe/xe_survivability_mode.h         |   1 -
 drivers/gpu/drm/xe/xe_wa.c                         |   6 ++
 drivers/gpu/drm/xe/xe_wa_oob.rules                 |   2 +
 52 files changed, 537 insertions(+), 701 deletions(-)

Comments

Linus Torvalds April 5, 2025, 10:34 p.m. UTC | #1
I was going to report this separately, but then the pull came in, so
I'm just replying to that one instead...

On Sat, 5 Apr 2025 at 14:51, Dave Airlie <airlied@gmail.com> wrote:
>
> amdgpu:

Does any of this happen to fix this (repeated a couple of hundred
times each time):

  [drm] scheduler comp_1.1.1 is not ready, skipping
  [drm] scheduler comp_1.3.0 is not ready, skipping
  [drm] scheduler comp_1.0.1 is not ready, skipping

which seems to happen on my machine when the display goes to sleep and
then comes back from low-power state.

It also seems to make the power resume quite a bit slower. Everything
still seems to *work*, just annoying messages and an extra several
seconds of black screen...

This is on my threadripper with the same ancient "Sapphire Pulse RX
580 8GB" or whatever it is. lspci calls it "Ellesmere [Radeon RX
470/480/570/570X/580/580X/590] (rev e7)"

I will be pulling and testing, but I thought I'd mention this issue regardless.

                Linus
pr-tracker-bot@kernel.org April 5, 2025, 10:50 p.m. UTC | #2
The pull request you sent on Sun, 6 Apr 2025 07:51:03 +1000:

> https://gitlab.freedesktop.org/drm/kernel.git tags/drm-next-2025-04-05

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/758e4c86a159bdd67a8ef60ea118ddb8b2043714

Thank you!
Linus Torvalds April 5, 2025, 11:18 p.m. UTC | #3
On Sat, 5 Apr 2025 at 15:34, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> Does any of this happen to fix this (repeated a couple of hundred
> times each time):
>
>   [drm] scheduler comp_1.1.1 is not ready, skipping
>   [drm] scheduler comp_1.3.0 is not ready, skipping
>   [drm] scheduler comp_1.0.1 is not ready, skipping
>
> which seems to happen on my machine when the display goes to sleep and
> then comes back from low-power state.

Seems to be fixed. Knock wood. I'm not entirely sure it was 100%
reproducible (and it wasn't just the display that went to sleep, it
was the whole machine that suspended).

            Linus