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

Merge tag 'drm-misc-fixes-2020-04-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



A few resources-related fixes (tidss, dp_mst, scheduler), probe fixes and
DT bindings adjustments.

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200423103224.7hvyr3v7dmuny2bz@gilmour.lan
parents 11c5ec78 9da67433

Documentation/devicetree/bindings/display/panel/leadtek,ltk500hd1829.yaml

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ examples: 
    dsi {

        #address-cells = <1>;

        #size-cells = <0>;

        reg = <0xff450000 0x1000>;



        panel@0 {

            compatible = "leadtek,ltk500hd1829";

Documentation/devicetree/bindings/display/panel/lvds.yaml

+9 −1
Original line number Diff line number Diff line
@@ -96,12 +96,20 @@ properties: 
      If set, reverse the bit order described in the data mappings below on all

      data lanes, transmitting bits for slots 6 to 0 instead of 0 to 6.



  port: true

  ports: true



required:

  - compatible

  - data-mapping

  - width-mm

  - height-mm

  - panel-timing



oneOf:

  - required:

      - port

  - required:

      - ports



...

Documentation/devicetree/bindings/display/panel/xinpeng,xpp055c272.yaml

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ examples: 
    dsi {

        #address-cells = <1>;

        #size-cells = <0>;

        reg = <0xff450000 0x1000>;



        panel@0 {

            compatible = "xinpeng,xpp055c272";

drivers/gpu/drm/bridge/analogix/analogix-anx6345.c

+3 −0
Original line number Diff line number Diff line
@@ -485,6 +485,9 @@ static int anx6345_get_modes(struct drm_connector *connector) 


	num_modes += drm_add_edid_modes(connector, anx6345->edid);



	/* Driver currently supports only 6bpc */

	connector->display_info.bpc = 6;



unlock:

	if (power_off)

		anx6345_poweroff(anx6345);

drivers/gpu/drm/drm_dp_mst_topology.c

+1 −0
Original line number Diff line number Diff line
@@ -4295,6 +4295,7 @@ int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, 
	if (pos->vcpi) {

		drm_dp_mst_put_port_malloc(port);

		pos->vcpi = 0;

		pos->pbn = 0;

	}



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE