Skip to content

Commit e058a84

Browse files
committed
Merge tag 'drm-next-2021-07-01' of git://anongit.freedesktop.org/drm/drm
Pull drm updates from Dave Airlie: "Highlights: - AMD enables two more GPUs, with resulting header files - i915 has started to move to TTM for discrete GPU and enable DG1 discrete GPU support (not by default yet) - new HyperV drm driver - vmwgfx adds arm64 support - TTM refactoring ongoing - 16bpc display support for AMD hw Otherwise it's just the usual insane amounts of work all over the place in lots of drivers and the core, as mostly summarised below: Core: - mark AGP ioctls as legacy - disable force probing for non-master clients - HDR metadata property helpers - HDMI infoframe signal colorimetry support - remove drm_device.pdev pointer - remove DRM_KMS_FB_HELPER config option - remove drm_pci_alloc/free - drm_err_*/drm_dbg_* helpers - use drm driver names for fbdev - leaked DMA handle fix - 16bpc fixed point format fourcc - add prefetching memcpy for WC - Documentation fixes aperture: - add aperture ownership helpers dp: - aux fixes - downstream 0 port handling - use extended base receiver capability DPCD - Rename DP_PSR_SELECTIVE_UPDATE to better mach eDP spec - mst: use khz as link rate during init - VCPI fixes for StarTech hub ttm: - provide tt_shrink file via debugfs - warn about freeing pinned BOs - fix swapping error handling - move page alignment into BO - cleanup ttm_agp_backend - add ttm_sys_manager - don't override vm_ops - ttm_bo_mmap removed - make ttm_resource base of all managers - remove VM_MIXEDMAP usage panel: - sysfs_emit support - simple: runtime PM support - simple: power up panel when reading EDID + caching bridge: - MHDP8546: HDCP support + DT bindings - MHDP8546: Register DP AUX channel with userspace - TI SN65DSI83 + SN65DSI84: add driver - Sil8620: Fix module dependencies - dw-hdmi: make CEC driver loading optional - Ti-sn65dsi86: refclk fixes, subdrivers, runtime pm - It66121: Add driver + DT bindings - Adv7511: Support I2S IEC958 encoding - Anx7625: fix power-on delay - Nwi-dsi: Modesetting fixes; Cleanups - lt6911: add missing MODULE_DEVICE_TABLE - cdns: fix PM reference leak hyperv: - add new DRM driver for HyperV graphics efifb: - non-PCI device handling fixes i915: - refactor IP/device versioning - XeLPD Display IP preperation work - ADL-P enablement patches - DG1 uAPI behind BROKEN - disable mmap ioctl for discerte GPUs - start enabling HuC loading for Gen12+ - major GuC backend rework for new platforms - initial TTM support for Discrete GPUs - locking rework for TTM prep - use correct max source link rate for eDP - %p4cc format printing - GLK display fixes - VLV DSI panel power fixes - PSR2 disabled for RKL and ADL-S - ACPI _DSM invalid access fixed - DMC FW path abstraction - ADL-S PCI ID update - uAPI headers converted to kerneldoc - initial LMEM support for DG1 - x86/gpu: add Jasperlake to gen11 early quirks amdgpu: - Aldebaran updates + initial SR-IOV - new GPU: Beige Goby and Yellow Carp support - more LTTPR display work - Vangogh updates - SDMA 5.x GCR fixes - PCIe ASPM support - Renoir TMZ enablement - initial multiple eDP panel support - use fdinfo to track devices/process info - pin/unpin TTM fixes - free resource on fence usage query - fix fence calculation - fix hotunplug/suspend issues - GC/MM register access macro cleanup for SR-IOV - W=1 fixes - ACPI ATCS/ATIF handling rework - 16bpc fixed point format support - Initial smartshift support - RV/PCO power tuning fixes - new INFO query for additional vbios info amdkfd: - SR-IOV aldebaran support - HMM SVM support radeon: - SMU regression fixes - Oland flickering fix vmwgfx: - enable console with fbdev emulation - fix cpu updates of coherent multisample surfaces - remove reservation semaphore - add initial SVGA3 support - support arm64 msm: - devcoredump support for display errors - dpu/dsi: yaml bindings conversion - mdp5: alpha/blend_mode/zpos support - a6xx: cached coherent buffer support - gpu iova fault improvement - a660 support rockchip: - RK3036 win1 scaling support - RK3066/3188 missing register support - RK3036/3066/3126/3188 alpha support mediatek: - MT8167 HDMI support - MT8183 DPI dual edge support tegra: - fixed YUV support/scaling on Tegra186+ ast: - use pcim_iomap - fix DP501 EDID bochs: - screen blanking support etnaviv: - export more GPU ID values to userspace - add HWDB entry for GPU on i.MX8MP - rework linear window calcs exynos: - pm runtime changes imx: - Annotate dma_fence critical section - fix PRG modifiers after drmm conversion - Add 8 pixel alignment fix for 1366x768 - fix YUV advertising - add color properties ingenic: - IPU planes fix panfrost: - Mediatek MT8183 support + DT bindings - export AFBC_FEATURES register to userspace simpledrm: - %pr for printing resources nouveau: - pin/unpin TTM fixes qxl: - unpin shadow BO virtio: - create dumb BOs as guest blob vkms: - drmm_universal_plane_alloc - add XRGB plane composition - overlay support" * tag 'drm-next-2021-07-01' of git://anongit.freedesktop.org/drm/drm: (1570 commits) drm/i915: Reinstate the mmap ioctl for some platforms drm/i915/dsc: abstract helpers to get bigjoiner primary/secondary crtc Revert "drm/msm/mdp5: provide dynamic bandwidth management" drm/msm/mdp5: provide dynamic bandwidth management drm/msm/mdp5: add perf blocks for holding fudge factors drm/msm/mdp5: switch to standard zpos property drm/msm/mdp5: add support for alpha/blend_mode properties drm/msm/mdp5: use drm_plane_state for pixel blend mode drm/msm/mdp5: use drm_plane_state for storing alpha value drm/msm/mdp5: use drm atomic helpers to handle base drm plane state drm/msm/dsi: do not enable PHYs when called for the slave DSI interface drm/msm: Add debugfs to trigger shrinker drm/msm/dpu: Avoid ABBA deadlock between IRQ modules drm/msm: devcoredump iommu fault support iommu/arm-smmu-qcom: Add stall support drm/msm: Improve the a6xx page fault handler iommu/arm-smmu-qcom: Add an adreno-smmu-priv callback to get pagefault info iommu/arm-smmu: Add support for driver IOMMU fault handlers drm/msm: export hangcheck_period in debugfs drm/msm/a6xx: add support for Adreno 660 GPU ...
2 parents c288d9c + 8a02ea4 commit e058a84

