Skip to content

Commit db5d28c

Browse files
committed
Merge tag 'drm-next-2024-05-15' of https://gitlab.freedesktop.org/drm/kernel
Pull drm updates from Dave Airlie: "This is the main pull request for the drm subsystems for 6.10. In drivers the main thing is a new driver for ARM Mali firmware based GPUs, otherwise there are a lot of changes to amdgpu/xe/i915/msm and scattered changes to everything else. In the core a bunch of headers and Kconfig was refactored, along with the addition of a new panic handler which is meant to provide a user friendly message when a panic happens and graphical display is enabled. New drivers: - panthor: ARM Mali/Immortalis CSF-based GPU driver Core: - add a CONFIG_DRM_WERROR option - make more headers self-contained - grab resv lock in pin/unpin - fix vmap resv locking - EDID/eDP panel matching - Kconfig cleanups - DT sound bindings - Add SIZE_HINTS property for cursor planes - Add struct drm_edid_product_id and helpers. - Use drm device based logging in more drm functions. - drop seq_file.h from a bunch of places - use drm_edid driver conversions dp: - DP Tunnel documentation - MST read sideband cap - Adaptive sync SDP prep work ttm: - improve placement for TTM BOs in idle/busy handling panic: - Fixes for drm-panic, and option to test it. - Add drm panic to simpledrm, mgag200, imx, ast bridge: - improve init ordering - adv7511: allow GPIO pin sharing - tc358775: add tc358675 support panel: - AUO B120XAN01.0 - Samsung s6e3fa7 - BOE NT116WHM-N44 - CMN N116BCA-EA1, - CrystalClear CMT430B19N00 - Startek KD050HDFIA020-C020A - powertip PH128800T006-ZHC01 - Innolux G121X1-L03 - LG sw43408 - Khadas TS050 V2 - EDO RM69380 OLED - CSOT MNB601LS1-1 amdgpu: - HDCP/ODM/RAS fixes - Devcoredump improvements - Expose VCN activity via sysfs - SMY 13.0.x updates - Enable fast updates on DCN 3.1.4 - Add dclk and vclk reporting on additional devices - Add ACA RAS infrastructure - Implement TLB flush fence - EEPROM handling fixes - SMUIO 14.0.2 support - SMU 14.0.1 Updates - SMU 14.0.2 support - Sync page table freeing with TLB flushes - DML2 refactor - DC debug improvements - DCN 3.5.x Updates - GPU reset fixes - HDP fix for second GFX pipe on GC 10.x - Enable secondary GFX pipe on GC 10.3 - Refactor and clean up BACO/BOCO/BAMACO handling - Remove invalid TTM resource start check - UAF fix in VA IOCTL - GPUVM page fault redirection to secondary IH rings for IH 6.x - Initial support for mapping kernel queues via MES - Fix VRAM memory accounting amdkfd: - MQD handling cleanup - Preemption handling fixes for XCDs - TLB flush fix for GC 9.4.2 - Properly clean up workqueue during module unload - Fix memory leak process create failure - Range check CP bad op exception targets to avoid reporting invalid exceptions to userspace - Fix eviction fence handling - Fix leak in GPU memory allocation failure case - DMABuf import handling fix - Enable SQ watchpoint for gfx10 i915: - Adding new DG2 PCI ID - add context hints for GT frequency - enable only one CCS for compute workloads - new workarounds - Fix UAF on destroy against retire race and remove two earlier partial fixes - Limit the reserved VM space to only the platforms that need it - Fix gt reset with GuC submission is disable - Add and use gt_to_guc() wrapper i915/xe display: - Lunar Lake display enabling, including cdclk and other refactors - BIOS/VBT/opregion related refactor - Digital port related refactor/clean-up - Fix 2s boot time regression on DP panel replay init - Remove duplication on audio enable/disable on SDVO and g4x+ DP - Disable AuxCCS framebuffers if built for Xe - Make crtc disable more atomic - Increase DP idle pattern wait timeout to 2ms - Start using container_of_const() for some extra const safety - Fix Jasper Lake boot freeze - Enable MST mode for 128b/132b single-stream sideband - Enable Adaptive Sync SDP Support for DP - Fix MTL supported DP rates - removal of UHBR13.5 - PLL refactoring - Limit eDP MSO pipe only for display version 20 - More display refactor towards independence from i915 dev_priv - Convert i915/xe fbdev to DRM client - More initial work to make display code more independent from i915 xe: - improved error capture - clean up some uAPI leftovers - devcoredump update - Add BMG mocs table - Handle GSCCS ER interrupt - Implement xe2- and GuC workarounds - struct xe_device cleanup - Hwmon updates - Add LRC parsing for more GPU instruction - Increase VM_BIND number of per-ioctl Ops - drm/xe: Add XE_BO_GGTT_INVALIDATE flag - Initial development for SR-IOV support - Add new PCI IDs to DG2 platform - Move userptr over to start using hmm_range_fault msm: - Switched to generating register header files during build process instead of shipping pre-generated headers - Merged DPU and MDP4 format databases. - DP: - Stop using compat string to distinguish DP and eDP cases - Added support for X Elite platform (X1E80100) - Reworked DP aux/audio support - Added SM6350 DP to the bindings - GPU: - a7xx perfcntr reg fixes - MAINTAINERS updates - a750 devcoredump support radeon: - Silence UBSAN warnings related to flexible arrays nouveau: - move some uAPI objects to uapi headers omapdrm: - console fix ast: - add i2c polling qaic: - add debugfs entries exynos: - fix platform_driver .owner - drop cleanup code mediatek: - Use devm_platform_get_and_ioremap_resource() in mtk_hdmi_ddc_probe() - Add GAMMA 12-bit LUT support for MT8188 - Rename mtk_drm_* to mtk_* - Drop driver owner initialization - Correct calculation formula of PHY Timing" * tag 'drm-next-2024-05-15' of https://gitlab.freedesktop.org/drm/kernel: (1477 commits) drm/xe/ads: Use flexible-array drm/xe: Use ordered WQ for G2H handler drm/msm/gen_header: allow skipping the validation drm/msm/a6xx: Cleanup indexed regs const'ness drm/msm: Add devcoredump support for a750 drm/msm: Adjust a7xx GBIF debugbus dumping drm/msm: Update a6xx registers XML drm/msm: Fix imported a750 snapshot header for upstream drm/msm: Import a750 snapshot registers from kgsl MAINTAINERS: Add Konrad Dybcio as a reviewer for the Adreno driver MAINTAINERS: Add a separate entry for Qualcomm Adreno GPU drivers drm/msm/a6xx: Avoid a nullptr dereference when speedbin setting fails drm/msm/adreno: fix CP cycles stat retrieval on a7xx drm/msm/a7xx: allow writing to CP_BV counter selection registers drm: zynqmp_dpsub: Always register bridge Revert "drm/bridge: ti-sn65dsi83: Fix enable error path" drm/fb_dma: Add checks in drm_fb_dma_get_scanout_buffer() drm/fbdev-generic: Do not set physical framebuffer address drm/panthor: Fix the FW reset logic drm/panthor: Make sure we handle 'unknown group state' case properly ...
2 parents 46c6d2b + 275654c commit db5d28c

