Commit cfeeb0b5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2021-07-29' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for v5.15:

UAPI Changes:
- Add modifiers for arm fixed rate compression.

Cross-subsystem Changes:
- Assorted dt binding fixes.
- Convert ssd1307fb to json-schema.
- Update a lot of irc channels to point to OFTC, as everyone moved there.
- Fix the same divide by zero for asilantfb, kyro, rivafb.

Core Changes:
- Document requirements for new atomic properties.
- Add drm_gem_fb_(begin/end)_cpu_access helpers, and use them in some drivers.
- Document drm_property_enum.value for bitfields.
- Add explicit _NO_ for MIPI_DSI flags that disable features.
- Assorted documentation fixes.
- Update fb_damage handling, and move drm_plane_enable_fb_damage_clips to core.
- Add logging and docs to RMFB ioctl.
- Assorted small fixes to dp_mst, master handling.
- Clarify drm lease usage.

Driver Changes:
- Assorted small fixes to panfrost, hibmc, bridge/nwl-dsi, rockchip, vc4.
- More drm -> linux irq conversions.
- Add support for some Logic Technologies and Multi-Inno panels.
- Expose phy-functionality for drm/rockchip, to allow controlling from the media subsystem.
- Add support for 2 AUO panels.
- Add damage handling to ssd1307fb.
- Improve FIFO handling on mxsfb.
- Assorted small fixes to vmwgfx, and bump version to 2.19 for the new ioctls.
- Improve sony acx424akp backlight handling.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a753221a-e23e-0dc4-7ca6-8c1b179738d0@linux.intel.com
parents 988dbd25 c7d30623

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

+10 −0
Original line number Diff line number Diff line
@@ -46,9 +46,13 @@ properties: 
        # AU Optronics Corporation 11.6" HD (1366x768) color TFT-LCD panel

      - auo,b116xw03

        # AU Optronics Corporation 13.3" FHD (1920x1080) color TFT-LCD panel

      - auo,b133han05

        # AU Optronics Corporation 13.3" FHD (1920x1080) color TFT-LCD panel

      - auo,b133htn01

        # AU Optronics Corporation 13.3" WXGA (1366x768) TFT LCD panel

      - auo,b133xtn01

        # AU Optronics Corporation 14.0" FHD (1920x1080) color TFT-LCD panel

      - auo,b140han06

        # AU Optronics Corporation 7.0" FHD (800 x 480) TFT LCD panel

      - auo,g070vvn01

        # AU Optronics Corporation 10.1" (1280x800) color TFT LCD panel
@@ -208,8 +212,14 @@ properties: 
      - logictechno,lt161010-2nhr

        # Logic Technologies LT170410-2WHC 10.1" 1280x800 IPS TFT Cap Touch Mod.

      - logictechno,lt170410-2whc

        # Logic Technologies LTTD800x480 L2RT 7" 800x480 TFT Resistive Touch Module

      - logictechno,lttd800480070-l2rt

        # Logic Technologies LTTD800480070-L6WH-RT 7” 800x480 TFT Resistive Touch Module

      - logictechno,lttd800480070-l6wh-rt

        # Mitsubishi "AA070MC01 7.0" WVGA TFT LCD panel

      - mitsubishi,aa070mc01-ca1

        # Multi-Inno Technology Co.,Ltd MI1010AIT-1CP 10.1" 1280x800 LVDS IPS Cap Touch Mod.

      - multi-inno,mi1010ait-1cp

        # NEC LCD Technologies, Ltd. 12.1" WXGA (1280x800) LVDS TFT LCD panel

      - nec,nl12880bc20-05

        # NEC LCD Technologies,Ltd. WQVGA TFT LCD panel

Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Required properties: 
Optional properties:

- phys: from general PHY binding: the phandle for the PHY device.

- phy-names: Should be "dphy" if phys references an external phy.

- #phy-cells: Defined when used as ISP phy, should be 0.

- power-domains: a phandle to mipi dsi power domain node.

- resets: list of phandle + reset specifier pairs, as described in [3].

- reset-names: string reset name, must be "apb".

Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml

0 → 100644
+208 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/solomon,ssd1307fb.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Solomon SSD1307 OLED Controller Framebuffer



maintainers:

  - Maxime Ripard <mripard@kernel.org>



properties:

  compatible:

    enum:

      - solomon,ssd1305fb-i2c

      - solomon,ssd1306fb-i2c

      - solomon,ssd1307fb-i2c

      - solomon,ssd1309fb-i2c



  reg:

    maxItems: 1



  pwms:

    maxItems: 1



  reset-gpios:

    maxItems: 1



  vbat-supply:

    description: The supply for VBAT



  solomon,height:

    $ref: /schemas/types.yaml#/definitions/uint32

    default: 16

    description:

      Height in pixel of the screen driven by the controller



  solomon,width:

    $ref: /schemas/types.yaml#/definitions/uint32

    default: 96

    description:

      Width in pixel of the screen driven by the controller



  solomon,page-offset:

    $ref: /schemas/types.yaml#/definitions/uint32

    default: 1

    description:

      Offset of pages (band of 8 pixels) that the screen is mapped to



  solomon,segment-no-remap:

    type: boolean

    description:

      Display needs normal (non-inverted) data column to segment mapping



  solomon,col-offset:

    $ref: /schemas/types.yaml#/definitions/uint32

    default: 0

    description:

      Offset of columns (COL/SEG) that the screen is mapped to



  solomon,com-seq:

    type: boolean

    description:

      Display uses sequential COM pin configuration



  solomon,com-lrremap:

    type: boolean

    description:

      Display uses left-right COM pin remap



  solomon,com-invdir:

    type: boolean

    description:

      Display uses inverted COM pin scan direction



  solomon,com-offset:

    $ref: /schemas/types.yaml#/definitions/uint32

    default: 0

    description:

      Number of the COM pin wired to the first display line



  solomon,prechargep1:

    $ref: /schemas/types.yaml#/definitions/uint32

    default: 2

    description:

      Length of deselect period (phase 1) in clock cycles



  solomon,prechargep2:

    $ref: /schemas/types.yaml#/definitions/uint32

    default: 2

    description:

      Length of precharge period (phase 2) in clock cycles.  This needs to be

      the higher, the higher the capacitance of the OLED's pixels is.



  solomon,dclk-div:

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 1

    maximum: 16

    description:

      Clock divisor. The default value is controller-dependent.



  solomon,dclk-frq:

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 15

    description:

      Clock frequency, higher value means higher frequency.

      The default value is controller-dependent.



  solomon,lookup-table:

    $ref: /schemas/types.yaml#/definitions/uint8-array

    maxItems: 4

    description:

      8 bit value array of current drive pulse widths for BANK0, and colors A,

      B, and C. Each value in range of 31 to 63 for pulse widths of 32 to 64.

      Color D is always width 64.



  solomon,area-color-enable:

    type: boolean

    description:

      Display uses color mode



  solomon,low-power:

    type: boolean

    description:

      Display runs in low power mode



required:

  - compatible

  - reg



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: solomon,ssd1305fb-i2c

    then:

      properties:

        solomon,dclk-div:

          default: 1

        solomon,dclk-frq:

          default: 7



  - if:

      properties:

        compatible:

          contains:

            const: solomon,ssd1306fb-i2c

    then:

      properties:

        solomon,dclk-div:

          default: 1

        solomon,dclk-frq:

          default: 8



  - if:

      properties:

        compatible:

          contains:

            const: solomon,ssd1307fb-i2c

    then:

      properties:

        solomon,dclk-div:

          default: 2

        solomon,dclk-frq:

          default: 12

      required:

        - pwms



  - if:

      properties:

        compatible:

          contains:

            const: solomon,ssd1309fb-i2c

    then:

      properties:

        solomon,dclk-div:

          default: 1

        solomon,dclk-frq:

          default: 10



additionalProperties: false



