Skip to content

Commit 8d0749b

Browse files
committed
Merge tag 'drm-next-2022-01-07' of git://anongit.freedesktop.org/drm/drm
Pull drm updates from Dave Airlie: "Highlights are support for privacy screens found in new laptops, a bunch of nomodeset refactoring, and i915 enables ADL-P systems by default, while starting to add RPL-S support. vmwgfx adds GEM and support for OpenGL 4.3 features in userspace. Lots of internal refactorings around dma reservations, and lots of driver refactoring as well. Summary: core: - add privacy screen support - move nomodeset option into drm subsystem - clean up nomodeset handling in drivers - make drm_irq.c legacy - fix stack_depot name conflicts - remove DMA_BUF_SET_NAME ioctl restrictions - sysfs: send hotplug event - replace several DRM_* logging macros with drm_* - move hashtable to legacy code - add error return from gem_create_object - cma-helper: improve interfaces, drop CONFIG_DRM_KMS_CMA_HELPER - kernel.h related include cleanups - support XRGB2101010 source buffers ttm: - don't include drm hashtable - stop pruning fences after wait - documentation updates dma-buf: - add dma_resv selftest - add debugfs helpers - remove dma_resv_get_excl_unlocked - documentation - make fences mandatory in dma_resv_add_excl_fence dp: - add link training delay helpers gem: - link shmem/cma helpers into separate modules - use dma_resv iteratior - import dma-buf namespace into gem helper modules scheduler: - fence grab fix - lockdep fixes bridge: - switch to managed MIPI DSI helpers - register and attach during probe fixes - convert to YAML in several places. panel: - add bunch of new panesl simpledrm: - support FB_DAMAGE_CLIPS - support virtual screen sizes - add Apple M1 support amdgpu: - enable seamless boot for DCN 3.01 - runtime PM fixes - use drm_kms_helper_connector_hotplug_event - get all fences at once - use generic drm fb helpers - PSR/DPCD/LTTPR/DSC/PM/RAS/OLED/SRIOV fixes - add smart trace buffer (STB) for supported GPUs - display debugfs entries - new SMU debug option - Documentation update amdkfd: - IP discovery enumeration refactor - interface between driver fixes - SVM fixes - kfd uapi header to define some sysfs bitfields. i915: - support VESA panel backlights - enable ADL-P by default - add eDP privacy screen support - add Raptor Lake S (RPL-S) support - DG2 page table support - lots of GuC/HuC fw refactoring - refactored i915->gt interfaces - CD clock squashing support - enable 10-bit gamma support - update ADL-P DMC fw to v2.14 - enable runtime PM autosuspend by default - ADL-P DSI support - per-lane DP drive settings for ICL+ - add support for pipe C/D DMC firmware - Atomic gamma LUT updates - remove CCS FB stride restrictions on ADL-P - VRR platform support for display 11 - add support for display audio codec keepalive - lots of display refactoring - fix runtime PM handling during PXP suspend - improved eviction performance with async TTM moves - async VMA unbinding improvements - VMA locking refactoring - improved error capture robustness - use per device iommu checks - drop bits stealing from i915_sw_fence function ptr - remove dma_resv_prune - add IC cache invalidation on DG2 nouveau: - crc fixes - validate LUTs in atomic check - set HDMI AVI RGB quant to full tegra: - buffer objects reworks for dma-buf compat - NVDEC driver uAPI support - power management improvements etnaviv: - IOMMU enabled system support - fix > 4GB command buffer mapping - close a DoS vector - fix spurious GPU resets ast: - fix i2c initialization rcar-du: - DSI output support exynos: - replace legacy gpio interface - implement generic GEM object mmap msm: - dpu plane state cleanup in prep for multirect - dpu debugfs cleanups - dp support for sc7280 - a506 support - removal of struct_mutex - remove old eDP sub-driver anx7625: - support MIPI DSI input - support HDMI audio - fix reading EDID lvds: - fix bridge DT bindings megachips: - probe both bridges before registering dw-hdmi: - allow interlace on bridge ps8640: - enable runtime PM - support aux-bus tx358768: - enable reference clock - add pulse mode support ti-sn65dsi86: - use regmap bulk write - add PWM support etnaviv: - get all fences at once gma500: - gem object cleanups kmb: - enable fb console radeon: - use dma_resv_wait_timeout rockchip: - add DSP hold timeout - suspend/resume fixes - PLL clock fixes - implement mmap in GEM object functions - use generic fbdev emulation sun4i: - use CMA helpers without vmap support vc4: - fix HDMI-CEC hang with display is off - power on HDMI controller while disabling - support 4K@60Hz modes - support 10-bit YUV 4:2:0 output vmwgfx: - fix leak on probe errors - fail probing on broken hosts - new placement for MOB page tables - hide internal BOs from userspace - implement GEM support - implement GL 4.3 support virtio: - overflow fixes xen: - implement mmap as GEM object function omapdrm: - fix scatterlist export - support virtual planes mediatek: - MT8192 support - CMDQ refinement" * tag 'drm-next-2022-01-07' of git://anongit.freedesktop.org/drm/drm: (1241 commits) drm/amdgpu: no DC support for headless chips drm/amd/display: fix dereference before NULL check drm/amdgpu: always reset the asic in suspend (v2) drm/amdgpu: put SMU into proper state on runpm suspending for BOCO capable platform drm/amd/display: Fix the uninitialized variable in enable_stream_features() drm/amdgpu: fix runpm documentation amdgpu/pm: Make sysfs pm attributes as read-only for VFs drm/amdgpu: save error count in RAS poison handler drm/amdgpu: drop redundant semicolon drm/amd/display: get and restore link res map drm/amd/display: support dynamic HPO DP link encoder allocation drm/amd/display: access hpo dp link encoder only through link resource drm/amd/display: populate link res in both detection and validation drm/amd/display: define link res and make it accessible to all link interfaces drm/amd/display: 3.2.167 drm/amd/display: [FW Promotion] Release 0.0.98 drm/amd/display: Undo ODM combine drm/amd/display: Add reg defs for DCN303 drm/amd/display: Changed pipe split policy to allow for multi-display pipe split drm/amd/display: Set optimize_pwr_state for DCN31 ...
2 parents bf4eebf + cb6846f commit 8d0749b