File tree

1,373 files changed

+77506
-55644
lines changed

Some content is hidden

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

1,373 files changed

+77506
-55644
lines changed

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

Lines changed: 67 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,61 +10,101 @@ Description: RW. Card reactive sustained (PL1) power limit in microwatts.
1010
power limit is disabled, writing 0 disables the
1111
limit. Writing values > 0 and <= TDP will enable the power limit.
1212

13-
Only supported for particular Intel xe graphics platforms.
13+
Only supported for particular Intel Xe graphics platforms.
1414

1515
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_rated_max
1616
Date: September 2023
1717
KernelVersion: 6.5
1818
Contact: intel-xe@lists.freedesktop.org
1919
Description: RO. Card default power limit (default TDP setting).
2020

21-
Only supported for particular Intel xe graphics platforms.
21+
Only supported for particular Intel Xe graphics platforms.
2222

23-
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_crit
23+
24+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/energy1_input
2425
Date: September 2023
2526
KernelVersion: 6.5
2627
Contact: intel-xe@lists.freedesktop.org
27-
Description: RW. Card reactive critical (I1) power limit in microwatts.
28+
Description: RO. Card energy input of device in microjoules.
29+
30+
Only supported for particular Intel Xe graphics platforms.
31+
32+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_max_interval
33+
Date: October 2023
34+
KernelVersion: 6.6
35+
Contact: intel-xe@lists.freedesktop.org
36+
Description: RW. Card sustained power limit interval (Tau in PL1/Tau) in
37+
milliseconds over which sustained power is averaged.
38+
39+
Only supported for particular Intel Xe graphics platforms.
40+
41+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power2_max
42+
Date: February 2024
43+
KernelVersion: 6.8
44+
Contact: intel-xe@lists.freedesktop.org
45+
Description: RW. Package reactive sustained (PL1) power limit in microwatts.
46+
47+
The power controller will throttle the operating frequency
48+
if the power averaged over a window (typically seconds)
49+
exceeds this limit. A read value of 0 means that the PL1
50+
power limit is disabled, writing 0 disables the
51+
limit. Writing values > 0 and <= TDP will enable the power limit.
52+
53+
Only supported for particular Intel Xe graphics platforms.
54+
55+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power2_rated_max
56+
Date: February 2024
57+
KernelVersion: 6.8
58+
Contact: intel-xe@lists.freedesktop.org
59+
Description: RO. Package default power limit (default TDP setting).
2860