examples:

  - |

    i2c1 {

            #address-cells = <1>;

            #size-cells = <0>;



            ssd1307: oled@3c {

                    compatible = "solomon,ssd1307fb-i2c";

                    reg = <0x3c>;

                    pwms = <&pwm 4 3000>;

                    reset-gpios = <&gpio2 7>;

            };



            ssd1306: oled@3d {

                    compatible = "solomon,ssd1306fb-i2c";

                    reg = <0x3c>;

                    pwms = <&pwm 4 3000>;

                    reset-gpios = <&gpio2 7>;

                    solomon,com-lrremap;

                    solomon,com-invdir;

                    solomon,com-offset = <32>;

                    solomon,lookup-table = /bits/ 8 <0x3f 0x3f 0x3f 0x3f>;

            };

    };

Documentation/devicetree/bindings/display/ssd1307fb.txt

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
* Solomon SSD1307 Framebuffer Driver



Required properties:

  - compatible: Should be "solomon,<chip>fb-<bus>". The only supported bus for

    now is i2c, and the supported chips are ssd1305, ssd1306, ssd1307 and

    ssd1309.

  - reg: Should contain address of the controller on the I2C bus. Most likely

         0x3c or 0x3d

  - pwm: Should contain the pwm to use according to the OF device tree PWM

         specification [0]. Only required for the ssd1307.

  - solomon,height: Height in pixel of the screen driven by the controller

  - solomon,width: Width in pixel of the screen driven by the controller

  - solomon,page-offset: Offset of pages (band of 8 pixels) that the screen is

    mapped to.



Optional properties:

  - reset-gpios: The GPIO used to reset the OLED display, if available. See

                 Documentation/devicetree/bindings/gpio/gpio.txt for details.

  - vbat-supply: The supply for VBAT

  - solomon,segment-no-remap: Display needs normal (non-inverted) data column

                              to segment mapping

  - solomon,col-offset: Offset of columns (COL/SEG) that the screen is mapped to.

  - solomon,com-seq: Display uses sequential COM pin configuration

  - solomon,com-lrremap: Display uses left-right COM pin remap

  - solomon,com-invdir: Display uses inverted COM pin scan direction

  - solomon,com-offset: Number of the COM pin wired to the first display line

  - solomon,prechargep1: Length of deselect period (phase 1) in clock cycles.

  - solomon,prechargep2: Length of precharge period (phase 2) in clock cycles.

                         This needs to be the higher, the higher the capacitance

                         of the OLED's pixels is

  - solomon,dclk-div: Clock divisor 1 to 16

  - solomon,dclk-frq: Clock frequency 0 to 15, higher value means higher

                      frequency

  - solomon,lookup-table: 8 bit value array of current drive pulse widths for

                          BANK0, and colors A, B, and C. Each value in range

                          of 31 to 63 for pulse widths of 32 to 64. Color D

                          is always width 64.

  - solomon,area-color-enable: Display uses color mode

  - solomon,low-power. Display runs in low power mode



[0]: Documentation/devicetree/bindings/pwm/pwm.txt



Examples:

ssd1307: oled@3c {

        compatible = "solomon,ssd1307fb-i2c";

        reg = <0x3c>;

        pwms = <&pwm 4 3000>;

        reset-gpios = <&gpio2 7>;

};



ssd1306: oled@3c {

        compatible = "solomon,ssd1306fb-i2c";

        reg = <0x3c>;

        pwms = <&pwm 4 3000>;

        reset-gpios = <&gpio2 7>;

        solomon,com-lrremap;

        solomon,com-invdir;

        solomon,com-offset = <32>;

        solomon,lookup-table = /bits/ 8 <0x3f 0x3f 0x3f 0x3f>;

};

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -936,6 +936,8 @@ patternProperties: 
    description: Chengdu Kaixuan Information Technology Co., Ltd.

  "^qiaodian,.*":

    description: QiaoDian XianShi Corporation

  "^qishenglong,.*":

    description: Shenzhen QiShenglong Industrialist Co., Ltd.

  "^qnap,.*":

    description: QNAP Systems, Inc.

  "^radxa,.*":