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

Merge tag 'drm-misc-next-2019-01-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 5.1:

UAPI Changes:
 - New fourcc identifier for ARM Framebuffer Compression v1.3

Cross-subsystem Changes:

Core Changes:
 - Reorganisation of drm_device and drm_framebuffer headers
 - Cleanup of the drmP inclusion
 - Fix leaks in the fb-helpers
 - Allow for depth different from bpp in fb-helper fbdev emulation
 - Remove drm_mode_object from drm_display_mode

Driver Changes:
 - Add reflection properties to rockchip
 - a bunch of fixes for virtio
 - a bunch of fixes for dp_mst and drivers using it, and introduction of a
   new refcounting scheme
 - Convertion of bochs to atomic and generic fbdev emulation
 - Allow meson to remove the firmware framebuffers

[airlied: patch rcar-du to add drm_modes.h]
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190116200428.u2n4jbk4mzza7n6e@flea
parents b122153c 94520db5

Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
		"rockchip,rk3126-vop";

		"rockchip,px30-vop-lit";

		"rockchip,px30-vop-big";

		"rockchip,rk3066-vop";

		"rockchip,rk3188-vop";

		"rockchip,rk3288-vop";

		"rockchip,rk3368-vop";

Documentation/gpu/dp-mst/topology-figure-1.dot

0 → 100644
+52 −0
Original line number Diff line number Diff line 
digraph T {

    /* Make sure our payloads are always drawn below the driver node */

    subgraph cluster_driver {

        fillcolor = grey;

        style = filled;

        driver -> {payload1, payload2} [dir=none];

    }



    /* Driver malloc references */

    edge [style=dashed];

    driver -> port1;

    driver -> port2;

    driver -> port3:e;

    driver -> port4;



    payload1:s -> port1:e;

    payload2:s -> port3:e;

    edge [style=""];



    subgraph cluster_topology {

        label="Topology Manager";

        labelloc=bottom;



        /* Topology references */

        mstb1 -> {port1, port2};

        port1 -> mstb2;

        port2 -> mstb3 -> {port3, port4};

        port3 -> mstb4;



        /* Malloc references */

        edge [style=dashed;dir=back];

        mstb1 -> {port1, port2};

        port1 -> mstb2;

        port2 -> mstb3 -> {port3, port4};

        port3 -> mstb4;

    }



    driver [label="DRM driver";style=filled;shape=box;fillcolor=lightblue];



    payload1 [label="Payload #1";style=filled;shape=box;fillcolor=lightblue];

    payload2 [label="Payload #2";style=filled;shape=box;fillcolor=lightblue];



    mstb1 [label="MSTB #1";style=filled;fillcolor=palegreen;shape=oval];

    mstb2 [label="MSTB #2";style=filled;fillcolor=palegreen;shape=oval];

    mstb3 [label="MSTB #3";style=filled;fillcolor=palegreen;shape=oval];

    mstb4 [label="MSTB #4";style=filled;fillcolor=palegreen;shape=oval];



    port1 [label="Port #1";shape=oval];

    port2 [label="Port #2";shape=oval];

    port3 [label="Port #3";shape=oval];

    port4 [label="Port #4";shape=oval];

}

Documentation/gpu/dp-mst/topology-figure-2.dot

0 → 100644
+56 −0
Original line number Diff line number Diff line 
digraph T {

    /* Make sure our payloads are always drawn below the driver node */

    subgraph cluster_driver {

        fillcolor = grey;

        style = filled;

        driver -> {payload1, payload2} [dir=none];

    }



    /* Driver malloc references */

    edge [style=dashed];

    driver -> port1;

    driver -> port2;

    driver -> port3:e;

    driver -> port4 [color=red];



    payload1:s -> port1:e;

    payload2:s -> port3:e;

    edge [style=""];



    subgraph cluster_topology {

        label="Topology Manager";

        labelloc=bottom;



        /* Topology references */

        mstb1 -> {port1, port2};

        port1 -> mstb2;

        edge [color=red];

        port2 -> mstb3 -> {port3, port4};

        port3 -> mstb4;

        edge [color=""];



        /* Malloc references */

        edge [style=dashed;dir=back];

        mstb1 -> {port1, port2};

        port1 -> mstb2;

        port2 -> mstb3 -> port3;

        edge [color=red];

        mstb3 -> port4;

        port3 -> mstb4;

    }



    mstb1 [label="MSTB #1";style=filled;fillcolor=palegreen];

    mstb2 [label="MSTB #2";style=filled;fillcolor=palegreen];

    mstb3 [label="MSTB #3";style=filled;fillcolor=palegreen];

    mstb4 [label="MSTB #4";style=filled;fillcolor=grey];



    port1 [label="Port #1"];

    port2 [label="Port #2"];

    port3 [label="Port #3"];

    port4 [label="Port #4";style=filled;fillcolor=grey];



    driver [label="DRM driver";style=filled;shape=box;fillcolor=lightblue];



    payload1 [label="Payload #1";style=filled;shape=box;fillcolor=lightblue];

    payload2 [label="Payload #2";style=filled;shape=box;fillcolor=lightblue];

}

Documentation/gpu/dp-mst/topology-figure-3.dot

0 → 100644
+59 −0
Original line number Diff line number Diff line 
digraph T {

    /* Make sure our payloads are always drawn below the driver node */

    subgraph cluster_driver {

        fillcolor = grey;

        style = filled;

        edge [dir=none];

        driver -> payload1;

        driver -> payload2 [penwidth=3];

        edge [dir=""];

    }



    /* Driver malloc references */

    edge [style=dashed];

    driver -> port1;

    driver -> port2;

    driver -> port3:e;

    driver -> port4 [color=grey];

    payload1:s -> port1:e;

    payload2:s -> port3:e [penwidth=3];

    edge [style=""];



    subgraph cluster_topology {

        label="Topology Manager";

        labelloc=bottom;



        /* Topology references */

        mstb1 -> {port1, port2};

        port1 -> mstb2;

        edge [color=grey];

        port2 -> mstb3 -> {port3, port4};

        port3 -> mstb4;

        edge [color=""];



        /* Malloc references */

        edge [style=dashed;dir=back];

        mstb1 -> {port1, port2};

        port1 -> mstb2;

        port2 -> mstb3 [penwidth=3];

        mstb3 -> port3 [penwidth=3];

        edge [color=grey];

        mstb3 -> port4;

        port3 -> mstb4;

    }



    mstb1 [label="MSTB #1";style=filled;fillcolor=palegreen];

    mstb2 [label="MSTB #2";style=filled;fillcolor=palegreen];

    mstb3 [label="MSTB #3";style=filled;fillcolor=palegreen;penwidth=3];

    mstb4 [label="MSTB #4";style=filled;fillcolor=grey];



    port1 [label="Port #1"];

    port2 [label="Port #2";penwidth=5];

    port3 [label="Port #3";penwidth=3];

    port4 [label="Port #4";style=filled;fillcolor=grey];



    driver [label="DRM driver";style=filled;shape=box;fillcolor=lightblue];



    payload1 [label="Payload #1";style=filled;shape=box;fillcolor=lightblue];

    payload2 [label="Payload #2";style=filled;shape=box;fillcolor=lightblue;penwidth=3];

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE