Skip to content

Commit a6ed68d

Browse files
torvaldstorvalds
committed
Merge tag 'drm-next-2019-11-27' of git://anongit.freedesktop.org/drm/drm
Pull drm updates from Dave Airlie: "Lots of stuff in here, though it hasn't been too insane this merge apart from dealing with the security fun. uapi: - export different colorspace properties on DP vs HDMI - new fourcc for ARM 16x16 block format - syncobj: allow querying last submitted timeline value - DRM_FORMAT_BIG_ENDIAN defined as unsigned core: - allow using gem vma manager in ttm - connector/encoder/bridge doc fixes - allow more than 3 encoders for a connector - displayport mst suspend/resume reprobing support - vram lazy unmapping, uniform vram mm and gem vram - edid cleanups + AVI informframe bar info - displayport helpers - dpcd parser added dp_cec: - Allow a connector to be associated with a cec device ttm: - pipelining with no_gpu_wait fix - always keep BOs on the LRU sched: - allow free_job routine to sleep i915: - Block userptr from mappable GTT - i915 perf uapi versioning - OA stream dynamic reconfiguration - make context persistence optional - introduce DRM_I915_UNSTABLE Kconfig - add fake lmem testing under unstable - BT.2020 support for DP MSA - struct mutex elimination - Tigerlake display/PLL/power management improvements - Jasper Lake PCH support - refactor PMU for multiple GPUs - Icelake firmware update - Split out vga + switcheroo code amdgpu: - implement dma-buf import/export without helpers - vega20 RAS enablement - DC i2c over aux fixes - renoir GPU reset - DC HDCP support - BACO support for CI/VI asics - MSI-X support - Arcturus EEPROM support - Arcturus VCN encode support - VCN dynamic powergating on RV/RV2 amdkfd: - add navi12/14/renoir support to kfd radeon: - SI dpm fix ported from amdgpu - fix bad DMA on ppc platforms gma500: - memory leak fixes qxl: - convert to new gem mmap exynos: - build warning fix komeda: - add aclk sysfs attribute v3d: - userspace cleanup uapi change i810: - fix for underflow in dispatch ioctls ast: - refactor show_cursor mgag200: - refactor show_cursor arcgpu: - encoder finding improvements mediatek: - mipi_tx, dsi and partial crtc support for MT8183 SoC - rotation support meson: - add suspend/resume support omap: - misc refactors tegra: - DisplayPort support for Tegra 210, 186 and 194. - IOMMU-backed DMA API fixes panfrost: - fix lockdep issue - simplify devfreq integration rcar-du: - R8A774B1 SoC support - fixes for H2 ES2.0 sun4i: - vcc-dsi regulator support virtio-gpu: - vmexit vs spinlock fix - move to gem shmem helpers - handle large command buffers with cma" * tag 'drm-next-2019-11-27' of git://anongit.freedesktop.org/drm/drm: (1855 commits) drm/amdgpu: invalidate mmhub semaphore workaround in gmc9/gmc10 drm/amdgpu: initialize vm_inv_eng0_sem for gfxhub and mmhub drm/amd/amdgpu/sriov skip RLCG s/r list for arcturus VF. drm/amd/amdgpu/sriov temporarily skip ras,dtm,hdcp for arcturus VF drm/amdgpu/gfx10: re-init clear state buffer after gpu reset merge fix for "ftrace: Rework event_create_dir()" drm/amdgpu: Update Arcturus golden registers drm/amdgpu/gfx10: fix out-of-bound mqd_backup array access drm/amdgpu/gfx10: explicitly wait for cp idle after halt/unhalt Revert "drm/amd/display: enable S/G for RAVEN chip" drm/amdgpu: disable gfxoff on original raven drm/amdgpu: remove experimental flag for Navi14 drm/amdgpu: disable gfxoff when using register read interface drm/amdgpu/powerplay: properly set PP_GFXOFF_MASK (v2) drm/amdgpu: fix bad DMA from INTERRUPT_CNTL2 drm/radeon: fix bad DMA from INTERRUPT_CNTL2 drm/amd/display: Fix debugfs on MST connectors drm/amdgpu/nv: add asic func for fetching vbios from rom directly drm/amdgpu: put flush_delayed_work at first drm/amdgpu/vcn2.5: fix the enc loop with hw fini ...
2 parents 8c39f71 + acc61b8 commit a6ed68d

