kernel/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c, branch linux-4.16.y

BackMerge tag 'v4.15-rc8' into drm-next

2018-01-17T23:32:15Z

Linux 4.15-rc8 Daniel requested this for so the intel CI won't fall over on drm-next so often.

drm/vmwgfx: Potential off by one in vmw_view_add()

2018-01-10T14:21:39Z

The vmw_view_cmd_to_type() function returns vmw_view_max (3) on error. It's one element beyond the end of the vmw_view_cotables[] table. My read on this is that it's possible to hit this failure. header->id comes from vmw_cmd_check() and it's a user controlled number between 1040 and 1225 so we can hit that error. But I don't have the hardware to test this code. Fixes: d80efd5cb3de ("drm/vmwgfx: Initial DX support") Signed-off-by: Dan Carpenter Reviewed-by: Thomas Hellstrom Cc:

drm/ttm: add operation ctx to ttm_bo_validate v2

2017-12-06T17:48:01Z

Give moving a BO into place an operation context to work with. v2: rebased Signed-off-by: Christian König Reviewed-by: Michel Dänzer Reviewed-by: Chunming Zhou Tested-by: Dieter Nützel Tested-by: Michel Dänzer Acked-by: Felix Kuehling Signed-off-by: Alex Deucher

drm/vmwgfx: Add export fence to file descriptor support

2017-08-28T15:51:46Z

Added code to link a fence to a out_fence_fd file descriptor and thread out_fence_fd down to vmw_execbuf_copy_fence_user() so it can be copied into the IOCTL reply and be passed back up the the user. v2: Make sure to sync and clean up in case of failure Signed-off-by: Sinclair Yeh Reviewed-by: Deepak Singh Rawat Reviewed-by: Thomas Hellstrom

drm/vmwgfx: Add support for imported Fence File Descriptor

2017-08-28T15:51:38Z

This allows vmwgfx to wait on a fence created by another device. v2: * Remove special handling for vmwgfx fence and just use dma_fence_wait() * Use interruptible waits * Added function documentation Signed-off-by: Sinclair Yeh Reviewed-by: Deepak Singh Rawat Reviewed-by: Thomas Hellstrom

drm/vmwgfx: Prepare to support fence fd

2017-08-28T15:51:28Z

Make the fields and flags available. Signed-off-by: Sinclair Yeh Reviewed-by: Deepak Singh Rawat Reviewed-by: Thomas Hellstrom

drm/vmwgfx: Support the NOP_ERROR command

2017-08-28T15:40:49Z

Can be used by user-space applications to test and verify the kernel command buffer error recovery functionality. Malicious user-space apps could potentially use this command to slow down graphics processing somewhat, but they could also accomplish the same thing using a random malformed command so this should be considered safe. At least as safe as it gets. Signed-off-by: Thomas Hellstrom Reviewed-by: Brian Paul Reviewed-by: Sinclair Yeh

drm/vmwgfx: Restart command buffers after errors

2017-08-28T15:40:46Z

Previously we skipped the command buffer and added an extra fence to avoid hangs due to skipped fence commands. Now we instead restart the command buffer after the failing command, if there are any commands left. In addition we print out some information about the failing command and its location in the command buffer. Testing Done: ran glxgears using mesa modified to send the NOP_ERROR command before each 10th clear and verified that we detected the device error properly and that there were no other device errors caused by incorrectly ordered command buffers. Also ran the piglit "quick" test suite which generates a couple of device errors and verified that they were handled as intended. Signed-off-by: Thomas Hellstrom Reviewed-by: Brian Paul Reviewed-by: Sinclair Yeh

drm/vmwgfx: Fix gcc-7.1.1 warning

2017-07-18T06:41:21Z

The current code does not look correct, and the reason for it is probably lost. Since this now generates a compiler warning, fix it to what makes sense. Cc: Reported-by: Arnd Bergmann Reported-by: Linus Torvalds Signed-off-by: Sinclair Yeh Reviewed-by: Brian Paul

drm/vmwgfx: fix comment mistake for vmw_cmd_dx_set_index_buffer()

2017-07-18T06:40:57Z

Comment fix. Signed-off-by: Brian Paul Reviewed-by: Neha Bhende