29-
Card reactive critical (I1) power limit in microwatts is exposed
61+
Only supported for particular Intel Xe graphics platforms.
62+
63+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power2_crit
64+
Date: February 2024
65+
KernelVersion: 6.8
66+
Contact: intel-xe@lists.freedesktop.org
67+
Description: RW. Package reactive critical (I1) power limit in microwatts.
68+
69+
Package reactive critical (I1) power limit in microwatts is exposed
3070
for client products. The power controller will throttle the
3171
operating frequency if the power averaged over a window exceeds
3272
this limit.
3373

34-
Only supported for particular Intel xe graphics platforms.
74+
Only supported for particular Intel Xe graphics platforms.
3575

36-
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/curr1_crit
37-
Date: September 2023
38-
KernelVersion: 6.5
76+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/curr2_crit
77+
Date: February 2024
78+
KernelVersion: 6.8
3979
Contact: intel-xe@lists.freedesktop.org
40-
Description: RW. Card reactive critical (I1) power limit in milliamperes.
80+
Description: RW. Package reactive critical (I1) power limit in milliamperes.
4181

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

47-
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/in0_input
48-
Date: September 2023
49-
KernelVersion: 6.5
87+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/energy2_input
88+
Date: February 2024
89+
KernelVersion: 6.8
5090
Contact: intel-xe@lists.freedesktop.org
51-
Description: RO. Current Voltage in millivolt.
91+
Description: RO. Package energy input of device in microjoules.
5292

53-
Only supported for particular Intel xe graphics platforms.
93+
Only supported for particular Intel Xe graphics platforms.
5494

55-
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/energy1_input
56-
Date: September 2023
57-
KernelVersion: 6.5
95+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power2_max_interval
96+
Date: February 2024
97+
KernelVersion: 6.8
5898
Contact: intel-xe@lists.freedesktop.org
59-
Description: RO. Energy input of device in microjoules.
99+
Description: RW. Package sustained power limit interval (Tau in PL1/Tau) in
100+
milliseconds over which sustained power is averaged.
60101

61-
Only supported for particular Intel xe graphics platforms.
102+
Only supported for particular Intel Xe graphics platforms.
62103

63-
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_max_interval
64-
Date: October 2023
65-
KernelVersion: 6.6
104+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/in1_input
105+
Date: February 2024
106+
KernelVersion: 6.8
66107
Contact: intel-xe@lists.freedesktop.org
67-
Description: RW. Sustained power limit interval (Tau in PL1/Tau) in
68-
milliseconds over which sustained power is averaged.
108+
Description: RO. Package current voltage in millivolt.
69109