File tree

1,122 files changed

+61274
-29902
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,122 files changed

+61274
-29902
lines changed

‎Documentation/devicetree/bindings/display/allwinner,sun6i-a31-mipi-dsi.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ properties:
3636
resets:
3737
maxItems: 1
3838

39+
vcc-dsi-supply:
40+
description: VCC-DSI power supply of the DSI encoder
41+
3942
phys:
4043
maxItems: 1
4144

@@ -64,6 +67,7 @@ required:
6467
- phys
6568
- phy-names
6669
- resets
70+
- vcc-dsi-supply
6771
- port
6872

6973
additionalProperties: false
@@ -79,6 +83,7 @@ examples:
7983
resets = <&ccu 4>;
8084
phys = <&dphy0>;
8185
phy-names = "dphy";
86+
vcc-dsi-supply = <&reg_dcdc1>;
8287
#address-cells = <1>;
8388
#size-cells = <0>;
8489

‎Documentation/devicetree/bindings/display/arm,malidp.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ Optional properties:
3737
Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt)
3838
to be used for the framebuffer; if not present, the framebuffer may
3939
be located anywhere in memory.
40+
- arm,malidp-arqos-high-level: integer of u32 value describing the ARQoS
41+
levels of DP500's QoS signaling.
4042

4143

4244
Example:
@@ -54,6 +56,7 @@ Example:
5456
clocks = <&oscclk2>, <&fpgaosc0>, <&fpgaosc1>, <&fpgaosc1>;
5557
clock-names = "pxlclk", "mclk", "aclk", "pclk";
5658
arm,malidp-output-port-lines = /bits/ 8 <8 8 8>;
59+
arm,malidp-arqos-high-level = <0xd000d000>;
5760
port {
5861
dp0_output: endpoint {
5962
remote-endpoint = <&tda998x_2_input>;

‎Documentation/devicetree/bindings/display/bridge/anx7814.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ designed for portable devices.
66

77
Required properties:
88

9-
- compatible : "analogix,anx7814"
9+
- compatible : Must be one of:
10+
"analogix,anx7808"
11+
"analogix,anx7812"
12+
"analogix,anx7814"
13+
"analogix,anx7818"
1014
- reg : I2C address of the device
1115
- interrupts : Should contain the INTP interrupt
1216
- hpd-gpios : Which GPIO to use for hpd

‎Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Required properties:
1313

1414
- compatible : Shall contain one or more of
1515
- "renesas,r8a774a1-hdmi" for R8A774A1 (RZ/G2M) compatible HDMI TX
16+
- "renesas,r8a774b1-hdmi" for R8A774B1 (RZ/G2N) compatible HDMI TX
1617
- "renesas,r8a7795-hdmi" for R8A7795 (R-Car H3) compatible HDMI TX
1718
- "renesas,r8a7796-hdmi" for R8A7796 (R-Car M3-W) compatible HDMI TX
1819
- "renesas,r8a77965-hdmi" for R8A77965 (R-Car M3-N) compatible HDMI TX

‎Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Required properties:
1010
- "renesas,r8a7743-lvds" for R8A7743 (RZ/G1M) compatible LVDS encoders
1111
- "renesas,r8a7744-lvds" for R8A7744 (RZ/G1N) compatible LVDS encoders
1212
- "renesas,r8a774a1-lvds" for R8A774A1 (RZ/G2M) compatible LVDS encoders
13+
- "renesas,r8a774b1-lvds" for R8A774B1 (RZ/G2N) compatible LVDS encoders
1314
- "renesas,r8a774c0-lvds" for R8A774C0 (RZ/G2E) compatible LVDS encoders
1415
- "renesas,r8a7790-lvds" for R8A7790 (R-Car H2) compatible LVDS encoders
1516
- "renesas,r8a7791-lvds" for R8A7791 (R-Car M2-W) compatible LVDS encoders

‎Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,22 @@ Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt.
2727

2828
Required properties (all function blocks):
2929
- compatible: "mediatek,<chip>-disp-<function>", one of
30-
"mediatek,<chip>-disp-ovl" - overlay (4 layers, blending, csc)
31-
"mediatek,<chip>-disp-rdma" - read DMA / line buffer
32-
"mediatek,<chip>-disp-wdma" - write DMA
33-
"mediatek,<chip>-disp-color" - color processor
34-
"mediatek,<chip>-disp-aal" - adaptive ambient light controller
35-
"mediatek,<chip>-disp-gamma" - gamma correction
36-
"mediatek,<chip>-disp-merge" - merge streams from two RDMA sources
37-
"mediatek,<chip>-disp-split" - split stream to two encoders
38-
"mediatek,<chip>-disp-ufoe" - data compression engine
39-
"mediatek,<chip>-dsi" - DSI controller, see mediatek,dsi.txt
40-
"mediatek,<chip>-dpi" - DPI controller, see mediatek,dpi.txt
41-
"mediatek,<chip>-disp-mutex" - display mutex
42-
"mediatek,<chip>-disp-od" - overdrive
30+
"mediatek,<chip>-disp-ovl" - overlay (4 layers, blending, csc)
31+
"mediatek,<chip>-disp-ovl-2l" - overlay (2 layers, blending, csc)
32+
"mediatek,<chip>-disp-rdma" - read DMA / line buffer
33+
"mediatek,<chip>-disp-wdma" - write DMA
34+
"mediatek,<chip>-disp-ccorr" - color correction
35+
"mediatek,<chip>-disp-color" - color processor
36+
"mediatek,<chip>-disp-dither" - dither
37+
"mediatek,<chip>-disp-aal" - adaptive ambient light controller
38+
"mediatek,<chip>-disp-gamma" - gamma correction
39+
"mediatek,<chip>-disp-merge" - merge streams from two RDMA sources
40+
"mediatek,<chip>-disp-split" - split stream to two encoders
41+
"mediatek,<chip>-disp-ufoe" - data compression engine
42+
"mediatek,<chip>-dsi" - DSI controller, see mediatek,dsi.txt
43+
"mediatek,<chip>-dpi" - DPI controller, see mediatek,dpi.txt
44+
"mediatek,<chip>-disp-mutex" - display mutex
45+
"mediatek,<chip>-disp-od" - overdrive
4346
the supported chips are mt2701, mt2712 and mt8173.
4447
- reg: Physical base address and length of the function block register space
4548
- interrupts: The interrupt signal from the function block (required, except for
@@ -49,6 +52,7 @@ Required properties (all function blocks):
4952
For most function blocks this is just a single clock input. Only the DSI and
5053
DPI controller nodes have multiple clock inputs. These are documented in
5154
mediatek,dsi.txt and mediatek,dpi.txt, respectively.
55+
An exception is that the mt8183 mutex is always free running with no clocks property.
5256

5357
Required properties (DMA function blocks):
5458
- compatible: Should be one of

‎Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ channel output.
77

88
Required properties:
99
- compatible: "mediatek,<chip>-dsi"
10-
the supported chips are mt2701 and mt8173.
10+
the supported chips are mt2701, mt8173 and mt8183.
1111
- reg: Physical base address and length of the controller's registers
1212
- interrupts: The interrupt signal from the function block.
1313
- clocks: device clocks
@@ -26,7 +26,7 @@ The MIPI TX configuration module controls the MIPI D-PHY.
2626

2727
Required properties:
2828
- compatible: "mediatek,<chip>-mipi-tx"
29-
the supported chips are mt2701 and mt8173.
29+
the supported chips are mt2701, mt8173 and mt8183.
3030
- reg: Physical base address and length of the controller's registers
3131
- clocks: PLL reference clock
3232
- clock-output-names: name of the output clock line to the DSI encoder

‎Documentation/devicetree/bindings/display/renesas,du.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Required Properties:
88
- "renesas,du-r8a7745" for R8A7745 (RZ/G1E) compatible DU
99
- "renesas,du-r8a77470" for R8A77470 (RZ/G1C) compatible DU
1010
- "renesas,du-r8a774a1" for R8A774A1 (RZ/G2M) compatible DU
11+
- "renesas,du-r8a774b1" for R8A774B1 (RZ/G2N) compatible DU
1112
- "renesas,du-r8a774c0" for R8A774C0 (RZ/G2E) compatible DU
1213
- "renesas,du-r8a7779" for R8A7779 (R-Car H1) compatible DU
1314
- "renesas,du-r8a7790" for R8A7790 (R-Car H2) compatible DU
@@ -60,6 +61,7 @@ corresponding to each DU output.
6061
R8A7745 (RZ/G1E) DPAD 0 DPAD 1 - -
6162
R8A77470 (RZ/G1C) DPAD 0 DPAD 1 LVDS 0 -
6263
R8A774A1 (RZ/G2M) DPAD 0 HDMI 0 LVDS 0 -
64+
R8A774B1 (RZ/G2N) DPAD 0 HDMI 0 LVDS 0 -
6365
R8A774C0 (RZ/G2E) DPAD 0 LVDS 0 LVDS 1 -
6466
R8A7779 (R-Car H1) DPAD 0 DPAD 1 - -
6567
R8A7790 (R-Car H2) DPAD 0 LVDS 0 LVDS 1 -

‎Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ Required properties:
2020
"rockchip,rk3228-vop";
2121
"rockchip,rk3328-vop";
2222

23+
- reg: Must contain one entry corresponding to the base address and length
24+
of the register space. Can optionally contain a second entry
25+
corresponding to the CRTC gamma LUT address.
26+
2327
- interrupts: should contain a list of all VOP IP block interrupts in the
2428
order: VSYNC, LCD_SYSTEM. The interrupt specifier
2529
format depends on the interrupt controller used.
@@ -48,7 +52,7 @@ Example:
4852
SoC specific DT entry:
4953
vopb: vopb@ff930000 {
5054
compatible = "rockchip,rk3288-vop";
51-
reg = <0xff930000 0x19c>;
55+
reg = <0x0 0xff930000 0x0 0x19c>, <0x0 0xff931000 0x0 0x1000>;
5256
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
5357
clocks = <&cru ACLK_VOP0>, <&cru DCLK_VOP0>, <&cru HCLK_VOP0>;
5458
clock-names = "aclk_vop", "dclk_vop", "hclk_vop";

‎Documentation/driver-api/dma-buf.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ Kernel Functions and Structures Reference
118118
Reservation Objects
119119
-------------------
120120

121-
.. kernel-doc:: drivers/dma-buf/reservation.c
121+
.. kernel-doc:: drivers/dma-buf/dma-resv.c
122122
:doc: Reservation Object Overview
123123

124-
.. kernel-doc:: drivers/dma-buf/reservation.c
124+
.. kernel-doc:: drivers/dma-buf/dma-resv.c
125125
:export:
126126

127-
.. kernel-doc:: include/linux/reservation.h
127+
.. kernel-doc:: include/linux/dma-resv.h
128128
:internal:
129129

130130
DMA Fences

0 commit comments

Comments
 (0)