-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'drm-misc-next-2025-03-06' of https://gitlab.freedesktop.or…
…g/drm/misc/kernel into drm-next drm-misc-next for v6.15: Cross-subsystem Changes: base: - component: Provide helper to query bound status fbdev: - fbtft: Remove access to page->index Core Changes: - Fix usage of logging macros in several places gem: - Add test function for imported dma-bufs and use it in core and helpers - Avoid struct drm_gem_object.import_attach tests: - Fix lockdep warnings ttm: - Add helpers for TTM shrinker Driver Changes: adp: - Add support for Apple Touch Bar displays on M1/M2 amdxdna: - Fix interrupt handling appletbdrm: - Add support for Apple Touch Bar displays on x86 bridge: - synopsys: Add HDMI audio support - ti-sn65dsi83: Support negative DE polarity ipu-v3: - Remove unused code nouveau: - Avoid multiple -Wflex-array-member-not-at-end warnings panthor: - Fix CS_STATUS_ defines - Improve locking rockchip: - analogix_dp: Add eDP support - lvds: Improve logging - vop2: Improve HDMI mode handling; Add support for RK3576 - Fix shutdown - Support rk3562-mali xe: - Use TTM shrinker Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20250306130700.GA485504@linux.fritz.box
- Loading branch information
Showing
94 changed files
with
7,433 additions
and
2,257 deletions.
There are no files selected for viewing
83 changes: 83 additions & 0 deletions
83
Documentation/devicetree/bindings/display/apple,h7-display-pipe-mipi.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/display/apple,h7-display-pipe-mipi.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Apple pre-DCP display controller MIPI interface | ||
|
||
maintainers: | ||
- Sasha Finkelstein <fnkl.kernel@gmail.com> | ||
|
||
description: | ||
The MIPI controller part of the pre-DCP Apple display controller | ||
|
||
allOf: | ||
- $ref: dsi-controller.yaml# | ||
|
||
properties: | ||
compatible: | ||
items: | ||
- enum: | ||
- apple,t8112-display-pipe-mipi | ||
- apple,t8103-display-pipe-mipi | ||
- const: apple,h7-display-pipe-mipi | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
power-domains: | ||
maxItems: 1 | ||
|
||
ports: | ||
$ref: /schemas/graph.yaml#/properties/ports | ||
|
||
properties: | ||
port@0: | ||
$ref: /schemas/graph.yaml#/properties/port | ||
description: Input port. Always connected to the primary controller | ||
|
||
port@1: | ||
$ref: /schemas/graph.yaml#/properties/port | ||
description: Output MIPI DSI port to the panel | ||
|
||
required: | ||
- port@0 | ||
- port@1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- ports | ||
|
||
unevaluatedProperties: false | ||
|
||
examples: | ||
- | | ||
dsi@28200000 { | ||
compatible = "apple,t8103-display-pipe-mipi", "apple,h7-display-pipe-mipi"; | ||
reg = <0x28200000 0xc000>; | ||
power-domains = <&ps_dispdfr_mipi>; | ||
ports { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
port@0 { | ||
reg = <0>; | ||
dfr_adp_out_mipi: endpoint { | ||
remote-endpoint = <&dfr_adp_out_mipi>; | ||
}; | ||
}; | ||
port@1 { | ||
reg = <1>; | ||
dfr_panel_in: endpoint { | ||
remote-endpoint = <&dfr_mipi_out_panel>; | ||
}; | ||
}; | ||
}; | ||
}; | ||
... |
88 changes: 88 additions & 0 deletions
88
Documentation/devicetree/bindings/display/apple,h7-display-pipe.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/display/apple,h7-display-pipe.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Apple pre-DCP display controller | ||
|
||
maintainers: | ||
- Sasha Finkelstein <fnkl.kernel@gmail.com> | ||
|
||
description: | ||
A secondary display controller used to drive the "touchbar" on | ||
certain Apple laptops. | ||
|
||
properties: | ||
compatible: | ||
items: | ||
- enum: | ||
- apple,t8112-display-pipe | ||
- apple,t8103-display-pipe | ||
- const: apple,h7-display-pipe | ||
|
||
reg: | ||
items: | ||
- description: Primary register block, controls planes and blending | ||
- description: | ||
Contains other configuration registers like interrupt | ||
and FIFO control | ||
|
||
reg-names: | ||
items: | ||
- const: be | ||
- const: fe | ||
|
||
power-domains: | ||
description: | ||
Phandles to pmgr entries that are needed for this controller to turn on. | ||
Aside from that, their specific functions are unknown | ||
maxItems: 2 | ||
|
||
interrupts: | ||
items: | ||
- description: Unknown function | ||
- description: Primary interrupt. Vsync events are reported via it | ||
|
||
interrupt-names: | ||
items: | ||
- const: be | ||
- const: fe | ||
|
||
iommus: | ||
maxItems: 1 | ||
|
||
port: | ||
$ref: /schemas/graph.yaml#/properties/port | ||
description: Output port. Always connected to apple,h7-display-pipe-mipi | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
- port | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/interrupt-controller/apple-aic.h> | ||
display-pipe@28200000 { | ||
compatible = "apple,t8103-display-pipe", "apple,h7-display-pipe"; | ||
reg = <0x28200000 0xc000>, | ||
<0x28400000 0x4000>; | ||
reg-names = "be", "fe"; | ||
power-domains = <&ps_dispdfr_fe>, <&ps_dispdfr_be>; | ||
interrupt-parent = <&aic>; | ||
interrupts = <AIC_IRQ 502 IRQ_TYPE_LEVEL_HIGH>, | ||
<AIC_IRQ 506 IRQ_TYPE_LEVEL_HIGH>; | ||
interrupt-names = "be", "fe"; | ||
iommus = <&displaydfr_dart 0>; | ||
port { | ||
dfr_adp_out_mipi: endpoint { | ||
remote-endpoint = <&dfr_mipi_in_adp>; | ||
}; | ||
}; | ||
}; | ||
... |
58 changes: 58 additions & 0 deletions
58
Documentation/devicetree/bindings/display/panel/apple,summit.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/display/panel/apple,summit.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Apple "Summit" display panel | ||
|
||
maintainers: | ||
- Sasha Finkelstein <fnkl.kernel@gmail.com> | ||
|
||
description: | ||
An OLED panel used as a touchbar on certain Apple laptops. | ||
Contains a backlight device, which controls brightness of the panel itself. | ||
The backlight common properties are included for this reason | ||
|
||
allOf: | ||
- $ref: panel-common.yaml# | ||
- $ref: /schemas/leds/backlight/common.yaml# | ||
|
||
properties: | ||
compatible: | ||
items: | ||
- enum: | ||
- apple,j293-summit | ||
- apple,j493-summit | ||
- const: apple,summit | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- max-brightness | ||
- port | ||
|
||
unevaluatedProperties: false | ||
|
||
examples: | ||
- | | ||
dsi { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
panel@0 { | ||
compatible = "apple,j293-summit", "apple,summit"; | ||
reg = <0>; | ||
max-brightness = <255>; | ||
port { | ||
endpoint { | ||
remote-endpoint = <&dfr_bridge_out>; | ||
}; | ||
}; | ||
}; | ||
}; | ||
... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.