Commit e332935a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2025-06-06' of https://gitlab.freedesktop.org/drm/kernel 

Pull drm fixes from Dave Airlie:
 "This is pretty much two weeks worth of fixes, plus one thing that
  might be considered next: amdkfd is now able to be enabled on risc-v
  platforms.

  Otherwise, amdgpu and xe with the majority of fixes, and then a
  smattering all over.

  panel:
   - nt37801: fix IS_ERR
   - nt37801: fix KConfig

  connector:
   - Fix null deref in HDMI audio helper.

  bridge:
   - analogix_dp: fixup clk-disable removal

  nouveau:
   - minor typo fix (',' vs ';')

  msm:
   - mailmap updates

  i915:
   - Fix the enabling/disabling of DP audio SDP splitting
   - Fix PSR register definitions for ALPM
   - Fix u32 overflow in SNPS PHY HDMI PLL setup
   - Fix GuC pending message underflow when submit fails
   - Fix GuC wakeref underflow race during reset

  xe:
   - Two documentation fixes
   - A couple of vm init fixes
   - Hwmon fixes
   - Drop reduntant conversion to bool
   - Fix CONFIG_INTEL_VSEC dependency
   - Rework eviction rejection of bound external bos
   - Stop re-submitting signalled jobs
   - A couple of pxp fixes
   - Add back a fix that got lost in a merge
   - Create LRC bo without VM
   - Fix for the above fix

  amdgpu:
   - UserQ fixes
   - SMU 13.x fixes
   - VCN fixes
   - JPEG fixes
   - Misc cleanups
   - runtime pm fix
   - DCN 4.0.1 fixes
   - Misc display fixes
   - ISP fix
   - VRAM manager fix
   - RAS fixes
   - IP discovery fix
   - Cleaner shader fix for GC 10.1.x
   - OD fix
   - Non-OLED panel fix
   - Misc display fixes
   - Brightness fixes

  amdkfd:
   - Enable CONFIG_HSA_AMD on RISCV
   - SVM fix
   - Misc cleanups
   - Ref leak fix
   - WPTR BO fix

  radeon:
   - Misc cleanups"

* tag 'drm-next-2025-06-06' of https://gitlab.freedesktop.org/drm/kernel: (105 commits)
  drm/nouveau/vfn/r535: Convert comma to semicolon
  drm/xe: remove unmatched xe_vm_unlock() from __xe_exec_queue_init()
  drm/xe: Create LRC BO without VM
  drm/xe/guc_submit: add back fix
  drm/xe/pxp: Clarify PXP queue creation behavior if PXP is not ready
  drm/xe/pxp: Use the correct define in the set_property_funcs array
  drm/xe/sched: stop re-submitting signalled jobs
  drm/xe: Rework eviction rejection of bound external bos
  drm/xe/vsec: fix CONFIG_INTEL_VSEC dependency
  drm/xe: drop redundant conversion to bool
  drm/xe/hwmon: Move card reactive critical power under channel card
  drm/xe/hwmon: Add support to manage power limits though mailbox
  drm/xe/vm: move xe_svm_init() earlier
  drm/xe/vm: move rebind_work init earlier
  MAINTAINERS: .mailmap: update Rob Clark's email address
  mailmap: Update entry for Akhil P Oommen
  MAINTAINERS: update my email address
  MAINTAINERS: drop myself as maintainer
  drm/i915/display: Fix u32 overflow in SNPS PHY HDMI PLL setup
  drm/amd/display: Fix default DC and AC levels
  ...
parents 67faad74 04c89707

.mailmap

+4 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ Adam Radford <aradford@gmail.com> 
Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>

Adrian Bunk <bunk@stusta.de>

Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>

Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>

Akhil P Oommen <akhilpo@oss.qualcomm.com> <akhilpo@codeaurora.org>

Akhil P Oommen <akhilpo@oss.qualcomm.com> <quic_akhilpo@quicinc.com>

Alan Cox <alan@lxorguk.ukuu.org.uk>

Alan Cox <root@hraefn.swansea.linux.org.uk>

Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
@@ -640,6 +641,8 @@ Richard Genoud <richard.genoud@bootlin.com> <richard.genoud@gmail.com> 
Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>

Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>

Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>

Rob Clark <robin.clark@oss.qualcomm.com> <robdclark@chromium.org>

Rob Clark <robin.clark@oss.qualcomm.com> <robdclark@gmail.com>

Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>

Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org>

Rodrigo Siqueira <siqueira@igalia.com> <rodrigosiqueiramelo@gmail.com>

Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon

