Commit 59d41458 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Daniel Vetter:
"drivers fixes:

   - i915 fixes for ttm backend + one pm wakelock fix

   - amdgpu fixes, fairly big pile of small things all over. Note this
     doesn't yet containe the fixed version of the otg sync patch that
     blew up

   - small driver fixes: meson, sun4i, vga16fb probe fix

  drm core fixes:

   - cma-buf heap locking

   - ttm compilation

   - self refresh helper state check

   - wrong error message in atomic helpers

   - mipi-dbi buffer mapping"

* tag 'drm-next-2022-01-14' of git://anongit.freedesktop.org/drm/drm: (49 commits)
  drm/mipi-dbi: Fix source-buffer address in mipi_dbi_buf_copy
  drm: fix error found in some cases after the patch d1af5cd86997
  drm/ttm: fix compilation on ARCH=um
  dma-buf: cma_heap: Fix mutex locking section
  video: vga16fb: Only probe for EGA and VGA 16 color graphic cards
  drm/amdkfd: Fix ASIC name typos
  drm/amdkfd: Fix DQM asserts on Hawaii
  drm/amdgpu: Use correct VIEWPORT_DIMENSION for DCN2
  drm/amd/pm: only send GmiPwrDnControl msg on master die (v3)
  drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
  drm/amdgpu: not return error on the init_apu_flags
  drm/amdkfd: Use prange->update_list head for remove_list
  drm/amdkfd: Use prange->list head for insert_list
  drm/amdkfd: make SPDX License expression more sound
  drm/amdkfd: Check for null pointer after calling kmemdup
  drm/amd/display: invalid parameter check in dmub_hpd_callback
  Revert "drm/amdgpu: Don't inherit GEM object VMAs in child process"
  drm/amd/display: reset dcn31 SMU mailbox on failures
  drm/amdkfd: use default_groups in kobj_type
  drm/amdgpu: use default_groups in kobj_type
  ...
parents 2aab34f8 4efdddbc

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_amdkfd.c

+0 −7
Original line number Diff line number Diff line
@@ -514,13 +514,6 @@ int amdgpu_amdkfd_get_dmabuf_info(struct amdgpu_device *adev, int dma_buf_fd, 
	return r;

}



uint64_t amdgpu_amdkfd_get_vram_usage(struct amdgpu_device *adev)

{

	struct ttm_resource_manager *vram_man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);



	return amdgpu_vram_mgr_usage(vram_man);

}



uint8_t amdgpu_amdkfd_get_xgmi_hops_count(struct amdgpu_device *dst,

					  struct amdgpu_device *src)

{

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h

+0 −1
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ int amdgpu_amdkfd_get_dmabuf_info(struct amdgpu_device *adev, int dma_buf_fd, 
				  uint64_t *bo_size, void *metadata_buffer,

				  size_t buffer_size, uint32_t *metadata_size,

				  uint32_t *flags);

uint64_t amdgpu_amdkfd_get_vram_usage(struct amdgpu_device *adev);

uint8_t amdgpu_amdkfd_get_xgmi_hops_count(struct amdgpu_device *dst,

					  struct amdgpu_device *src);

int amdgpu_amdkfd_get_xgmi_bandwidth_mbytes(struct amdgpu_device *dst,