Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e91168a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/drm-misc-2016-11-10' of git://anongit.freedesktop.org/drm-intel into drm-next 

- better atomic state debugging from Rob
- fence prep from gustavo
- sumits flushed out his backlog of pending dma-buf/fence patches from
  various people
- drm_mm leak debugging plus trying to appease Kconfig (Chris)
- a few misc things all over

* tag 'topic/drm-misc-2016-11-10' of git://anongit.freedesktop.org/drm-intel: (35 commits)
  drm: Make DRM_DEBUG_MM depend on STACKTRACE_SUPPORT
  drm/i915: Restrict DRM_DEBUG_MM automatic selection
  drm: Restrict stackdepot usage to builtin drm.ko
  drm/msm: module param to dump state on error irq
  drm/msm/mdp5: add atomic_print_state support
  drm/atomic: add debugfs file to dump out atomic state
  drm/atomic: add new drm_debug bit to dump atomic state
  drm: add helpers to go from plane state to drm_rect
  drm: add helper for printing to log or seq_file
  drm: helper macros to print composite types
  reservation: revert "wait only with non-zero timeout specified (v3)" v2
  drm/ttm: fix ttm_bo_wait
  dma-buf/fence: revert "don't wait when specified timeout is zero" (v2)
  dma-buf/fence: make timeout handling in fence_default_wait consistent (v2)
  drm/amdgpu: add the interface of waiting multiple fences (v4)
  dma-buf: return index of the first signaled fence (v2)
  MAINTAINERS: update Sync File Framework files
  dma-buf/sw_sync: put fence reference from the fence creation
  dma-buf/sw_sync: mark sync_timeline_create() static
  drm: Add stackdepot include for DRM_DEBUG_MM
  ...
parents db8feb69 4b514e10

Documentation/gpu/drm-internals.rst

+17 −0
Original line number Diff line number Diff line
@@ -350,6 +350,23 @@ how the ioctl is allowed to be called. 
.. kernel-doc:: drivers/gpu/drm/drm_ioctl.c

   :export:





Misc Utilities

==============



Printer

-------



.. kernel-doc:: include/drm/drm_print.h

   :doc: print



.. kernel-doc:: include/drm/drm_print.h

   :internal:



.. kernel-doc:: include/drm/drm_print.h

   :export:





Legacy Support Code

===================

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -3919,8 +3919,10 @@ R: Gustavo Padovan <gustavo@padovan.org> 
S:	Maintained

L:	linux-media@vger.kernel.org

L:	dri-devel@lists.freedesktop.org

F:	drivers/dma-buf/sync_file.c

F:	drivers/dma-buf/sync_*

F:	drivers/dma-buf/sw_sync.c

F:	include/linux/sync_file.h

F:	include/uapi/linux/sync_file.h

F:	Documentation/sync_file.txt

T:	git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git

drivers/dma-buf/dma-fence.c

+21 −11
Original line number Diff line number Diff line
@@ -161,9 +161,6 @@ dma_fence_wait_timeout(struct dma_fence *fence, bool intr, signed long timeout) 
	if (WARN_ON(timeout < 0))

		return -EINVAL;



	if (timeout == 0)

		return dma_fence_is_signaled(fence);



	trace_dma_fence_wait_start(fence);

	ret = fence->ops->wait(fence, intr, timeout);

	trace_dma_fence_wait_end(fence);
@@ -339,18 +336,20 @@ dma_fence_default_wait_cb(struct dma_fence *fence, struct dma_fence_cb *cb) 
 * @timeout:	[in]	timeout value in jiffies, or MAX_SCHEDULE_TIMEOUT

 *

 * Returns -ERESTARTSYS if interrupted, 0 if the wait timed out, or the

 * remaining timeout in jiffies on success.

 * remaining timeout in jiffies on success. If timeout is zero the value one is

 * returned if the fence is already signaled for consistency with other

 * functions taking a jiffies timeout.

 */

signed long

dma_fence_default_wait(struct dma_fence *fence, bool intr, signed long timeout)

