xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'drm-qemu-20160921' of git://git.kraxel.org/linux into drm-next

Browse Source 
bugfixes for qemu (bochs, qxl and virtio-gpu) drm drivers

* tag 'drm-qemu-20160921' of git://git.kraxel.org/linux:
  drm/virtio: add real fence context and seqno
  drm/virtio: drop virtio_gpu_execbuffer_ioctl() wrapping
  virtio-gpu: avoid possible NULL pointer dereference
  drm/qxl: reapply cursor after SetCrtc calls
  bochs: ignore device if there isn't enougth memory
This commit is contained in:
Dave Airlie
2016-09-28 13:23:07 +10:00
parent ca09fb9f60 30b9c96cf7
commit c0d5fb4d0d
8 changed files with 78 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gpu/drm/virtio/virtgpu_ioctl.c
View File

@@ -89,10 +89,16 @@ static void virtio_gpu_unref_list(struct list_head *head)
}
}
static int virtio_gpu_execbuffer(struct drm_device *dev,
struct drm_virtgpu_execbuffer *exbuf,
/*
* Usage of execbuffer:
* Relocations need to take into account the full VIRTIO_GPUDrawable size.
* However, the command as passed from user space must *not* contain the initial
* VIRTIO_GPUReleaseInfo struct (first XXX bytes)
*/
static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
struct drm_file *drm_file)
{
struct drm_virtgpu_execbuffer *exbuf = data;
struct virtio_gpu_device *vgdev = dev->dev_private;
struct virtio_gpu_fpriv *vfpriv = drm_file->driver_priv;
struct drm_gem_object *gobj;
@@ -177,20 +183,6 @@ out_free:
return ret;
}
/*
* Usage of execbuffer:
* Relocations need to take into account the full VIRTIO_GPUDrawable size.
* However, the command as passed from user space must *not* contain the initial
* VIRTIO_GPUReleaseInfo struct (first XXX bytes)
*/
static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
struct drm_virtgpu_execbuffer *execbuffer = data;
return virtio_gpu_execbuffer(dev, execbuffer, file_priv);
}
static int virtio_gpu_getparam_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{