Skip to content

Commit

Permalink
Merge tag 'drm-misc-next-2020-03-17' of git://anongit.freedesktop.org…
Browse files Browse the repository at this point in the history
…/drm/drm-misc into drm-next

drm-misc-next for 5.7:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
  - dp-mst: Remove register_connector callback, add drm_dp_destroy_connector
  - Changes to scnprintf on multiple instances

Driver Changes:
  - meson: Support for YUV420
  - panel: Support Ortustech COM37H3M, idk-1110wr and idk-2121wr,
           multiple dotclock fixes

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200317082858.lubmvlmvoprn2tuh@gilmour.lan
  • Loading branch information
Dave Airlie committed Mar 19, 2020
2 parents 71fa42f + 6afe692 commit d5152d3
Show file tree
Hide file tree
Showing 44 changed files with 917 additions and 229 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/display/panel/advantech,idk-1110wr.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Advantech IDK-1110WR 10.1" WSVGA LVDS Display Panel

maintainers:
- Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
- Thierry Reding <thierry.reding@gmail.com>

allOf:
- $ref: lvds.yaml#

properties:
compatible:
items:
- const: advantech,idk-1110wr
- {} # panel-lvds, but not listed here to avoid false select

data-mapping:
const: jeida-24

width-mm:
const: 223

height-mm:
const: 125

panel-timing: true
port: true

additionalProperties: false

required:
- compatible

examples:
- |+
panel {
compatible = "advantech,idk-1110wr", "panel-lvds";
width-mm = <223>;
height-mm = <125>;
data-mapping = "jeida-24";
panel-timing {
/* 1024x600 @60Hz */
clock-frequency = <51200000>;
hactive = <1024>;
vactive = <600>;
hsync-len = <240>;
hfront-porch = <40>;
hback-porch = <40>;
vsync-len = <10>;
vfront-porch = <15>;
vback-porch = <10>;
};
port {
panel_in: endpoint {
remote-endpoint = <&lvds_encoder>;
};
};
};
...
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/display/panel/advantech,idk-2121wr.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Advantech IDK-2121WR 21.5" Full-HD dual-LVDS panel

maintainers:
- Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
- Thierry Reding <thierry.reding@gmail.com>

description: |
The IDK-2121WR from Advantech is a Full-HD dual-LVDS panel.
A dual-LVDS interface is a dual-link connection with even pixels traveling
on one link, and with odd pixels traveling on the other link.
The panel expects odd pixels on the first port, and even pixels on the
second port, therefore the ports must be marked accordingly (with either
dual-lvds-odd-pixels or dual-lvds-even-pixels).
properties:
compatible:
items:
- const: advantech,idk-2121wr
- {} # panel-lvds, but not listed here to avoid false select

width-mm:
const: 476

height-mm:
const: 268

data-mapping:
const: vesa-24

panel-timing: true

ports:
type: object
properties:
port@0:
type: object
description: The sink for odd pixels.
properties:
reg:
const: 0

dual-lvds-odd-pixels: true

required:
- reg
- dual-lvds-odd-pixels

port@1:
type: object
description: The sink for even pixels.
properties:
reg:
const: 1

dual-lvds-even-pixels: true

required:
- reg
- dual-lvds-even-pixels

additionalProperties: false

required:
- compatible
- width-mm
- height-mm
- data-mapping
- panel-timing
- ports

examples:
- |+
panel-lvds {
compatible = "advantech,idk-2121wr", "panel-lvds";
width-mm = <476>;
height-mm = <268>;
data-mapping = "vesa-24";
panel-timing {
clock-frequency = <148500000>;
hactive = <1920>;
vactive = <1080>;
hsync-len = <44>;
hfront-porch = <88>;
hback-porch = <148>;
vfront-porch = <4>;
vback-porch = <36>;
vsync-len = <5>;
};
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
dual-lvds-odd-pixels;
panel_in0: endpoint {
remote-endpoint = <&lvds0_out>;
};
};
port@1 {
reg = <1>;
dual-lvds-even-pixels;
panel_in1: endpoint {
remote-endpoint = <&lvds1_out>;
};
};
};
};
...
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ additionalProperties: false

examples:
- |
dsi@ff450000 {
dsi {
#address-cells = <1>;
#size-cells = <0>;
panel@0 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ additionalProperties: false

examples:
- |
dsi@ff450000 {
dsi {
#address-cells = <1>;
#size-cells = <0>;
reg = <0xff450000 0x1000>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ examples:
- |
#include <dt-bindings/gpio/gpio.h>
dsi@a0351000 {
dsi {
#address-cells = <1>;
#size-cells = <0>;
panel {
panel@0 {
compatible = "hydis,hva40wv1", "novatek,nt35510";
reg = <0>;
vdd-supply = <&ab8500_ldo_aux4_reg>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ required:

examples:
- |
dsi@0 {
dsi {
#address-cells = <1>;
#size-cells = <0>;
panel@0 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ additionalProperties: false

examples:
- |
panel@0 {
panel {
compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";
label = "osddisplay";
power-supply = <&vcc_supply>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ required:

examples:
- |
mdss_dsi@fd922800 {
dsi {
#address-cells = <1>;
#size-cells = <0>;
panel@0 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ required:

examples:
- |
dsi@0 {
dsi {
#address-cells = <1>;
#size-cells = <0>;
panel@0 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ additionalProperties: false

examples:
- |
dsi@ff450000 {
dsi {
#address-cells = <1>;
#size-cells = <0>;
reg = <0xff450000 0x1000>;
Expand Down
6 changes: 0 additions & 6 deletions drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
Original file line number Diff line number Diff line change
Expand Up @@ -458,15 +458,9 @@ static void dm_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
drm_connector_put(connector);
}

static void dm_dp_mst_register_connector(struct drm_connector *connector)
{
drm_connector_register(connector);
}

static const struct drm_dp_mst_topology_cbs dm_mst_cbs = {
.add_connector = dm_dp_add_mst_connector,
.destroy_connector = dm_dp_destroy_mst_connector,
.register_connector = dm_dp_mst_register_connector
};

void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,
Expand Down
Loading

0 comments on commit d5152d3

Please sign in to comment.