File tree

1,291 files changed

+312175
-22349
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,291 files changed

+312175
-22349
lines changed

Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ maintainers:
1111

1212
properties:
1313
compatible:
14-
const: brcm,bcm2835-vec
14+
enum:
15+
- brcm,bcm2711-vec
16+
- brcm,bcm2835-vec
1517

1618
reg:
1719
maxItems: 1

Documentation/devicetree/bindings/display/bridge/cdns,mhdp8546.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,24 @@ properties:
1818

1919
reg:
2020
minItems: 1
21-
maxItems: 2
21+
maxItems: 3
2222
items:
2323
- description:
2424
Register block of mhdptx apb registers up to PHY mapped area (AUX_CONFIG_P).
2525
The AUX and PMA registers are not part of this range, they are instead
2626
included in the associated PHY.
2727
- description:
2828
Register block for DSS_EDP0_INTG_CFG_VP registers in case of TI J7 SoCs.
29+
- description:
30+
Register block of mhdptx sapb registers.
2931

3032
reg-names:
3133
minItems: 1
32-
maxItems: 2
34+
maxItems: 3
3335
items:
3436
- const: mhdptx
3537
- const: j721e-intg
38+
- const: mhdptx-sapb
3639

3740
clocks:
3841
maxItems: 1
@@ -99,14 +102,18 @@ allOf:
99102
properties:
100103
reg:
101104
minItems: 2
105+
maxItems: 3
102106
reg-names:
103107
minItems: 2
108+
maxItems: 3
104109
else:
105110
properties:
106111
reg:
107-
maxItems: 1
112+
minItems: 1
113+
maxItems: 2
108114
reg-names:
109-
maxItems: 1
115+
minItems: 1
116+
maxItems: 2
110117