70-
Only supported for particular Intel xe graphics platforms.
110+
Only supported for particular Intel Xe graphics platforms.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
What: /sys/bus/platform/drivers/panfrost/.../profiling
2+
Date: February 2024
3+
KernelVersion: 6.8.0
4+
Contact: Adrian Larumbe <adrian.larumbe@collabora.com>
5+
Description:
6+
Get/set drm fdinfo's engine and cycles profiling status.
7+
Valid values are:
8+
0: Don't enable fdinfo job profiling sources.
9+
1: Enable fdinfo job profiling sources, this enables both the GPU's
10+
timestamp and cycle counter registers.

Documentation/devicetree/bindings/display/bridge/ite,it6505.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: ITE it6505
99
maintainers:
1010
- Allen Chen <allen.chen@ite.com.tw>
1111

12+
allOf:
13+
- $ref: /schemas/sound/dai-common.yaml#
14+
1215
description: |
1316
The IT6505 is a high-performance DisplayPort 1.1a transmitter,
1417
fully compliant with DisplayPort 1.1a, HDCP 1.3 specifications.
@@ -52,6 +55,9 @@ properties:
5255
maxItems: 1
5356
description: extcon specifier for the Power Delivery
5457

58+
"#sound-dai-cells":
59+
const: 0
60+
5561
ports:
5662
$ref: /schemas/graph.yaml#/properties/ports
5763

@@ -105,7 +111,7 @@ required:
105111
- extcon
106112
- ports
107113

108-
additionalProperties: false
114+
unevaluatedProperties: false
109115

110116
examples:
111117
- |

Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ properties:
4141
- enum:
4242
- ti,ds90cf364a # For the DS90CF364A FPD-Link LVDS Receiver
4343
- ti,ds90cf384a # For the DS90CF384A FPD-Link LVDS Receiver
44+
- ti,sn65lvds94 # For the SN65DS94 LVDS serdes
4445
- const: lvds-decoder # Generic LVDS decoders compatible fallback
4546
- enum:
4647
- thine,thc63lvdm83d # For the THC63LVDM83D LVDS serializer
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/bridge/microchip,sam9x75-lvds.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip SAM9X75 LVDS Controller
8+
9+
maintainers:
10+
- Dharma Balasubiramani <dharma.b@microchip.com>
11+
12+
description:
13+
The Low Voltage Differential Signaling Controller (LVDSC) manages data
14+
format conversion from the LCD Controller internal DPI bus to OpenLDI
15+
LVDS output signals. LVDSC functions include bit mapping, balanced mode
16+
management, and serializer.
17+
18+
properties:
19+
compatible:
20+
const: microchip,sam9x75-lvds
21+
22+
reg:
23+
maxItems: 1
24+
25+
interrupts:
26+
maxItems: 1
27+
28+
clocks:
29+
items:
30+
- description: Peripheral Bus Clock
31+
32+
clock-names:
33+
items:
34+
- const: pclk
35+
36+
required:
37+
- compatible
38+
- reg
39+
- interrupts
40+
- clocks
41+
- clock-names
42+
43+
additionalProperties: false
44+
45+
examples:
46+
- |
47+
#include <dt-bindings/interrupt-controller/irq.h>
48+
#include <dt-bindings/clock/at91.h>
49+
lvds-controller@f8060000 {
50+
compatible = "microchip,sam9x75-lvds";
51+
reg = <0xf8060000 0x100>;
52+
interrupts = <56 IRQ_TYPE_LEVEL_HIGH 0>;
53+
clocks = <&pmc PMC_TYPE_PERIPHERAL 56>;
54+
clock-names = "pclk";
55+
};

Documentation/devicetree/bindings/display/bridge/toshiba,tc358775.yaml

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
- Vinay Simha BN <simhavcs@gmail.com>
1111

1212
description: |
13-
This binding supports DSI to LVDS bridge TC358775
13+
This binding supports DSI to LVDS bridges TC358765 and TC358775
1414
1515
MIPI DSI-RX Data 4-lane, CLK 1-lane with data rates up to 800 Mbps/lane.
1616
Video frame size:
@@ -21,7 +21,9 @@ description: |
2121
2222
properties:
2323
compatible:
24-
const: toshiba,tc358775
24+
enum:
25+
- toshiba,tc358765
26+
- toshiba,tc358775
2527

2628
reg:
2729
maxItems: 1
@@ -46,11 +48,27 @@ properties:
4648

