Commit 3208a24f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2020-04-04' of... 

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

 into drm-next

A bunch of fixes to avoid null pointer dereference in fbcon, fix a return
in xen, some DT bindings fixes, a vc4 issue with 1920x1200 mode validation,
and a conflicting framebuffer in vboxvideo.

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200404090057.a3m7uw6tavwtcyon@gilmour.lan
parents 0a1a6793 d8a26d8f

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

+0 −10
Original line number Diff line number Diff line
@@ -21,15 +21,6 @@ properties: 
      - {}

      - const: panel-dpi



  data-mapping:

    enum:

      - rgb24

      - rgb565

      - bgr666

    description: |

      Describes the media format, how the display panel is connected

      to the display interface.



  backlight: true

  enable-gpios: true

  height-mm: true
@@ -52,7 +43,6 @@ examples: 
        compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";

        label = "osddisplay";

        power-supply = <&vcc_supply>;

        data-mapping = "rgb565";

        backlight = <&backlight>;



        port {

Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ properties: 
  ports:

    type: object

    description:

      Ports as described in Documentation/devictree/bindings/graph.txt

      Ports as described in Documentation/devicetree/bindings/graph.txt

    properties:

      "#address-cells":

        const: 1
@@ -121,7 +121,7 @@ examples: 
    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/soc/ti,sci_pm_domain.h>



    dss: dss@04a00000 {

    dss: dss@4a00000 {

            compatible = "ti,am65x-dss";

            reg =   <0x0 0x04a00000 0x0 0x1000>, /* common */

                    <0x0 0x04a02000 0x0 0x1000>, /* vidl1 */

Documentation/devicetree/bindings/display/ti/ti,j721e-dss.yaml

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ properties: 
  ports:

    type: object

    description:

      Ports as described in Documentation/devictree/bindings/graph.txt

      Ports as described in Documentation/devicetree/bindings/graph.txt

    properties:

      "#address-cells":

        const: 1
@@ -154,7 +154,7 @@ examples: 
    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/soc/ti,sci_pm_domain.h>



    dss: dss@04a00000 {

    dss: dss@4a00000 {

            compatible = "ti,j721e-dss";

            reg =   <0x00 0x04a00000 0x00 0x10000>, /* common_m */

                    <0x00 0x04a10000 0x00 0x10000>, /* common_s0*/

Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ properties: 
  port:

    type: object

    description:

      Port as described in Documentation/devictree/bindings/graph.txt.

      Port as described in Documentation/devicetree/bindings/graph.txt.

      The DSS DPI output port node



  max-memory-bandwidth:
@@ -81,7 +81,7 @@ examples: 
    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/interrupt-controller/irq.h>



    dss: dss@02540000 {

    dss: dss@2540000 {

            compatible = "ti,k2g-dss";

            reg =   <0x02540000 0x400>,

                    <0x02550000 0x1000>,

drivers/dma-buf/Kconfig

+6 −5
Original line number Diff line number Diff line
@@ -43,11 +43,12 @@ config DMABUF_MOVE_NOTIFY 
	bool "Move notify between drivers (EXPERIMENTAL)"

	default n

	help

	  Don''t pin buffers if the dynamic DMA-buf interface is available on both the

	  exporter as well as the importer. This fixes a security problem where

	  userspace is able to pin unrestricted amounts of memory through DMA-buf.

	  But marked experimental because we don''t jet have a consistent execution

	  context and memory management between drivers.

	  Don't pin buffers if the dynamic DMA-buf interface is available on

	  both the exporter as well as the importer. This fixes a security

	  problem where userspace is able to pin unrestricted amounts of memory

	  through DMA-buf.

	  This is marked experimental because we don't yet have a consistent

	  execution context and memory management between drivers.



config DMABUF_SELFTESTS

	tristate "Selftests for the dma-buf interfaces"

CRA Git | Maintained and supported by SUSTech CRA and CCSE