File tree

1,126 files changed

+47239
-24881
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,126 files changed

+47239
-24881
lines changed

.mailmap

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
# Please keep this list dictionary sorted.
1111
#
1212
Aaron Durbin <[email protected]>
13+
1314
Adam Oldham <[email protected]>
1415
Adam Radford <[email protected]>
1516
1617
Adrian Bunk <[email protected]>
18+
1719
1820
1921
Aleksandar Markovic <[email protected]> <[email protected]>
@@ -172,6 +174,7 @@ Jeff Layton <[email protected]> <[email protected]>
172174
Jens Axboe <[email protected]>
173175
Jens Osterkamp <[email protected]>
174176
177+
175178
176179
177180
@@ -191,6 +194,7 @@ Juha Yrjola <at solidboot.com>
191194
Juha Yrjola <[email protected]>
192195
Juha Yrjola <[email protected]>
193196
197+
194198
Kay Sievers <[email protected]>
195199
196200
@@ -202,9 +206,11 @@ Kenneth W Chen <[email protected]>
202206
Konstantin Khlebnikov <[email protected]> <[email protected]>
203207
Konstantin Khlebnikov <[email protected]> <[email protected]>
204208
209+
Krishna Manikandan <[email protected]> <[email protected]>
205210
Krzysztof Kozlowski <[email protected]> <[email protected]>
206211
Krzysztof Kozlowski <[email protected]> <[email protected]>
207212
Kuninori Morimoto <[email protected]>
213+
208214
209215
Leonid I Ananiev <[email protected]>
210216
@@ -311,6 +317,7 @@ Qais Yousef <[email protected]> <[email protected]>
311317
312318
313319
320+
314321
Rajesh Shah <[email protected]>
315322
Ralf Baechle <[email protected]>
316323
Ralf Wildenhues <[email protected]>
@@ -325,6 +332,7 @@ Rui Saraiva <[email protected]>
325332
Sachin P Sant <[email protected]>
326333
327334
Sam Ravnborg <[email protected]>
335+
Sankeerth Billakanti <[email protected]> <[email protected]>
328336
Santosh Shilimkar <[email protected]>
329337
Santosh Shilimkar <[email protected]>
330338
Sarangdhar Joshi <[email protected]>

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3551,6 +3551,13 @@
35513551
shutdown the other cpus. Instead use the REBOOT_VECTOR
35523552
irq.
35533553

