diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-12-23 23:23:59 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-12-23 23:24:06 +0300 |
| commit | 040bf2a9446f6ba267225d34dc4a9b14d11e5092 (patch) | |
| tree | 0aee43e1b1bd657431cda8a2f0f0403998dee59d /Documentation | |
| parent | 4817c37d71b554fe46ea494f6b2c8562b26640bf (diff) | |
| parent | 5da8b49de472c1da8658466d4f63ef8d9251a819 (diff) | |
| download | linux-040bf2a9446f6ba267225d34dc4a9b14d11e5092.tar.xz | |
Merge tag 'drm-misc-next-fixes-2021-12-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Short summary of fixes pull:
* bridge/lvds: Fix DT bindings
* vmwgfx: Fix several issues with the recent conversion to GEM
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YcRAH8lYbsoSCeY9@linux-uq9g.fritz.box
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml b/Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml index 708de84ac138..5079c1cc337b 100644 --- a/Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml +++ b/Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml @@ -94,31 +94,32 @@ properties: power-supply: true -if: - not: - properties: - compatible: - contains: - const: lvds-decoder -then: - properties: - ports: +allOf: + - if: + not: + properties: + compatible: + contains: + const: lvds-decoder + then: properties: - port@0: + ports: properties: - endpoint: + port@0: properties: - data-mapping: false + endpoint: + properties: + data-mapping: false -if: - not: - properties: - compatible: - contains: - const: lvds-encoder -then: - properties: - pclk-sample: false + - if: + not: + properties: + compatible: + contains: + const: lvds-encoder + then: + properties: + pclk-sample: false required: - compatible |