Commit 71e4a702 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-fixes-2022-01-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



Two DT bindings fixes for meson, a device refcounting fix for sun4i, a
probe fix for vga16fb, a locking fix for the CMA dma-buf heap and a
compilation fix for ttm.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
[danvet: I made sure I have exactly the same conflict resolution as
Linus in 8d0749b4 ("Merge tag 'drm-next-2022-01-07' of
git://anongit.freedesktop.org/drm/drm") to avoid further conflict fun.
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220114125454.zs46ny52lrxk3ljz@houat
parents ad783ff5 016017a1

Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml

+5 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ title: Amlogic specific extensions to the Synopsys Designware HDMI Controller 
maintainers:

  - Neil Armstrong <narmstrong@baylibre.com>



allOf:

  - $ref: /schemas/sound/name-prefix.yaml#



description: |

  The Amlogic Meson Synopsys Designware Integration is composed of

  - A Synopsys DesignWare HDMI Controller IP
@@ -99,6 +102,8 @@ properties: 
  "#sound-dai-cells":

    const: 0



  sound-name-prefix: true



required:

  - compatible

  - reg

Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml

+6 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ properties: 
  interrupts:

    maxItems: 1



  amlogic,canvas:

    description: should point to a canvas provider node

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



  power-domains:

    maxItems: 1

    description: phandle to the associated power domain
@@ -106,6 +110,7 @@ required: 
  - port@1

  - "#address-cells"

  - "#size-cells"

  - amlogic,canvas



additionalProperties: false
@@ -118,6 +123,7 @@ examples: 
        interrupts = <3>;

        #address-cells = <1>;

        #size-cells = <0>;

        amlogic,canvas = <&canvas>;



        /* CVBS VDAC output port */

        port@0 {

drivers/dma-buf/heaps/cma_heap.c

+4 −2
Original line number Diff line number Diff line
@@ -124,10 +124,11 @@ static int cma_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, 
	struct cma_heap_buffer *buffer = dmabuf->priv;

	struct dma_heap_attachment *a;



	mutex_lock(&buffer->lock);



	if (buffer->vmap_cnt)

		invalidate_kernel_vmap_range(buffer->vaddr, buffer->len);



	mutex_lock(&buffer->lock);

	list_for_each_entry(a, &buffer->attachments, list) {

		if (!a->mapped)

			continue;
@@ -144,10 +145,11 @@ static int cma_heap_dma_buf_end_cpu_access(struct dma_buf *dmabuf, 
	struct cma_heap_buffer *buffer = dmabuf->priv;

	struct dma_heap_attachment *a;



	mutex_lock(&buffer->lock);



	if (buffer->vmap_cnt)

		flush_kernel_vmap_range(buffer->vaddr, buffer->len);



	mutex_lock(&buffer->lock);

	list_for_each_entry(a, &buffer->attachments, list) {

		if (!a->mapped)

			continue;

drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ amdgpu_dma_buf_move_notify(struct dma_buf_attachment *attach) 
	struct amdgpu_vm_bo_base *bo_base;

	int r;



	if (bo->tbo.resource->mem_type == TTM_PL_SYSTEM)

	if (!bo->tbo.resource || bo->tbo.resource->mem_type == TTM_PL_SYSTEM)

		return;



	r = ttm_bo_validate(&bo->tbo, &placement, &ctx);

drivers/gpu/drm/ast/ast_mode.c

+4 −1
Original line number Diff line number Diff line
@@ -1118,7 +1118,10 @@ static void ast_crtc_reset(struct drm_crtc *crtc) 
	if (crtc->state)

		crtc->funcs->atomic_destroy_state(crtc, crtc->state);



	if (ast_state)

		__drm_atomic_helper_crtc_reset(crtc, &ast_state->base);

	else

		__drm_atomic_helper_crtc_reset(crtc, NULL);

}



static struct drm_crtc_state *