diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-11 00:43:46 +0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-11 00:43:46 +0400 |
| commit | e8e6e6012d68c4967e8f26fdd39ac95c247d4789 (patch) | |
| tree | 6b88dfc219ad811a564e81e9c2219dd5cd1b0fa4 /drivers/dma/virt-dma.h | |
| parent | bc079e8b1684e1de505ec06f8c2339ae60a329e8 (diff) | |
| parent | fa389e220254c69ffae0d403eac4146171062d08 (diff) | |
| download | linux-e8e6e6012d68c4967e8f26fdd39ac95c247d4789.tar.xz | |
Merge tag 'v3.14-rc6' into drm-intel-next-queued
Linux 3.14-rc6
I need the hdmi/dvi-dual link fixes in 3.14 to avoid ugly conflicts
when merging Ville's new hdmi cloning support into my -next tree
Conflicts:
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/intel_dp.c
Makefile cleanup conflicts with an acpi build fix, intel_dp.c is
trivial.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/dma/virt-dma.h')
| -rw-r--r-- | drivers/dma/virt-dma.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/virt-dma.h b/drivers/dma/virt-dma.h index 85c19d63f9fb..181b95267866 100644 --- a/drivers/dma/virt-dma.h +++ b/drivers/dma/virt-dma.h @@ -84,10 +84,12 @@ static inline bool vchan_issue_pending(struct virt_dma_chan *vc) static inline void vchan_cookie_complete(struct virt_dma_desc *vd) { struct virt_dma_chan *vc = to_virt_chan(vd->tx.chan); + dma_cookie_t cookie; + cookie = vd->tx.cookie; dma_cookie_complete(&vd->tx); dev_vdbg(vc->chan.device->dev, "txd %p[%x]: marked complete\n", - vd, vd->tx.cookie); + vd, cookie); list_add_tail(&vd->node, &vc->desc_completed); tasklet_schedule(&vc->task); |