Commit fdce2960 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2021-02-26' of git://anongit.freedesktop.org/drm/drm 

Pull more drm updates from Dave Airlie:
 "This is mostly fixes but I missed msm-next pull last week. It's been
  in drm-next.

  Otherwise it's a selection of i915, amdgpu and misc fixes, one TTM
  memory leak, nothing really major stands out otherwise.

  core:
   - vblank fence timing improvements

  dma-buf:
   - improve error handling

  ttm:
   - memory leak fix

  msm:
   - a6xx speedbin support
   - a508, a509, a512 support
   - various a5xx fixes
   - various dpu fixes
   - qseed3lite support for sm8250
   - dsi fix for msm8994
   - mdp5 fix for framerate bug with cmd mode panels
   - a6xx GMU OOB race fixes that were showing up in CI
   - various addition and removal of semicolons
   - gem submit fix for legacy userspace relocs path

  amdgpu:
   - clang warning fix
   - S0ix platform shutdown/poweroff fix
   - misc display fixes

  i915:
   - color format fix
   - -Wuninitialised reenabled
   - GVT ww locking, cmd parser fixes

  atyfb:
   - fix build

  rockchip:
   - AFBC modifier fix"

* tag 'drm-next-2021-02-26' of git://anongit.freedesktop.org/drm/drm: (60 commits)
  drm/panel: kd35t133: allow using non-continuous dsi clock
  drm/rockchip: Require the YTR modifier for AFBC
  drm/ttm: Fix a memory leak
  drm/drm_vblank: set the dma-fence timestamp during send_vblank_event
  dma-fence: allow signaling drivers to set fence timestamp
  dma-buf: heaps: Rework heap allocation hooks to return struct dma_buf instead of fd
  dma-buf: system_heap: Make sure to return an error if we abort
  drm/amd/display: Fix system hang after multiple hotplugs (v3)
  drm/amdgpu: fix shutdown and poweroff process failed with s0ix
  drm/i915: Nuke INTEL_OUTPUT_FORMAT_INVALID
  drm/i915: Enable -Wuninitialized
  drm/amd/display: Remove Assert from dcn10_get_dig_frontend
  drm/amd/display: Add vupdate_no_lock interrupts for DCN2.1
  Revert "drm/amd/display: reuse current context instead of recreating one"
  drm/amd/pm/swsmu: Avoid using structure_size uninitialized in smu_cmn_init_soft_gpu_metrics
  fbdev: atyfb: add stubs for aty_{ld,st}_lcd()
  drm/i915/gvt: Introduce per object locking in GVT scheduler.
  drm/i915/gvt: Purge dev_priv->gt
  drm/i915/gvt: Parse default state to update reg whitelist
  dt-bindings: dp-connector: Drop maxItems from -supply
  ...
parents 5ad3dbab d153e8c1

Documentation/devicetree/bindings/display/connector/dp-connector.yaml

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ properties: 


  dp-pwr-supply:

    description: Power supply for the DP_PWR pin

    maxItems: 1



  port:

    $ref: /schemas/graph.yaml#/properties/port

drivers/dma-buf/dma-fence.c

+63 −7
Original line number Diff line number Diff line
@@ -312,22 +312,25 @@ void __dma_fence_might_wait(void) 




/**

 * dma_fence_signal_locked - signal completion of a fence

 * dma_fence_signal_timestamp_locked - signal completion of a fence

 * @fence: the fence to signal

 * @timestamp: fence signal timestamp in kernel's CLOCK_MONOTONIC time domain

 *

 * Signal completion for software callbacks on a fence, this will unblock

 * dma_fence_wait() calls and run all the callbacks added with

 * dma_fence_add_callback(). Can be called multiple times, but since a fence

 * can only go from the unsignaled to the signaled state and not back, it will

 * only be effective the first time.

 * only be effective the first time. Set the timestamp provided as the fence

 * signal timestamp.

 *

 * Unlike dma_fence_signal(), this function must be called with &dma_fence.lock

 * held.

 * Unlike dma_fence_signal_timestamp(), this function must be called with

 * &dma_fence.lock held.

 *

 * Returns 0 on success and a negative error value when @fence has been

 * signalled already.

 */