3554+
nomodeset Disable kernel modesetting. DRM drivers will not perform
3555+
display-mode changes or accelerated rendering. Only the
3556+
system framebuffer will be available for use if this was
3557+
set-up by the firmware or boot loader.
3558+
3559+
Useful as fallback, or for testing and debugging.
3560+
35543561
nomodule Disable module load
35553562

35563563
nopat [X86] Disable PAT (page attribute table extension of

Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,70 @@ properties:
4343
vdd33-supply:
4444
description: Regulator that provides the supply 3.3V power.
4545

46+
analogix,lane0-swing:
47+
$ref: /schemas/types.yaml#/definitions/uint8-array
48+
minItems: 1
49+
maxItems: 20
50+
description:
51+
an array of swing register setting for DP tx lane0 PHY.
52+
Registers 0~9 are Swing0_Pre0, Swing1_Pre0, Swing2_Pre0,
53+
Swing3_Pre0, Swing0_Pre1, Swing1_Pre1, Swing2_Pre1, Swing0_Pre2,
54+
Swing1_Pre2, Swing0_Pre3, they are for [Boost control] and
55+
[Swing control] setting.
56+
Registers 0~9, bit 3:0 is [Boost control], these bits control
57+
post cursor manual, increase the [Boost control] to increase
58+
Pre-emphasis value.
59+
Registers 0~9, bit 6:4 is [Swing control], these bits control
60+
swing manual, increase [Swing control] setting to add Vp-p value
61+
for each Swing, Pre.
62+
Registers 10~19 are Swing0_Pre0, Swing1_Pre0, Swing2_Pre0,
63+
Swing3_Pre0, Swing0_Pre1, Swing1_Pre1, Swing2_Pre1, Swing0_Pre2,
64+
Swing1_Pre2, Swing0_Pre3, they are for [R select control] and
65+
[R Termination control] setting.
66+
Registers 10~19, bit 4:0 is [R select control], these bits are
67+
compensation manual, increase it can enhance IO driven strength
68+
and Vp-p.
69+
Registers 10~19, bit 5:6 is [R termination control], these bits
70+
adjust 50ohm impedance of DP tx termination. 00:55 ohm,
71+
01:50 ohm(default), 10:45 ohm, 11:40 ohm.
72+
73+
analogix,lane1-swing:
74+
$ref: /schemas/types.yaml#/definitions/uint8-array
75+
minItems: 1
76+
maxItems: 20
77+
description:
78+
an array of swing register setting for DP tx lane1 PHY.
79+
DP TX lane1 swing register setting same with lane0
80+
swing, please refer lane0-swing property description.
81+
82+
analogix,audio-enable:
83+
type: boolean
84+
description: let the driver enable audio HDMI codec function or not.
85+
4686
ports:
4787
$ref: /schemas/graph.yaml#/properties/ports
4888

4989
properties:
5090
port@0:
51-
$ref: /schemas/graph.yaml#/properties/port
91+
$ref: /schemas/graph.yaml#/$defs/port-base
92+
unevaluatedProperties: false
5293
description:
53-
Video port for MIPI DSI input.
94+
MIPI DSI/DPI input.
95+
96+
properties:
97+
endpoint:
98+
$ref: /schemas/media/video-interfaces.yaml#
99+
type: object
100+
additionalProperties: false
101+
102+
properties:
103+
remote-endpoint: true
104+
105+
bus-type:
106+
enum: [1, 5]
107+
default: 1
108+
109+
data-lanes: true
54110

55111
port@1:
56112
$ref: /schemas/graph.yaml#/properties/port
@@ -87,6 +143,9 @@ examples:
87143
vdd10-supply = <&pp1000_mipibrdg>;
88144
vdd18-supply = <&pp1800_mipibrdg>;
89145
vdd33-supply = <&pp3300_mipibrdg>;
146+
analogix,audio-enable;
147+
analogix,lane0-swing = /bits/ 8 <0x14 0x54 0x64 0x74>;
148+
analogix,lane1-swing = /bits/ 8 <0x14 0x54 0x64 0x74>;
90149
91150
ports {
92151
#address-cells = <1>;
@@ -96,6 +155,8 @@ examples:
96155
reg = <0>;
97156
anx7625_in: endpoint {
98157
remote-endpoint = <&mipi_dsi>;
158+
bus-type = <5>;
159+
data-lanes = <0 1 2 3>;
99160
};
100161
};
101162

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

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,28 +79,47 @@ properties:
7979
- port@0
8080
- port@1
8181

82+
pclk-sample:
83+
description:
84+
Data sampling on rising or falling edge.
85+
enum:
86+
- 0 # Falling edge
87+
- 1 # Rising edge
88+
default: 0
89+
8290
powerdown-gpios:
8391
description:
8492
The GPIO used to control the power down line of this device.
8593
maxItems: 1
8694

8795
power-supply: true
8896

89-
if:
90-
not:
91-
properties:
92-
compatible:
93-
contains:
94-
const: lvds-decoder
95-
then:
96-
properties:
97-
ports:
97+
allOf:
98+
- if:
99+
not:
100+
properties:
101+
compatible:
102+
contains:
103+
const: lvds-decoder
104+
then:
98105
properties:
99-
port@0:
106+
ports:
100107
properties:
101-
endpoint:
108+
port@0:
102109
properties:
103-
data-mapping: false
110+
endpoint:
111+
properties:
112+
data-mapping: false
113+
114+
- if:
115+
not:
116+
properties:
117+
compatible:
118+
contains:
119+
const: lvds-encoder
120+
then:
121+
properties:
122+
pclk-sample: false
104123

105124
required:
106125
- compatible
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
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/nxp,ptn3460.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP PTN3460 eDP to LVDS bridge
8+
9+
maintainers:
10+
- Sean Paul <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: nxp,ptn3460
15+
16+
reg:
17+
description: I2C address of the bridge
18+
maxItems: 1
19+
20+
edid-emulation:
21+
$ref: "/schemas/types.yaml#/definitions/uint32"
22+
description:
23+
The EDID emulation entry to use
24+
Value Resolution Description
25+
0 1024x768 NXP Generic
26+
1 1920x1080 NXP Generic
27+
2 1920x1080 NXP Generic
28+
3 1600x900 Samsung LTM200KT
29+
4 1920x1080 Samsung LTM230HT
30+
5 1366x768 NXP Generic
31+
6 1600x900 ChiMei M215HGE
32+
enum: [0, 1, 2, 3, 4, 5, 6]
33+
34+
powerdown-gpios:
35+
description: GPIO connected to the PD_N signal.
36+
maxItems: 1
37+
38+
reset-gpios:
39+
description: GPIO connected to the RST_N signal.
40+
maxItems: 1
41+
42+
ports:
43+
$ref: /schemas/graph.yaml#/properties/ports
44+
45+
properties:
46+
port@0:
47+
$ref: /schemas/graph.yaml#/properties/port
48+
description:
49+
Video port for LVDS output
50+
51+
port@1:
52+
$ref: /schemas/graph.yaml#/properties/port
53+
description:
54+
Video port for eDP input
55+
56+
required:
57+
- port@0
58+
- port@1
59+
60+
required:
61+
- compatible
62+
- reg
63+
- edid-emulation
64+
- powerdown-gpios
65+
- reset-gpios
66+
- ports
67+
68+
additionalProperties: false
69+
70+
examples:
71+
- |
72+
#include <dt-bindings/gpio/gpio.h>
73+
74+
i2c1 {
75+
#address-cells = <1>;
76+
#size-cells = <0>;
77+
78+
bridge@20 {
79+
compatible = "nxp,ptn3460";
80+
reg = <0x20>;
81+
edid-emulation = <5>;
82+
powerdown-gpios = <&gpy2 5 GPIO_ACTIVE_HIGH>;
83+
reset-gpios = <&gpx1 5 GPIO_ACTIVE_LOW>;
84+
85+
ports {
86+
#address-cells = <1>;
87+
#size-cells = <0>;
88+
89+
port@0 {
90+
reg = <0>;
91+
bridge_out: endpoint {
92+
remote-endpoint = <&panel_in>;
93+
};
94+
};
95+
96+
port@1 {
97+
reg = <1>;
98+
bridge_in: endpoint {
99+
remote-endpoint = <&dp_out>;
100+
};
101+
};
102+
};
103+
};
104+
};
105+
106+
...

Documentation/devicetree/bindings/display/bridge/ptn3460.txt

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)