Skip to content

Commit e332935

Browse files
torvaldstorvalds
committed
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 ...
2 parents 67faad7 + 04c8970 commit e332935

File tree

140 files changed

+2314
-633
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+2314
-633
lines changed

‎.mailmap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ Adam Radford <[email protected]>
2121
Adriana Reus <[email protected]> <[email protected]>
2222
Adrian Bunk <[email protected]>
2323
Ajay Kaher <[email protected]> <[email protected]>
24-
Akhil P Oommen <[email protected]> <[email protected]>
24+
Akhil P Oommen <[email protected]> <[email protected]>
25+
Akhil P Oommen <[email protected]> <[email protected]>
2526
Alan Cox <[email protected]>
2627
Alan Cox <[email protected]>
2728
Aleksandar Markovic <[email protected]> <[email protected]>
@@ -640,6 +641,8 @@ Richard Genoud <[email protected]> <[email protected]>
640641
Richard Leitner <[email protected]> <[email protected]>
641642
Richard Leitner <[email protected]> <[email protected]>
642643
Richard Leitner <[email protected]> <[email protected]>
644+
Rob Clark <[email protected]> <[email protected]>
645+
Rob Clark <[email protected]> <[email protected]>
643646
Robert Foss <[email protected]> <[email protected]>
644647
Rocky Liao <[email protected]> <[email protected]>
645648
Rodrigo Siqueira <[email protected]> <[email protected]>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,26 +60,26 @@ Description: RO. Package default power limit (default TDP setting).
6060

6161
Only supported for particular Intel Xe graphics platforms.
6262

63-
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power2_crit
64-
Date: February 2024
65-
KernelVersion: 6.8
63+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_crit
64+
Date: May 2025
65+
KernelVersion: 6.15
6666
Contact: [email protected]
67-
Description: RW. Package reactive critical (I1) power limit in microwatts.
67+
Description: RW. Card reactive critical (I1) power limit in microwatts.
6868

69-
Package reactive critical (I1) power limit in microwatts is exposed
69+
Card reactive critical (I1) power limit in microwatts is exposed
7070
for client products. The power controller will throttle the
7171
operating frequency if the power averaged over a window exceeds
7272
this limit.
7373

7474
Only supported for particular Intel Xe graphics platforms.
7575

76-
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/curr2_crit
77-
Date: February 2024
78-
KernelVersion: 6.8
76+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/curr1_crit
77+
Date: May 2025
78+
KernelVersion: 6.15
7979
Contact: [email protected]
80-
Description: RW. Package reactive critical (I1) power limit in milliamperes.
80+
Description: RW. Card reactive critical (I1) power limit in milliamperes.
8181

82-
Package reactive critical (I1) power limit in milliamperes is
82+
Card reactive critical (I1) power limit in milliamperes is
8383
exposed for server products. The power controller will throttle
8484
the operating frequency if the power averaged over a window
8585
exceeds this limit.

‎Documentation/gpu/xe/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ DG2, etc is provided to prototype the driver.
1616
xe_migrate
1717
xe_cs
1818
xe_pm
19+
xe_gt_freq
1920
xe_pcode
2021
xe_gt_mcr
2122
xe_wa

‎Documentation/gpu/xe/xe_gt_freq.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.. SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
3+
==========================
4+
Xe GT Frequency Management
5+
==========================
6+
7+
.. kernel-doc:: drivers/gpu/drm/xe/xe_gt_freq.c
8+
:doc: Xe GT Frequency Management
9+
10+
Internal API
11+
============
12+
13+
.. kernel-doc:: drivers/gpu/drm/xe/xe_gt_freq.c
14+
:internal:

‎MAINTAINERS

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7599,7 +7599,7 @@ F: Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml
75997599
F: drivers/gpu/drm/tiny/panel-mipi-dbi.c
76007600

76017601
DRM DRIVER for Qualcomm Adreno GPUs
7602-
M: Rob Clark <robdclark@gmail.com>
7602+
M: Rob Clark <[email protected].com>
76037603
R: Sean Paul <[email protected]>
76047604
R: Konrad Dybcio <[email protected]>
76057605
L: [email protected]
@@ -7618,9 +7618,10 @@ F: drivers/gpu/drm/msm/registers/adreno/
76187618
F: include/uapi/drm/msm_drm.h
76197619

76207620
DRM DRIVER for Qualcomm display hardware
7621-
M: Rob Clark <[email protected]>
7622-
M: Abhinav Kumar <[email protected]>
7621+
M: Rob Clark <[email protected]>
76237622
M: Dmitry Baryshkov <[email protected]>
7623+
R: Abhinav Kumar <[email protected]>
7624+
R: Jessica Zhang <[email protected]>
76247625
R: Sean Paul <[email protected]>
76257626
R: Marijn Suijten <[email protected]>
76267627
L: [email protected]
@@ -20396,7 +20397,7 @@ F: drivers/soc/qcom/icc-bwmon.c
2039620397
F: drivers/soc/qcom/trace_icc-bwmon.h
2039720398

