diff options
author | 2016-07-04 12:26:05 +0200 | |
---|---|---|
committer | 2016-07-04 12:26:05 +0200 | |
commit | 8658be133baa92c06b6d832a436d437deb2e2a22 (patch) | |
tree | 8f798f4aae5892533831487e4838a85b95414a0f /drivers/gpu/drm/msm/msm_ringbuffer.c | |
parent | Merge tag 'irqchip-core-4.8-2' of git://git.infradead.org/users/jcooper/linux into irq/core (diff) | |
parent | genirq: Add a helper to spread an affinity mask for MSI/MSI-X vectors (diff) | |
download | wireguard-linux-8658be133baa92c06b6d832a436d437deb2e2a22.tar.xz wireguard-linux-8658be133baa92c06b6d832a436d437deb2e2a22.zip |
Merge branch 'irq/for-block' into irq/core
Pull the irq affinity managing code which is in a seperate branch for block
developers to pull.
Diffstat (limited to '')
-rw-r--r-- | drivers/gpu/drm/msm/msm_ringbuffer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c index 1f14b908b221..42f5359cf988 100644 --- a/drivers/gpu/drm/msm/msm_ringbuffer.c +++ b/drivers/gpu/drm/msm/msm_ringbuffer.c @@ -40,6 +40,10 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int size) } ring->start = msm_gem_vaddr_locked(ring->bo); + if (IS_ERR(ring->start)) { + ret = PTR_ERR(ring->start); + goto fail; + } ring->end = ring->start + (size / 4); ring->cur = ring->start; |