int dma_fence_signal_locked(struct dma_fence *fence)

int dma_fence_signal_timestamp_locked(struct dma_fence *fence,

				      ktime_t timestamp)

{

	struct dma_fence_cb *cur, *tmp;

	struct list_head cb_list;
@@ -341,7 +344,7 @@ int dma_fence_signal_locked(struct dma_fence *fence) 
	/* Stash the cb_list before replacing it with the timestamp */

	list_replace(&fence->cb_list, &cb_list);



	fence->timestamp = ktime_get();

	fence->timestamp = timestamp;

	set_bit(DMA_FENCE_FLAG_TIMESTAMP_BIT, &fence->flags);

	trace_dma_fence_signaled(fence);
@@ -352,6 +355,59 @@ int dma_fence_signal_locked(struct dma_fence *fence) 


	return 0;

}

EXPORT_SYMBOL(dma_fence_signal_timestamp_locked);



/**

 * dma_fence_signal_timestamp - signal completion of a fence

 * @fence: the fence to signal

 * @timestamp: fence signal timestamp in kernel's CLOCK_MONOTONIC time domain

 *

 * Signal completion for software callbacks on a fence, this will unblock

 * dma_fence_wait() calls and run all the callbacks added with

 * dma_fence_add_callback(). Can be called multiple times, but since a fence

 * can only go from the unsignaled to the signaled state and not back, it will

 * only be effective the first time. Set the timestamp provided as the fence

 * signal timestamp.

 *

 * Returns 0 on success and a negative error value when @fence has been

 * signalled already.

 */

int dma_fence_signal_timestamp(struct dma_fence *fence, ktime_t timestamp)

{

	unsigned long flags;

	int ret;



	if (!fence)

		return -EINVAL;



	spin_lock_irqsave(fence->lock, flags);

	ret = dma_fence_signal_timestamp_locked(fence, timestamp);

	spin_unlock_irqrestore(fence->lock, flags);



	return ret;

}

EXPORT_SYMBOL(dma_fence_signal_timestamp);



/**

 * dma_fence_signal_locked - signal completion of a fence

 * @fence: the fence to signal

 *

 * Signal completion for software callbacks on a fence, this will unblock

 * dma_fence_wait() calls and run all the callbacks added with

 * dma_fence_add_callback(). Can be called multiple times, but since a fence

 * can only go from the unsignaled to the signaled state and not back, it will

 * only be effective the first time.

 *

 * Unlike dma_fence_signal(), this function must be called with &dma_fence.lock

 * held.

 *

 * Returns 0 on success and a negative error value when @fence has been

 * signalled already.

 */

int dma_fence_signal_locked(struct dma_fence *fence)

{

	return dma_fence_signal_timestamp_locked(fence, ktime_get());

}

EXPORT_SYMBOL(dma_fence_signal_locked);



/**
@@ -379,7 +435,7 @@ int dma_fence_signal(struct dma_fence *fence) 
	tmp = dma_fence_begin_signalling();



	spin_lock_irqsave(fence->lock, flags);

	ret = dma_fence_signal_locked(fence);

	ret = dma_fence_signal_timestamp_locked(fence, ktime_get());

	spin_unlock_irqrestore(fence->lock, flags);



	dma_fence_end_signalling(tmp);

drivers/dma-buf/dma-heap.c

+13 −1
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ static int dma_heap_buffer_alloc(struct dma_heap *heap, size_t len, 
				 unsigned int fd_flags,

				 unsigned int heap_flags)

{

	struct dma_buf *dmabuf;

	int fd;



	/*

	 * Allocations from all heaps have to begin

	 * and end on page boundaries.
@@ -60,7 +63,16 @@ static int dma_heap_buffer_alloc(struct dma_heap *heap, size_t len, 
	if (!len)

		return -EINVAL;



	return heap->ops->allocate(heap, len, fd_flags, heap_flags);

	dmabuf = heap->ops->allocate(heap, len, fd_flags, heap_flags);

	if (IS_ERR(dmabuf))

		return PTR_ERR(dmabuf);



	fd = dma_buf_fd(dmabuf, fd_flags);

	if (fd < 0) {

		dma_buf_put(dmabuf);

		/* just return, as put will call release and that will free */

	}

	return fd;

}



static int dma_heap_open(struct inode *inode, struct file *file)

drivers/dma-buf/heaps/cma_heap.c

+7 −15
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static const struct dma_buf_ops cma_heap_buf_ops = { 
	.release = cma_heap_dma_buf_release,

};



static int cma_heap_allocate(struct dma_heap *heap,

static struct dma_buf *cma_heap_allocate(struct dma_heap *heap,

					 unsigned long len,

					 unsigned long fd_flags,

					 unsigned long heap_flags)
@@ -289,7 +289,7 @@ static int cma_heap_allocate(struct dma_heap *heap, 


	buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);

	if (!buffer)

		return -ENOMEM;

		return ERR_PTR(-ENOMEM);



	INIT_LIST_HEAD(&buffer->attachments);

	mutex_init(&buffer->lock);
@@ -348,15 +348,7 @@ static int cma_heap_allocate(struct dma_heap *heap, 
		ret = PTR_ERR(dmabuf);

		goto free_pages;

	}



	ret = dma_buf_fd(dmabuf, fd_flags);

	if (ret < 0) {

		dma_buf_put(dmabuf);

		/* just return, as put will call release and that will free */

		return ret;

	}



	return ret;

	return dmabuf;



free_pages:

	kfree(buffer->pages);
@@ -365,7 +357,7 @@ static int cma_heap_allocate(struct dma_heap *heap, 
free_buffer:

	kfree(buffer);



	return ret;

	return ERR_PTR(ret);

}



static const struct dma_heap_ops cma_heap_ops = {

drivers/dma-buf/heaps/system_heap.c

+10 −15
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static struct page *alloc_largest_available(unsigned long size, 
	return NULL;

}



static int system_heap_allocate(struct dma_heap *heap,

static struct dma_buf *system_heap_allocate(struct dma_heap *heap,

					    unsigned long len,

					    unsigned long fd_flags,

					    unsigned long heap_flags)
@@ -349,7 +349,7 @@ static int system_heap_allocate(struct dma_heap *heap, 


	buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);

	if (!buffer)

		return -ENOMEM;

		return ERR_PTR(-ENOMEM);



	INIT_LIST_HEAD(&buffer->attachments);

	mutex_init(&buffer->lock);
@@ -363,8 +363,10 @@ static int system_heap_allocate(struct dma_heap *heap, 
		 * Avoid trying to allocate memory if the process

		 * has been killed by SIGKILL

		 */

		if (fatal_signal_pending(current))

		if (fatal_signal_pending(current)) {

			ret = -EINTR;

			goto free_buffer;

		}



		page = alloc_largest_available(size_remaining, max_order);

		if (!page)
@@ -397,14 +399,7 @@ static int system_heap_allocate(struct dma_heap *heap, 
		ret = PTR_ERR(dmabuf);

		goto free_pages;

	}



	ret = dma_buf_fd(dmabuf, fd_flags);

	if (ret < 0) {

		dma_buf_put(dmabuf);

		/* just return, as put will call release and that will free */

		return ret;

	}

	return ret;

	return dmabuf;



free_pages:

	for_each_sgtable_sg(table, sg, i) {
@@ -418,7 +413,7 @@ static int system_heap_allocate(struct dma_heap *heap, 
		__free_pages(page, compound_order(page));

	kfree(buffer);



	return ret;

	return ERR_PTR(ret);

}



static const struct dma_heap_ops system_heap_ops = {