2039820399
QUALCOMM IOMMU
20399-
M: Rob Clark <robdclark@gmail.com>
20400+
M: Rob Clark <[email protected].com>
2040020401
L: [email protected]
2040120402
L: [email protected]
2040220403
S: Maintained
@@ -20439,7 +20440,7 @@ F: drivers/regulator/vqmmc-ipq4019-regulator.c
2043920440
QUALCOMM IRIS VIDEO ACCELERATOR DRIVER
2044020441
M: Vikash Garodia <[email protected]>
2044120442
M: Dikshita Agarwal <[email protected]>
20442-
R: Abhinav Kumar <[email protected]>
20443+
R: Abhinav Kumar <[email protected]>
2044320444
R: Bryan O'Donoghue <[email protected]>
2044420445
L: [email protected]
2044520446
L: [email protected]

‎drivers/gpu/drm/amd/amdgpu/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ config DRM_AMDGPU_USERPTR
7676

7777
config DRM_AMD_ISP
7878
bool "Enable AMD Image Signal Processor IP support"
79-
depends on DRM_AMDGPU
79+
depends on DRM_AMDGPU && ACPI
8080
select MFD_CORE
8181
select PM_GENERIC_DOMAINS if PM
8282
help

‎drivers/gpu/drm/amd/amdgpu/amdgpu.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,6 +1713,10 @@ static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { retu
17131713
static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false; }
17141714
#endif
17151715

1716+
#if defined(CONFIG_DRM_AMD_ISP)
1717+
int amdgpu_acpi_get_isp4_dev_hid(u8 (*hid)[ACPI_ID_LEN]);
1718+
#endif
1719+
17161720
void amdgpu_register_gpu_instance(struct amdgpu_device *adev);
17171721
void amdgpu_unregister_gpu_instance(struct amdgpu_device *adev);
17181722

‎drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1532,5 +1532,35 @@ bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev)
15321532
return true;
15331533
#endif /* CONFIG_AMD_PMC */
15341534
}
1535-
15361535
#endif /* CONFIG_SUSPEND */
1536+
1537+
#if IS_ENABLED(CONFIG_DRM_AMD_ISP)
1538+
static const struct acpi_device_id isp_sensor_ids[] = {
1539+
{ "OMNI5C10" },
1540+
{ }
1541+
};
1542+
1543+
static int isp_match_acpi_device_ids(struct device *dev, const void *data)
1544+
{
1545+
return acpi_match_device(data, dev) ? 1 : 0;
1546+
}
1547+
1548+
int amdgpu_acpi_get_isp4_dev_hid(u8 (*hid)[ACPI_ID_LEN])
1549+
{
1550+
struct device *pdev __free(put_device) = NULL;
1551+
struct acpi_device *acpi_pdev;
1552+
1553+
pdev = bus_find_device(&platform_bus_type, NULL, isp_sensor_ids,
1554+
isp_match_acpi_device_ids);
1555+
if (!pdev)
1556+
return -EINVAL;
1557+
1558+
acpi_pdev = ACPI_COMPANION(pdev);
1559+
if (!acpi_pdev)
1560+
return -ENODEV;
1561+
1562+
strscpy(*hid, acpi_device_hid(acpi_pdev));
1563+
1564+
return 0;
1565+
}
1566+
#endif /* CONFIG_DRM_AMD_ISP */

‎drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,9 @@ void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void **mem_obj)
368368
{
369369
struct amdgpu_bo **bo = (struct amdgpu_bo **) mem_obj;
370370

371+
if (!bo || !*bo)
372+
return;
373+
371374
(void)amdgpu_bo_reserve(*bo, true);
372375
amdgpu_bo_kunmap(*bo);
373376
amdgpu_bo_unpin(*bo);

‎drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ long amdgpu_ctx_mgr_entity_flush(struct amdgpu_ctx_mgr *mgr, long timeout)
919919
return timeout;
920920
}
921921

922-
void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr)
922+
static void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr)
923923
{
924924
struct amdgpu_ctx *ctx;
925925
struct idr *idp;
@@ -949,19 +949,7 @@ void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr)
949949

950950
void amdgpu_ctx_mgr_fini(struct amdgpu_ctx_mgr *mgr)
951951
{
952-
struct amdgpu_ctx *ctx;
953-
struct idr *idp;
954-
uint32_t id;
955-
956952
amdgpu_ctx_mgr_entity_fini(mgr);
957-
958-
idp = &mgr->ctx_handles;
959-
960-
idr_for_each_entry(idp, ctx, id) {
961-
if (kref_put(&ctx->refcount, amdgpu_ctx_fini) != 1)
962-
DRM_ERROR("ctx %p is still alive\n", ctx);
963-
}
964-
965953
idr_destroy(&mgr->ctx_handles);
966954
mutex_destroy(&mgr->lock);
967955
}

0 commit comments

Comments
 (0)