Skip to content

Commit 25b6377

Browse files
torvaldstorvalds
committed
Merge tag 'drm-next-2023-11-07' of git://anongit.freedesktop.org/drm/drm
Pull more drm updates from Dave Airlie: "Geert pointed out I missed the renesas reworks in my main pull, so this pull contains the renesas next work for atomic conversion and DT support. It also contains a bunch of amdgpu and some small ssd13xx fixes. renesas: - atomic conversion - DT support ssd13xx: - dt binding fix for ssd132x - Initialize ssd130x crtc_state to NULL. amdgpu: - Fix RAS support check - RAS fixes - MES fixes - SMU13 fixes - Contiguous memory allocation fix - BACO fixes - GPU reset fixes - Min power limit fixes - GFX11 fixes - USB4/TB hotplug fixes - ARM regression fix - GFX9.4.3 fixes - KASAN/KCSAN stack size check fixes - SR-IOV fixes - SMU14 fixes - PSP13 fixes - Display blend fixes - Flexible array size fixes amdkfd: - GPUVM fix radeon: - Flexible array size fixes" * tag 'drm-next-2023-11-07' of git://anongit.freedesktop.org/drm/drm: (83 commits) drm/amd/display: Enable fast update on blendTF change drm/amd/display: Fix blend LUT programming drm/amd/display: Program plane color setting correctly drm/amdgpu: Query and report boot status drm/amdgpu: Add psp v13 function to query boot status drm/amd/swsmu: remove fw version check in sw_init. drm/amd/swsmu: update smu v14_0_0 driver if and metrics table drm/amdgpu: Add C2PMSG_109/126 reg field shift/masks drm/amdgpu: Optimize the asic type fix code drm/amdgpu: fix GRBM read timeout when do mes_self_test drm/amdgpu: check recovery status of xgmi hive in ras_reset_error_count drm/amd/pm: only check sriov vf flag once when creating hwmon sysfs drm/amdgpu: Attach eviction fence on alloc drm/amdkfd: Improve amdgpu_vm_handle_moved drm/amd/display: Increase frame warning limit with KASAN or KCSAN in dml2 drm/amd/display: Avoid NULL dereference of timing generator drm/amdkfd: Update cache info for GFX 9.4.3 drm/amdkfd: Populate cache info for GFX 9.4.3 drm/amdgpu: don't put MQDs in VRAM on ARM | ARM64 drm/amdgpu/smu13: drop compute workload workaround ...
2 parents eaec7c9 + 9ccde17 commit 25b6377

Some content is hidden

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

72 files changed

+1718
-1345
lines changed

‎Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/renesas,shmobile-lcdc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Renesas SH-Mobile LCD Controller (LCDC)
8+
9+
maintainers:
10+
- Laurent Pinchart <[email protected]>
11+
- Geert Uytterhoeven <[email protected]>
12+
13+
properties:
14+
compatible:
15+
enum:
16+
- renesas,r8a7740-lcdc # R-Mobile A1
17+
- renesas,sh73a0-lcdc # SH-Mobile AG5
18+
19+
reg:
20+
maxItems: 1
21+
22+
interrupts:
23+
maxItems: 1
24+
25+
clocks:
26+
minItems: 1
27+
maxItems: 5
28+
description:
29+
Only the functional clock is mandatory.
30+
Some of the optional clocks are model-dependent (e.g. "video" (a.k.a.
31+
"vou" or "dv_clk") is available on R-Mobile A1 only).
32+
33+
clock-names:
34+
minItems: 1
35+
items:
36+
- const: fck
37+
- enum: [ media, lclk, hdmi, video ]
38+
- enum: [ media, lclk, hdmi, video ]
39+
- enum: [ media, lclk, hdmi, video ]
40+
- enum: [ media, lclk, hdmi, video ]
41+
42+
power-domains:
43+
maxItems: 1
44+
45+
ports:
46+
$ref: /schemas/graph.yaml#/properties/ports
47+
48+
properties:
49+
port@0:
50+
$ref: /schemas/graph.yaml#/properties/port
51+
description: LCD port (R-Mobile A1 and SH-Mobile AG5)
52+
unevaluatedProperties: false
53+
54+
port@1:
55+
$ref: /schemas/graph.yaml#/properties/port
56+
description: HDMI port (R-Mobile A1 LCDC1 and SH-Mobile AG5)
57+
unevaluatedProperties: false
58+
59+
port@2:
60+
$ref: /schemas/graph.yaml#/properties/port
61+
description: MIPI-DSI port (SH-Mobile AG5)
62+
unevaluatedProperties: false
63+
64+
required:
65+
- port@0
66+
67+
unevaluatedProperties: false
68+
69+
required:
70+
- compatible
71+
- reg
72+
- interrupts
73+
- clocks
74+
- clock-names
75+
- power-domains
76+
- ports
77+
78+
additionalProperties: false
79+
80+
allOf:
81+
- if:
82+
properties:
83+
compatible:
84+
contains:
85+
const: renesas,r8a7740-lcdc
86+
then:
87+
properties:
88+
ports:
89+
properties:
90+
port@2: false
91+
92+
- if:
93+
properties:
94+
compatible:
95+
contains:
96+
const: renesas,sh73a0-lcdc
97+
then:
98+
properties:
99+
ports:
100+
required:
101+
- port@1
102+
- port@2
103+
104+
examples:
105+
- |
106+
#include <dt-bindings/clock/r8a7740-clock.h>
107+
#include <dt-bindings/interrupt-controller/arm-gic.h>
108+
109+
lcd-controller@fe940000 {
110+
compatible = "renesas,r8a7740-lcdc";
111+
reg = <0xfe940000 0x4000>;
112+
interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;
113+
clocks = <&mstp1_clks R8A7740_CLK_LCDC0>,
114+
<&cpg_clocks R8A7740_CLK_M3>, <&lcdlclk0_clk>,
115+
<&vou_clk>;
116+
clock-names = "fck", "media", "lclk", "video";
117+
power-domains = <&pd_a4lc>;
118+
119+
ports {
120+
#address-cells = <1>;
121+
#size-cells = <0>;
122+
123+
port@0 {
124+
reg = <0>;
125+
126+
lcdc0_rgb: endpoint {
127+
};
128+
};
129+
};
130+
};