{

	struct default_wait_cb cb;

	unsigned long flags;

	signed long ret = timeout;

	signed long ret = timeout ? timeout : 1;

	bool was_set;



	if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags))

		return timeout;

		return ret;



	spin_lock_irqsave(fence->lock, flags);
@@ -403,15 +402,19 @@ dma_fence_default_wait(struct dma_fence *fence, bool intr, signed long timeout) 
EXPORT_SYMBOL(dma_fence_default_wait);



static bool

dma_fence_test_signaled_any(struct dma_fence **fences, uint32_t count)

dma_fence_test_signaled_any(struct dma_fence **fences, uint32_t count,

			    uint32_t *idx)

{

	int i;



	for (i = 0; i < count; ++i) {

		struct dma_fence *fence = fences[i];

		if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags))

		if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) {

			if (idx)

				*idx = i;

			return true;

		}

	}

	return false;

}
@@ -422,6 +425,8 @@ dma_fence_test_signaled_any(struct dma_fence **fences, uint32_t count) 
 * @count:	[in]	number of fences to wait on

 * @intr:	[in]	if true, do an interruptible wait

 * @timeout:	[in]	timeout value in jiffies, or MAX_SCHEDULE_TIMEOUT

 * @idx:       [out]	the first signaled fence index, meaningful only on

 *			positive return

 *

 * Returns -EINVAL on custom fence wait implementation, -ERESTARTSYS if

 * interrupted, 0 if the wait timed out, or the remaining timeout in jiffies
@@ -433,7 +438,7 @@ dma_fence_test_signaled_any(struct dma_fence **fences, uint32_t count) 
 */

signed long

dma_fence_wait_any_timeout(struct dma_fence **fences, uint32_t count,

			   bool intr, signed long timeout)

			   bool intr, signed long timeout, uint32_t *idx)

{

	struct default_wait_cb *cb;

	signed long ret = timeout;
@@ -444,8 +449,11 @@ dma_fence_wait_any_timeout(struct dma_fence **fences, uint32_t count, 


	if (timeout == 0) {

		for (i = 0; i < count; ++i)

			if (dma_fence_is_signaled(fences[i]))

			if (dma_fence_is_signaled(fences[i])) {

				if (idx)

					*idx = i;

				return 1;

			}



		return 0;

	}
@@ -468,6 +476,8 @@ dma_fence_wait_any_timeout(struct dma_fence **fences, uint32_t count, 
		if (dma_fence_add_callback(fence, &cb[i].base,

					   dma_fence_default_wait_cb)) {

			/* This fence is already signaled */

			if (idx)

				*idx = i;

			goto fence_rm_cb;

		}

	}
@@ -478,7 +488,7 @@ dma_fence_wait_any_timeout(struct dma_fence **fences, uint32_t count, 
		else

			set_current_state(TASK_UNINTERRUPTIBLE);



		if (dma_fence_test_signaled_any(fences, count))

		if (dma_fence_test_signaled_any(fences, count, idx))

			break;



		ret = schedule_timeout(ret);

drivers/dma-buf/reservation.c

+1 −4
Original line number Diff line number Diff line
@@ -370,10 +370,7 @@ long reservation_object_wait_timeout_rcu(struct reservation_object *obj, 
{

	struct dma_fence *fence;

	unsigned seq, shared_count, i = 0;

	long ret = timeout;



	if (!timeout)

		return reservation_object_test_signaled_rcu(obj, wait_all);

	long ret = timeout ? timeout : 1;



retry:

	fence = NULL;

drivers/dma-buf/sw_sync.c

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static inline struct sync_pt *dma_fence_to_sync_pt(struct dma_fence *fence) 
 * Creates a new sync_timeline. Returns the sync_timeline object or NULL in

 * case of error.

 */

struct sync_timeline *sync_timeline_create(const char *name)

static struct sync_timeline *sync_timeline_create(const char *name)

{

	struct sync_timeline *obj;
@@ -316,8 +316,8 @@ static long sw_sync_ioctl_create_fence(struct sync_timeline *obj, 
	}



	sync_file = sync_file_create(&pt->base);

	if (!sync_file) {

	dma_fence_put(&pt->base);

	if (!sync_file) {

		err = -ENOMEM;

		goto err;

	}