From: Dave Airlie <airlied@redhat.com>
Date: Fri, 7 Dec 2018 00:46:29 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2018-12-06' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Tag: v5.4.17~4589^2~5
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e69aa5f9b97f7f871643336deb281db5cb14878b;p=arm%2Flinux.git

Merge tag 'drm-misc-next-2018-12-06' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Final changes to drm-misc-next for v4.21:

UAPI Changes:

Core Changes:
- Add dma_fence_get_stub to dma-buf, and use it in drm/syncobj.
- Add and use DRM_MODESET_LOCK_BEGIN/END helpers.
- Small fixes to drm_atomic_helper_resume(), drm_mode_setcrtc() and
  drm_atomic_helper_commit_duplicated_state()
- Fix drm_atomic_state_helper.[c] extraction.

Driver Changes:
- Small fixes to tinydrm, vkms, meson, rcar-du, virtio, vkms,
  v3d, and pl111.
- vc4: Allow scaling and YUV formats on cursor planes.
- v3d: Enable use of the Texture Formatting Unit, and fix
  prime imports of buffers from other drivers.
- Add support for the AUO G101EVN010 panel.
- sun4i: Enable support for the H6 display engine.

Signed-off-by: Dave Airlie <airlied@redhat.com>
[airlied: added drm/v3d: fix broken build to the merge commit]
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/321be9d3-ab75-5f92-8193-e5113662edef@linux.intel.com
---

e69aa5f9b97f7f871643336deb281db5cb14878b
diff --cc drivers/gpu/drm/v3d/v3d_gem.c
index 1e8947c7d954,cb99e53f7607..05ca6319065e
--- a/drivers/gpu/drm/v3d/v3d_gem.c
+++ b/drivers/gpu/drm/v3d/v3d_gem.c
@@@ -595,6 -626,114 +626,114 @@@ fail
  	return ret;
  }
  
+ /**
+  * v3d_submit_tfu_ioctl() - Submits a TFU (texture formatting) job to the V3D.
+  * @dev: DRM device
+  * @data: ioctl argument
+  * @file_priv: DRM file for this fd
+  *
+  * Userspace provides the register setup for the TFU, which we don't
+  * need to validate since the TFU is behind the MMU.
+  */
+ int
+ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data,
+ 		     struct drm_file *file_priv)
+ {
+ 	struct v3d_dev *v3d = to_v3d_dev(dev);
+ 	struct v3d_file_priv *v3d_priv = file_priv->driver_priv;
+ 	struct drm_v3d_submit_tfu *args = data;
+ 	struct v3d_tfu_job *job;
+ 	struct ww_acquire_ctx acquire_ctx;
+ 	struct drm_syncobj *sync_out;
+ 	struct dma_fence *sched_done_fence;
+ 	int ret = 0;
+ 	int bo_count;
+ 
+ 	trace_v3d_submit_tfu_ioctl(&v3d->drm, args->iia);
+ 
+ 	job = kcalloc(1, sizeof(*job), GFP_KERNEL);
+ 	if (!job)
+ 		return -ENOMEM;
+ 
+ 	ret = pm_runtime_get_sync(v3d->dev);
+ 	if (ret < 0) {
+ 		kfree(job);
+ 		return ret;
+ 	}
+ 
+ 	kref_init(&job->refcount);
+ 
+ 	ret = drm_syncobj_find_fence(file_priv, args->in_sync,
+ 				     0, 0, &job->in_fence);
+ 	if (ret == -EINVAL)
+ 		goto fail;
+ 
+ 	job->args = *args;
+ 	job->v3d = v3d;
+ 
+ 	spin_lock(&file_priv->table_lock);
+ 	for (bo_count = 0; bo_count < ARRAY_SIZE(job->bo); bo_count++) {
+ 		struct drm_gem_object *bo;
+ 
+ 		if (!args->bo_handles[bo_count])
+ 			break;
+ 
+ 		bo = idr_find(&file_priv->object_idr,
+ 			      args->bo_handles[bo_count]);
+ 		if (!bo) {
+ 			DRM_DEBUG("Failed to look up GEM BO %d: %d\n",
+ 				  bo_count, args->bo_handles[bo_count]);
+ 			ret = -ENOENT;
+ 			spin_unlock(&file_priv->table_lock);
+ 			goto fail;
+ 		}
+ 		drm_gem_object_get(bo);
+ 		job->bo[bo_count] = to_v3d_bo(bo);
+ 	}
+ 	spin_unlock(&file_priv->table_lock);
+ 
+ 	ret = v3d_lock_bo_reservations(job->bo, bo_count, &acquire_ctx);
+ 	if (ret)
+ 		goto fail;
+ 
+ 	mutex_lock(&v3d->sched_lock);
+ 	ret = drm_sched_job_init(&job->base,
+ 				 &v3d_priv->sched_entity[V3D_TFU],
+ 				 v3d_priv);
+ 	if (ret)
+ 		goto fail_unreserve;
+ 
+ 	sched_done_fence = dma_fence_get(&job->base.s_fence->finished);
+ 
+ 	kref_get(&job->refcount); /* put by scheduler job completion */
+ 	drm_sched_entity_push_job(&job->base, &v3d_priv->sched_entity[V3D_TFU]);
+ 	mutex_unlock(&v3d->sched_lock);
+ 
+ 	v3d_attach_object_fences(job->bo, bo_count, sched_done_fence);
+ 
+ 	v3d_unlock_bo_reservations(job->bo, bo_count, &acquire_ctx);
+ 
+ 	/* Update the return sync object */
+ 	sync_out = drm_syncobj_find(file_priv, args->out_sync);
+ 	if (sync_out) {
 -		drm_syncobj_replace_fence(sync_out, 0, sched_done_fence);
++		drm_syncobj_replace_fence(sync_out, sched_done_fence);
+ 		drm_syncobj_put(sync_out);
+ 	}
+ 	dma_fence_put(sched_done_fence);
+ 
+ 	v3d_tfu_job_put(job);
+ 
+ 	return 0;
+ 
+ fail_unreserve:
+ 	mutex_unlock(&v3d->sched_lock);
+ 	v3d_unlock_bo_reservations(job->bo, bo_count, &acquire_ctx);
+ fail:
+ 	v3d_tfu_job_put(job);
+ 
+ 	return ret;
+ }
+ 
  int
  v3d_gem_init(struct drm_device *dev)
  {