Skip to content

Commit 90153b3

Browse files
committed
Merge tag 'drm-misc-next-2024-04-25' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.10-rc1: UAPI Changes: Cross-subsystem Changes: - Devicetree updates for rockchip (#sound-dai-cells) - Add dt bindings for new panels. - Change bridge/tc358775 dt bindings. Core Changes: - Fix SIZE_HINTS cursor property doc. - Parse topology blocks for all DispID < 2.0. - Implement support for tracking cleared free memory, use it in amdgpu. - Drop seq_file.h from drm_print.h, and include debugfs.h explicitly where needed (drivers). Driver Changes: - Small fixes to rockchip, panthor, v3d, bridge chaining, xlx. - Add Khadas TS050 V2, EDO RM69380 OLED, CSOT MNB601LS1-1 panels, - Add SAM9X7 SoC's LVDS controller. - More driver conversions to struct drm_edid. - Support tc358765 in tc358775 bridge. Signed-off-by: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents bbecb57 + 9e2b84f commit 90153b3

File tree

96 files changed

+2650
-1041
lines changed

Some content is hidden

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

96 files changed

+2650
-1041
lines changed
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 <[email protected]>
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 <[email protected]>
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/panel/panel-simple-dsi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ properties:
3636
- jdi,fhd-r63452
3737
# Khadas TS050 5" 1080x1920 LCD panel
3838
- khadas,ts050
39+
# Khadas TS050 V2 5" 1080x1920 LCD panel
40+
- khadas,ts050v2
3941
# Kingdisplay KD097D04 9.7" 1536x2048 TFT LCD panel
4042
- kingdisplay,kd097d04
4143
# LG ACX467AKM-7 4.95" 1080×1920 LCD Panel
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/raydium,rm69380.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Raydium RM69380-based DSI display panels
8+
9+
maintainers:
10+
- David Wronek <[email protected]>
11+
12+
description:
13+
The Raydium RM69380 is a generic DSI panel IC used to control
14+
OLED panels.
15+
16+
allOf:
17+
- $ref: panel-common-dual.yaml#
18+
19+
properties:
20+
compatible:
21+
items:
22+
- enum:
23+
- lenovo,j716f-edo-rm69380
24+
- const: raydium,rm69380
25+
description: This indicates the panel manufacturer of the panel
26+
that is in turn using the RM69380 panel driver. The compatible
27+
string determines how the RM69380 panel driver shall be configured
28+
to work with the indicated panel. The raydium,rm69380 compatible shall
29+
always be provided as a fallback.
30+
31+
avdd-supply:
32+
description: Analog voltage rail
33+
34+
vddio-supply:
35+
description: I/O voltage rail
36+
37+
reset-gpios:
38+
maxItems: 1
39+
description: phandle of gpio for reset line - This should be active low
40+
41+
reg: true
42+
43+
required:
44+
- compatible
45+
- reg
46+
- avdd-supply
47+
- vddio-supply
48+
- reset-gpios
49+
50+
unevaluatedProperties: false
51+
52+
examples:
53+
- |
54+
#include <dt-bindings/gpio/gpio.h>
55+
56+
dsi {
57+
#address-cells = <1>;
58+
#size-cells = <0>;
59+
60+
panel@0 {
61+
compatible = "lenovo,j716f-edo-rm69380", "raydium,rm69380";
62+
reg = <0>;
63+
64+
avdd-supply = <&panel_avdd_regulator>;
65+
vddio-supply = <&vreg_l14a>;
66+
reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
67+
68+
ports {
69+
#address-cells = <1>;
70+
#size-cells = <0>;
71+
72+
port@0 {
73+
reg = <0>;
74+
panel_in_0: endpoint {
75+
remote-endpoint = <&mdss_dsi0_out>;
76+
};
77+
};
78+
79+
port@1 {
80+
reg = <1>;
81+
panel_in_1: endpoint {
82+
remote-endpoint = <&mdss_dsi1_out>;
83+
};
84+
};
85+
};
86+
};
87+
};
88+
89+
...

Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ description: |
1515
1616
allOf:
1717
- $ref: ../bridge/synopsys,dw-hdmi.yaml#
18+
- $ref: /schemas/sound/dai-common.yaml#
1819

1920
properties:
2021
compatible:
@@ -124,6 +125,9 @@ properties:
124125
description:
125126
phandle to the GRF to mux vopl/vopb.
126127

128+
"#sound-dai-cells":
129+
const: 0
130+
127131
required:
128132
- compatible
129133
- reg
@@ -153,6 +157,7 @@ examples:
153157
ddc-i2c-bus = <&i2c5>;
154158
power-domains = <&power RK3288_PD_VIO>;
155159
rockchip,grf = <&grf>;
160+
#sound-dai-cells = <0>;
156161
157162
ports {
158163
#address-cells = <1>;

Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ properties:
3737
power-domains:
3838
maxItems: 1
3939

40+
"#sound-dai-cells":
41+
const: 0
42+
4043
ports:
4144
$ref: /schemas/graph.yaml#/properties/ports
4245

@@ -66,6 +69,7 @@ required:
6669
- ports
6770

6871
allOf:
72+
- $ref: /schemas/sound/dai-common.yaml#
6973
- if:
7074
properties:
7175
compatible:
@@ -106,6 +110,7 @@ examples:
106110
clock-names = "pclk";
107111
pinctrl-names = "default";
108112
pinctrl-0 = <&hdmi_ctl>;
113+
#sound-dai-cells = <0>;
109114
110115
ports {
111116
#address-cells = <1>;

Documentation/devicetree/bindings/display/rockchip/rockchip,rk3066-hdmi.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ maintainers:
1010
- Sandy Huang <[email protected]>
1111
- Heiko Stuebner <[email protected]>
1212

13+
allOf:
14+
- $ref: /schemas/sound/dai-common.yaml#
15+
1316
properties:
1417
compatible:
1518
const: rockchip,rk3066-hdmi
@@ -34,6 +37,9 @@ properties:
3437
description:
3538
This soc uses GRF regs to switch the HDMI TX input between vop0 and vop1.
3639

40+
"#sound-dai-cells":
41+
const: 0
42+
3743
ports:
3844
$ref: /schemas/graph.yaml#/properties/ports
3945

@@ -83,6 +89,7 @@ examples:
8389
pinctrl-names = "default";
8490
power-domains = <&power RK3066_PD_VIO>;
8591
rockchip,grf = <&grf>;
92+
#sound-dai-cells = <0>;
8693
8794
ports {
8895
#address-cells = <1>;

MAINTAINERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14582,6 +14582,14 @@ S: Supported
1458214582
F: Documentation/devicetree/bindings/pwm/atmel,at91sam-pwm.yaml
1458314583
F: drivers/pwm/pwm-atmel.c
1458414584

14585+
MICROCHIP SAM9x7-COMPATIBLE LVDS CONTROLLER
14586+
M: Manikandan Muralidharan <[email protected]>
14587+
M: Dharma Balasubiramani <[email protected]>
14588+
14589+
S: Supported
14590+
F: Documentation/devicetree/bindings/display/bridge/microchip,sam9x75-lvds.yaml
14591+
F: drivers/gpu/drm/bridge/microchip-lvds.c
14592+
1458514593
MICROCHIP SAMA5D2-COMPATIBLE ADC DRIVER
1458614594
M: Eugen Hristev <[email protected]>
1458714595

drivers/accel/ivpu/ivpu_debugfs.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright (C) 2020-2023 Intel Corporation
44
*/
55

6+
#include <linux/debugfs.h>
7+
68
#include <drm/drm_debugfs.h>
79
#include <drm/drm_file.h>
810
#include <drm/drm_print.h>

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include "amdgpu.h"
4040
#include "amdgpu_trace.h"
4141
#include "amdgpu_amdkfd.h"
42+
#include "amdgpu_vram_mgr.h"
4243

4344
/**
4445
* DOC: amdgpu_object
@@ -601,8 +602,7 @@ int amdgpu_bo_create(struct amdgpu_device *adev,
601602
if (!amdgpu_bo_support_uswc(bo->flags))
602603
bo->flags &= ~AMDGPU_GEM_CREATE_CPU_GTT_USWC;
603604

604-
if (adev->ras_enabled)
605-
bo->flags |= AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE;
605+
bo->flags |= AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE;
606606

607607
bo->tbo.bdev = &adev->mman.bdev;
608608
if (bp->domain & (AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA |
@@ -633,7 +633,7 @@ int amdgpu_bo_create(struct amdgpu_device *adev,
633633
bo->tbo.resource->mem_type == TTM_PL_VRAM) {
634634
struct dma_fence *fence;
635635

636-
r = amdgpu_fill_buffer(bo, 0, bo->tbo.base.resv, &fence, true);
636+
r = amdgpu_ttm_clear_buffer(bo, bo->tbo.base.resv, &fence);
637637
if (unlikely(r))
638638
goto fail_unreserve;
639639

@@ -1366,8 +1366,9 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo)
13661366
if (WARN_ON_ONCE(!dma_resv_trylock(bo->base.resv)))
13671367
return;
13681368

1369-
r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->base.resv, &fence, true);
1369+
r = amdgpu_fill_buffer(abo, 0, bo->base.resv, &fence, true);
13701370
if (!WARN_ON(r)) {
1371+
amdgpu_vram_mgr_set_cleared(bo->resource);
13711372
amdgpu_bo_fence(abo, fence, false);
13721373
dma_fence_put(fence);
13731374
}

0 commit comments

Comments
 (0)