4749
properties:
4850
port@0:
49-
$ref: /schemas/graph.yaml#/properties/port
51+
$ref: /schemas/graph.yaml#/$defs/port-base
52+
unevaluatedProperties: false
5053
description: |
5154
DSI Input. The remote endpoint phandle should be a
5255
reference to a valid mipi_dsi_host device node.
5356
57+
properties:
58+
endpoint:
59+
$ref: /schemas/media/video-interfaces.yaml#
60+
unevaluatedProperties: false
61+
62+
properties:
63+
data-lanes:
64+
description: array of physical DSI data lane indexes.
65+
minItems: 1
66+
items:
67+
- const: 1
68+
- const: 2
69+
- const: 3
70+
- const: 4
71+
5472
port@1:
5573
$ref: /schemas/graph.yaml#/properties/port
5674
description: |
@@ -70,10 +88,19 @@ required:
7088
- reg
7189
- vdd-supply
7290
- vddio-supply
73-
- stby-gpios
7491
- reset-gpios
7592
- ports
7693

94+
allOf:
95+
- if:
96+
properties:
97+
compatible:
98+
contains:
99+
const: toshiba,tc358765
100+
then:
101+
properties:
102+
stby-gpios: false
103+
77104
additionalProperties: false
78105

79106
examples:
@@ -108,6 +135,7 @@ examples:
108135
reg = <0>;
109136
d2l_in_test: endpoint {
110137
remote-endpoint = <&dsi0_out>;
138+
data-lanes = <1 2 3 4>;
111139
};
112140
};
113141
@@ -132,7 +160,6 @@ examples:
132160
reg = <1>;
133161
dsi0_out: endpoint {
134162
remote-endpoint = <&d2l_in_test>;
135-
data-lanes = <0 1 2 3>;
136163
};
137164
};
138165
};
@@ -167,6 +194,7 @@ examples:
167194
reg = <0>;
168195
d2l_in_dual: endpoint {
169196
remote-endpoint = <&dsi0_out_dual>;
197+
data-lanes = <1 2 3 4>;
170198
};
171199
};
172200
@@ -198,7 +226,6 @@ examples:
198226
reg = <1>;
199227
dsi0_out_dual: endpoint {
200228
remote-endpoint = <&d2l_in_dual>;
201-
data-lanes = <0 1 2 3>;
202229
};
203230
};
204231
};

Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ properties:
2424
- enum:
2525
- mediatek,mt8173-disp-gamma
2626
- mediatek,mt8183-disp-gamma
27+
- mediatek,mt8195-disp-gamma
2728
- items:
2829
- enum:
2930
- mediatek,mt6795-disp-gamma
@@ -35,6 +36,10 @@ properties:
3536
- mediatek,mt8192-disp-gamma
3637
- mediatek,mt8195-disp-gamma
3738
- const: mediatek,mt8183-disp-gamma
39+
- items:
40+
- enum:
41+
- mediatek,mt8188-disp-gamma
42+
- const: mediatek,mt8195-disp-gamma
3843

3944
reg:
4045
maxItems: 1

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ properties:
2929
- qcom,sm8650-dp
3030
- items:
3131
- enum:
32+
- qcom,sm6350-dp
3233
- qcom,sm8150-dp
3334
- qcom,sm8250-dp
3435
- qcom,sm8450-dp

Documentation/devicetree/bindings/display/msm/qcom,sm6350-mdss.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,15 @@ patternProperties:
5353
compatible:
5454
const: qcom,sm6350-dpu
5555

56+
"^displayport-controller@[0-9a-f]+$":
57+
type: object
58+
additionalProperties: true
59+
60+
properties:
61+
compatible:
62+
contains:
63+
const: qcom,sm6350-dp
64+
5665
"^dsi@[0-9a-f]+$":
5766
type: object
5867
additionalProperties: true

Documentation/devicetree/bindings/display/panel/ilitek,ili9881c.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
- ampire,am8001280g
2020
- bananapi,lhr050h41
2121
- feixin,k101-im2byl02
22+
- startek,kd050hdfia020
2223
- tdo,tl050hdv35
2324
- wanchanglong,w552946aba
2425
- const: ilitek,ili9881c

0 commit comments

Comments
 (0)