+10 −10
Original line number Diff line number Diff line
@@ -60,26 +60,26 @@ Description: RO. Package default power limit (default TDP setting). 


		Only supported for particular Intel Xe graphics platforms.



What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power2_crit

Date:		February 2024

KernelVersion:	6.8

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_crit

Date:		May 2025

KernelVersion:	6.15

Contact:	intel-xe@lists.freedesktop.org

Description:	RW. Package reactive critical (I1) power limit in microwatts.

Description:	RW. Card reactive critical (I1) power limit in microwatts.



		Package reactive critical (I1) power limit in microwatts is exposed

		Card reactive critical (I1) power limit in microwatts is exposed

		for client products. The power controller will throttle the

		operating frequency if the power averaged over a window exceeds

		this limit.



		Only supported for particular Intel Xe graphics platforms.



What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/curr2_crit

Date:		February 2024

KernelVersion:	6.8

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/curr1_crit

Date:		May 2025

KernelVersion:	6.15

Contact:	intel-xe@lists.freedesktop.org

Description:	RW. Package reactive critical (I1) power limit in milliamperes.

Description:	RW. Card reactive critical (I1) power limit in milliamperes.



		Package reactive critical (I1) power limit in milliamperes is

		Card reactive critical (I1) power limit in milliamperes is

		exposed for server products. The power controller will throttle

		the operating frequency if the power averaged over a window

		exceeds this limit.

Documentation/gpu/xe/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ DG2, etc is provided to prototype the driver. 
   xe_migrate

   xe_cs

   xe_pm

   xe_gt_freq

   xe_pcode

   xe_gt_mcr

   xe_wa

Documentation/gpu/xe/xe_gt_freq.rst

0 → 100644
+14 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: (GPL-2.0+ OR MIT)



==========================

Xe GT Frequency Management

==========================



.. kernel-doc:: drivers/gpu/drm/xe/xe_gt_freq.c

   :doc: Xe GT Frequency Management



Internal API

============



.. kernel-doc:: drivers/gpu/drm/xe/xe_gt_freq.c

   :internal:

MAINTAINERS

+6 −5
Original line number Diff line number Diff line
@@ -7599,7 +7599,7 @@ F: Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml 
F:	drivers/gpu/drm/tiny/panel-mipi-dbi.c









DRM DRIVER for Qualcomm Adreno GPUs









M:	Rob Clark <robdclark@gmail.com>









M:	Rob Clark <robin.clark@oss.qualcomm.com>









R:	Sean Paul <sean@poorly.run>









R:	Konrad Dybcio <konradybcio@kernel.org>









L:	linux-arm-msm@vger.kernel.org








@@ -7618,9 +7618,10 @@ F:	drivers/gpu/drm/msm/registers/adreno/







F:	include/uapi/drm/msm_drm.h

















DRM DRIVER for Qualcomm display hardware









M:	Rob Clark <robdclark@gmail.com>









M:	Abhinav Kumar <quic_abhinavk@quicinc.com>









M:	Rob Clark <robin.clark@oss.qualcomm.com>









M:	Dmitry Baryshkov <lumag@kernel.org>









R:	Abhinav Kumar <abhinav.kumar@linux.dev>









R:	Jessica Zhang <jessica.zhang@oss.qualcomm.com>









R:	Sean Paul <sean@poorly.run>









R:	Marijn Suijten <marijn.suijten@somainline.org>









L:	linux-arm-msm@vger.kernel.org








@@ -20396,7 +20397,7 @@ F:	drivers/soc/qcom/icc-bwmon.c







F:	drivers/soc/qcom/trace_icc-bwmon.h

















QUALCOMM IOMMU









M:	Rob Clark <robdclark@gmail.com>









M:	Rob Clark <robin.clark@oss.qualcomm.com>









L:	iommu@lists.linux.dev









L:	linux-arm-msm@vger.kernel.org









S:	Maintained








@@ -20439,7 +20440,7 @@ F:	drivers/regulator/vqmmc-ipq4019-regulator.c







QUALCOMM IRIS VIDEO ACCELERATOR DRIVER









M:	Vikash Garodia <quic_vgarodia@quicinc.com>









M:	Dikshita Agarwal <quic_dikshita@quicinc.com>









R:	Abhinav Kumar <quic_abhinavk@quicinc.com>









R:	Abhinav Kumar <abhinav.kumar@linux.dev>









R:	Bryan O'Donoghue <bryan.odonoghue@linaro.org>









L:	linux-media@vger.kernel.org









L:	linux-arm-msm@vger.kernel.org