Commit 1493bddc authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2020-05-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 5.8:

UAPI Changes:

Cross-subsystem Changes:

 * dma-buf: use atomic64_fetch_add() for context id
 * Documentation: document bindings for ASUS ZOOT TM5P5, BOE NV133FHM-N62,
                  hpd-gpios

Core Changes:

Driver Changes:

 * drm/ast: fix supend; cleanups
 * drm/i2c: cleanups
 * drm/panel: add MODULE_LICENSE to panel-visinox-rm69299; add support for
              ASUS TM5P5i, BOE NV133FHM-N62i; fix size and bpp of BOE NV133FHM-N61
	      add hpd-gpio to panel-simple
 * drm/mcde: fix return value check in mcde_dsi_bind()
 * drm/mgag200: use managed drmm_mode_config_init(); cleanups
 * fbdev/pxa168fb: cleanups

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200514070819.GA6930@linux-uq9g
parents 80c9b58e 1c530d43

Documentation/devicetree/bindings/display/panel/asus,z00t-tm5p5-nt35596.yaml

0 → 100644
+56 −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/panel/asus,z00t-tm5p5-nt35596.yaml#

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



title: ASUS Z00T TM5P5 NT35596 5.5" 1080×1920 LCD Panel



maintainers:

  - Konrad Dybcio <konradybcio@gmail.com>



description: |+

  This panel seems to only be found in the Asus Z00T

  smartphone and we have no straightforward way of

  actually getting the correct model number,

  as no schematics are released publicly.



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    const: asus,z00t-tm5p5-n35596

  reg: true

  reset-gpios: true

  vdd-supply:

     description: core voltage supply

  vddio-supply:

     description: vddio supply



required:

  - compatible

  - reg

  - vdd-supply

  - vddio-supply

  - reset-gpios



additionalProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>



    dsi {

            #address-cells = <1>;

            #size-cells = <0>;

            panel@0 {

                    reg = <0>;



                    compatible = "asus,z00t-tm5p5-n35596";



                    vdd-supply = <&pm8916_l8>;

                    vddio-supply = <&pm8916_l6>;

                    reset-gpios = <&msmgpio 25 GPIO_ACTIVE_HIGH>;

            };

    };

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

+6 −0
Original line number Diff line number Diff line
@@ -96,6 +96,12 @@ properties: 
      (hot plug detect) signal, but the signal isn't hooked up so we should

      hardcode the max delay from the panel spec when powering up the panel.



  hpd-gpios:

    maxItems: 1

    description:

      If Hot Plug Detect (HPD) is connected to a GPIO in the system rather

      than a dedicated HPD pin the pin can be specified here.



  # Control I/Os



  # Many display panels can be controlled through pins driven by GPIOs. The nature

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

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ properties: 
      - boe,nv101wxmn51

        # BOE NV133FHM-N61 13.3" FHD (1920x1080) TFT LCD Panel

      - boe,nv133fhm-n61

        # BOE NV133FHM-N62 13.3" FHD (1920x1080) TFT LCD Panel

      - boe,nv133fhm-n62

        # BOE NV140FHM-N49 14.0" FHD a-Si FT panel

      - boe,nv140fhmn49

        # CDTech(H.K.) Electronics Limited 4.3" 480x272 color TFT-LCD panel

drivers/dma-buf/dma-fence.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ EXPORT_SYMBOL(dma_fence_get_stub); 
u64 dma_fence_context_alloc(unsigned num)

{

	WARN_ON(!num);

	return atomic64_add_return(num, &dma_fence_context_counter) - num;

	return atomic64_fetch_add(num, &dma_fence_context_counter);

}

EXPORT_SYMBOL(dma_fence_context_alloc);

drivers/gpu/drm/ast/ast_mode.c

+6 −2
Original line number Diff line number Diff line
@@ -561,7 +561,8 @@ static int ast_primary_plane_helper_atomic_check(struct drm_plane *plane, 
	return 0;

}



void ast_primary_plane_helper_atomic_update(struct drm_plane *plane,

static void

ast_primary_plane_helper_atomic_update(struct drm_plane *plane,

				       struct drm_plane_state *old_state)

{

	struct ast_private *ast = plane->dev->dev_private;
@@ -801,6 +802,9 @@ static int ast_crtc_helper_atomic_check(struct drm_crtc *crtc, 
		return -EINVAL;

	}



	if (!state->enable)

		return 0; /* no mode checks if CRTC is being disabled */



	ast_state = to_ast_crtc_state(state);



	format = ast_state->format;

CRA Git | Maintained and supported by SUSTech CRA and CCSE