111118
required:
112119
- compatible
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
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/google,cros-ec-anx7688.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ChromeOS EC ANX7688 HDMI to DP Converter through Type-C Port
8+
9+
maintainers:
10+
- Nicolas Boichat <[email protected]>
11+
- Enric Balletbo i Serra <[email protected]>
12+
13+
description: |
14+
ChromeOS EC ANX7688 is a display bridge that converts HDMI 2.0 to
15+
DisplayPort 1.3 Ultra-HDi (4096x2160p60). It is an Analogix ANX7688 chip
16+
which is connected to and operated by the ChromeOS Embedded Controller
17+
(See google,cros-ec.yaml). It is accessed using I2C tunneling through
18+
the EC and therefore its node should be a child of an EC I2C tunnel node
19+
(See google,cros-ec-i2c-tunnel.yaml).
20+
21+
properties:
22+
compatible:
23+
const: google,cros-ec-anx7688
24+
25+
reg:
26+
maxItems: 1
27+
description: I2C address of the device.
28+
29+
ports:
30+
$ref: /schemas/graph.yaml#/properties/ports
31+
32+
properties:
33+
port@0:
34+
$ref: /schemas/graph.yaml#/properties/port
35+
description: Video port for HDMI input.
36+
37+
port@1:
38+
$ref: /schemas/graph.yaml#/properties/port
39+
description: USB Type-c connector.
40+
41+
required:
42+
- port@0
43+
- port@1
44+
45+
required:
46+
- compatible
47+
- reg
48+
- ports
49+
50+
additionalProperties: false
51+
52+
examples:
53+
- |
54+
i2c_tunnel_b: i2c-tunnel1 {
55+
compatible = "google,cros-ec-i2c-tunnel";
56+
google,remote-bus = <1>;
57+
#address-cells = <1>;
58+
#size-cells = <0>;
59+
60+
anx7688: anx7688@2c {
61+
compatible = "google,cros-ec-anx7688";
62+
reg = <0x2c>;
63+
64+
ports {
65+
#address-cells = <1>;
66+
#size-cells = <0>;
67+
port@0 {
68+
reg = <0>;
69+
anx7688_in: endpoint {
70+
remote-endpoint = <&hdmi0_out>;
71+
};
72+
};
73+
port@1 {
74+
reg = <1>;
75+
anx7688_out: endpoint {
76+
remote-endpoint = <&typec_connector>;
77+
};
78+
};
79+
};
80+
};
81+
};
82+
Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/bridge/ite,it66121.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ITE it66121 HDMI bridge Device Tree Bindings
8+
9+
maintainers:
10+
- Phong LE <[email protected]>
11+
- Neil Armstrong <[email protected]>
12+
13+
description: |
14+
The IT66121 is a high-performance and low-power single channel HDMI
15+
transmitter, fully compliant with HDMI 1.3a, HDCP 1.2 and backward compatible
16+
to DVI 1.0 specifications.
17+
18+
properties:
19+
compatible:
20+
const: ite,it66121
21+
22+
reg:
23+
maxItems: 1
24+
25+
reset-gpios:
26+
maxItems: 1
27+
description: GPIO connected to active low reset
28+
29+
vrf12-supply:
30+
description: Regulator for 1.2V analog core power.
31+
32+
vcn33-supply:
33+
description: Regulator for 3.3V digital core power.
34+
35+
vcn18-supply:
36+
description: Regulator for 1.8V IO core power.
37+
38+
interrupts:
39+
maxItems: 1
40+
41+
ports:
42+
$ref: /schemas/graph.yaml#/properties/ports
43+
44+
properties:
45+
port@0:
46+
$ref: /schemas/graph.yaml#/$defs/port-base
47+
unevaluatedProperties: false
48+
description: DPI input port.
49+
50+
properties:
51+
endpoint:
52+
$ref: /schemas/graph.yaml#/$defs/endpoint-base
53+
unevaluatedProperties: false
54+
55+
properties:
56+
bus-width:
57+
description:
58+
Endpoint bus width.
59+
enum:
60+
- 12 # 12 data lines connected and dual-edge mode
61+
- 24 # 24 data lines connected and single-edge mode
62+
default: 24
63+
64+
port@1:
65+
$ref: /schemas/graph.yaml#/properties/port
66+
description: HDMI Connector port.
67+
68+
required:
69+
- port@0
70+
- port@1
71+
72+
required:
73+
- compatible
74+
- reg
75+
- reset-gpios
76+
- vrf12-supply
77+
- vcn33-supply
78+
- vcn18-supply
79+
- interrupts
80+
- ports
81+
82+
additionalProperties: false
83+
84+
examples:
85+
- |
86+
#include <dt-bindings/interrupt-controller/irq.h>
87+
#include <dt-bindings/gpio/gpio.h>
88+
i2c {
89+
#address-cells = <1>;
90+
#size-cells = <0>;
91+
92+
it66121hdmitx: hdmitx@4c {
93+
compatible = "ite,it66121";
94+
pinctrl-names = "default";
95+
pinctrl-0 = <&ite_pins_default>;
96+
vcn33-supply = <&mt6358_vcn33_wifi_reg>;
97+
vcn18-supply = <&mt6358_vcn18_reg>;
98+
vrf12-supply = <&mt6358_vrf12_reg>;
99+
reset-gpios = <&pio 160 GPIO_ACTIVE_LOW>;
100+
interrupt-parent = <&pio>;
101+
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
102+
reg = <0x4c>;
103+
104+
ports {
105+
#address-cells = <1>;
106+
#size-cells = <0>;
107+
108+
port@0 {
109+
reg = <0>;
110+
it66121_in: endpoint {
111+
bus-width = <12>;
112+
remote-endpoint = <&display_out>;
113+
};
114+
};
115+
116+
port@1 {
117+
reg = <1>;
118+
hdmi_conn_out: endpoint {
119+
remote-endpoint = <&hdmi_conn_in>;
120+
};
121+
};
122+
};
123+
};
124+
};

0 commit comments

Comments
 (0)