diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-03-15 09:49:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-15 09:49:19 +1000 |
| commit | 211afd577a186e18d3eece543c6767420d6f6737 (patch) | |
| tree | cc8c4b0bea3dfeda43efca178d1c5931b88ed3ff /drivers/gpu/drm/vc4/vc4_bo.c | |
| parent | f2c488212b511f7eadef78c564f1bff8f64db231 (diff) | |
| parent | 90d7116061f86c1f8ea460806a0414addea7b58b (diff) | |
| download | kernel_replicant_linux-211afd577a186e18d3eece543c6767420d6f6737.tar.gz kernel_replicant_linux-211afd577a186e18d3eece543c6767420d6f6737.tar.bz2 kernel_replicant_linux-211afd577a186e18d3eece543c6767420d6f6737.zip | |
Merge tag 'drm-vc4-next-2016-03-14' of github.com:anholt/linux into drm-next
This pull request covers what's left for 4.6. Notably, it includes a
significant 3D performance improvement and a fix to HDMI hotplug
detection for the Pi2/3.
* tag 'drm-vc4-next-2016-03-14' of github.com:anholt/linux:
drm/vc4: Recognize a more specific compatible string for V3D.
dt-bindings: Add binding docs for V3D.
drm/vc4: Return -EFAULT on copy_from_user() failure
drm/vc4: Respect GPIO_ACTIVE_LOW on HDMI HPD if set in the devicetree.
drm/vc4: Let gpiolib know that we're OK with sleeping for HPD.
drm/vc4: improve throughput by pipelining binning and rendering jobs
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_bo.c')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_bo.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c index 22278bcfc60e..ac8eafea6361 100644 --- a/drivers/gpu/drm/vc4/vc4_bo.c +++ b/drivers/gpu/drm/vc4/vc4_bo.c @@ -499,11 +499,12 @@ vc4_create_shader_bo_ioctl(struct drm_device *dev, void *data, if (IS_ERR(bo)) return PTR_ERR(bo); - ret = copy_from_user(bo->base.vaddr, + if (copy_from_user(bo->base.vaddr, (void __user *)(uintptr_t)args->data, - args->size); - if (ret != 0) + args->size)) { + ret = -EFAULT; goto fail; + } /* Clear the rest of the memory from allocating from the BO * cache. */ |