‎Documentation/devicetree/bindings/display/solomon,ssd132x.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ maintainers:
1111

1212
properties:
1313
compatible:
14-
- enum:
15-
- solomon,ssd1322
16-
- solomon,ssd1325
17-
- solomon,ssd1327
14+
enum:
15+
- solomon,ssd1322
16+
- solomon,ssd1325
17+
- solomon,ssd1327
1818

1919
required:
2020
- compatible

‎Documentation/userspace-api/media/v4l/subdev-formats.rst

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -949,6 +949,78 @@ The following tables list existing packed RGB formats.
949949
- b\ :sub:`2`
950950
- b\ :sub:`1`
951951
- b\ :sub:`0`
952+
* .. _MEDIA-BUS-FMT-RGB666-2X9-BE:
953+
954+
- MEDIA_BUS_FMT_RGB666_2X9_BE
955+
- 0x1025
956+
-
957+
-
958+
-
959+
-
960+
-
961+
-
962+
-
963+
-
964+
-
965+
-
966+
-
967+
-
968+
-
969+
-
970+
-
971+
-
972+
-
973+
-
974+
-
975+
-
976+
-
977+
-
978+
-
979+
-
980+
- r\ :sub:`5`
981+
- r\ :sub:`4`
982+
- r\ :sub:`3`
983+
- r\ :sub:`2`
984+
- r\ :sub:`1`
985+
- r\ :sub:`0`
986+
- g\ :sub:`5`
987+
- g\ :sub:`4`
988+
- g\ :sub:`3`
989+
* -
990+
-
991+
-
992+
-
993+
-
994+
-
995+
-
996+
-
997+
-
998+
-
999+
-
1000+
-
1001+
-
1002+
-
1003+
-
1004+
-
1005+
-
1006+
-
1007+
-
1008+
-
1009+
-
1010+
-
1011+
-
1012+
-
1013+
-
1014+
-
1015+
- g\ :sub:`2`
1016+
- g\ :sub:`1`
1017+
- g\ :sub:`0`
1018+
- b\ :sub:`5`
1019+
- b\ :sub:`4`
1020+
- b\ :sub:`3`
1021+
- b\ :sub:`2`
1022+
- b\ :sub:`1`
1023+
- b\ :sub:`0`
9521024
* .. _MEDIA-BUS-FMT-BGR666-1X18:
9531025

9541026
- MEDIA_BUS_FMT_BGR666_1X18

‎MAINTAINERS

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7133,7 +7133,7 @@ F: drivers/gpu/host1x/
71337133
F: include/linux/host1x.h
71347134
F: include/uapi/drm/tegra_drm.h
71357135

7136-
DRM DRIVERS FOR RENESAS
7136+
DRM DRIVERS FOR RENESAS R-CAR
71377137
M: Laurent Pinchart <[email protected]>
71387138
M: Kieran Bingham <[email protected]>
71397139
L: [email protected]
@@ -7144,7 +7144,16 @@ F: Documentation/devicetree/bindings/display/bridge/renesas,dsi-csi2-tx.yaml
71447144
F: Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml
71457145
F: Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
71467146
F: Documentation/devicetree/bindings/display/renesas,du.yaml
7147-
F: drivers/gpu/drm/renesas/
7147+
F: drivers/gpu/drm/renesas/rcar-du/
7148+
7149+
DRM DRIVERS FOR RENESAS SHMOBILE
7150+
M: Laurent Pinchart <[email protected]>
7151+
M: Geert Uytterhoeven <[email protected]>
7152+
L: [email protected]
7153+
L: [email protected]
7154+
S: Supported
7155+
F: Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml
7156+
F: drivers/gpu/drm/renesas/shmobile/
71487157
F: include/linux/platform_data/shmob_drm.h
71497158

71507159
DRM DRIVERS FOR ROCKCHIP

‎drivers/gpu/drm/amd/amdgpu/amdgpu.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,6 @@ struct amdgpu_ip_block_version {
363363
const struct amd_ip_funcs *funcs;
364364
};
365365

366-
#define HW_REV(_Major, _Minor, _Rev) \
367-
((((uint32_t) (_Major)) << 16) | ((uint32_t) (_Minor) << 8) | ((uint32_t) (_Rev)))
368-
369366
struct amdgpu_ip_block {
370367
struct amdgpu_ip_block_status status;
371368
const struct amdgpu_ip_block_version *version;

0 commit comments

Comments
 (0)