mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 00:48:50 +00:00
f54d186700
I plan to usurp the short name of struct fence for a core kernel struct, and so I need to rename the specialised fence/timeline for DMA operations to make room. A consensus was reached in https://lists.freedesktop.org/archives/dri-devel/2016-July/113083.html that making clear this fence applies to DMA operations was a good thing. Since then the patch has grown a bit as usage increases, so hopefully it remains a good thing! (v2...: rebase, rerun spatch) v3: Compile on msm, spotted a manual fixup that I broke. v4: Try again for msm, sorry Daniel coccinelle script: @@ @@ - struct fence + struct dma_fence @@ @@ - struct fence_ops + struct dma_fence_ops @@ @@ - struct fence_cb + struct dma_fence_cb @@ @@ - struct fence_array + struct dma_fence_array @@ @@ - enum fence_flag_bits + enum dma_fence_flag_bits @@ @@ ( - fence_init + dma_fence_init | - fence_release + dma_fence_release | - fence_free + dma_fence_free | - fence_get + dma_fence_get | - fence_get_rcu + dma_fence_get_rcu | - fence_put + dma_fence_put | - fence_signal + dma_fence_signal | - fence_signal_locked + dma_fence_signal_locked | - fence_default_wait + dma_fence_default_wait | - fence_add_callback + dma_fence_add_callback | - fence_remove_callback + dma_fence_remove_callback | - fence_enable_sw_signaling + dma_fence_enable_sw_signaling | - fence_is_signaled_locked + dma_fence_is_signaled_locked | - fence_is_signaled + dma_fence_is_signaled | - fence_is_later + dma_fence_is_later | - fence_later + dma_fence_later | - fence_wait_timeout + dma_fence_wait_timeout | - fence_wait_any_timeout + dma_fence_wait_any_timeout | - fence_wait + dma_fence_wait | - fence_context_alloc + dma_fence_context_alloc | - fence_array_create + dma_fence_array_create | - to_fence_array + to_dma_fence_array | - fence_is_array + dma_fence_is_array | - trace_fence_emit + trace_dma_fence_emit | - FENCE_TRACE + DMA_FENCE_TRACE | - FENCE_WARN + DMA_FENCE_WARN | - FENCE_ERR + DMA_FENCE_ERR ) ( ... ) Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Acked-by: Sumit Semwal <sumit.semwal@linaro.org> Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/20161025120045.28839-1-chris@chris-wilson.co.uk
163 lines
3.8 KiB
C
163 lines
3.8 KiB
C
/*
|
|
* Copyright (C) 2013-2016 Red Hat
|
|
* Author: Rob Clark <robdclark@gmail.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License version 2 as published by
|
|
* the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <linux/dma-fence.h>
|
|
|
|
#include "msm_drv.h"
|
|
#include "msm_fence.h"
|
|
|
|
|
|
struct msm_fence_context *
|
|
msm_fence_context_alloc(struct drm_device *dev, const char *name)
|
|
{
|
|
struct msm_fence_context *fctx;
|
|
|
|
fctx = kzalloc(sizeof(*fctx), GFP_KERNEL);
|
|
if (!fctx)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
fctx->dev = dev;
|
|
fctx->name = name;
|
|
fctx->context = dma_fence_context_alloc(1);
|
|
init_waitqueue_head(&fctx->event);
|
|
spin_lock_init(&fctx->spinlock);
|
|
|
|
return fctx;
|
|
}
|
|
|
|
void msm_fence_context_free(struct msm_fence_context *fctx)
|
|
{
|
|
kfree(fctx);
|
|
}
|
|
|
|
static inline bool fence_completed(struct msm_fence_context *fctx, uint32_t fence)
|
|
{
|
|
return (int32_t)(fctx->completed_fence - fence) >= 0;
|
|
}
|
|
|
|
/* legacy path for WAIT_FENCE ioctl: */
|
|
int msm_wait_fence(struct msm_fence_context *fctx, uint32_t fence,
|
|
ktime_t *timeout, bool interruptible)
|
|
{
|
|
int ret;
|
|
|
|
if (fence > fctx->last_fence) {
|
|
DRM_ERROR("%s: waiting on invalid fence: %u (of %u)\n",
|
|
fctx->name, fence, fctx->last_fence);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (!timeout) {
|
|
/* no-wait: */
|
|
ret = fence_completed(fctx, fence) ? 0 : -EBUSY;
|
|
} else {
|
|
unsigned long remaining_jiffies = timeout_to_jiffies(timeout);
|
|
|
|
if (interruptible)
|
|
ret = wait_event_interruptible_timeout(fctx->event,
|
|
fence_completed(fctx, fence),
|
|
remaining_jiffies);
|
|
else
|
|
ret = wait_event_timeout(fctx->event,
|
|
fence_completed(fctx, fence),
|
|
remaining_jiffies);
|
|
|
|
if (ret == 0) {
|
|
DBG("timeout waiting for fence: %u (completed: %u)",
|
|
fence, fctx->completed_fence);
|
|
ret = -ETIMEDOUT;
|
|
} else if (ret != -ERESTARTSYS) {
|
|
ret = 0;
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* called from workqueue */
|
|
void msm_update_fence(struct msm_fence_context *fctx, uint32_t fence)
|
|
{
|
|
spin_lock(&fctx->spinlock);
|
|
fctx->completed_fence = max(fence, fctx->completed_fence);
|
|
spin_unlock(&fctx->spinlock);
|
|
|
|
wake_up_all(&fctx->event);
|
|
}
|
|
|
|
struct msm_fence {
|
|
struct msm_fence_context *fctx;
|
|
struct dma_fence base;
|
|
};
|
|
|
|
static inline struct msm_fence *to_msm_fence(struct dma_fence *fence)
|
|
{
|
|
return container_of(fence, struct msm_fence, base);
|
|
}
|
|
|
|
static const char *msm_fence_get_driver_name(struct dma_fence *fence)
|
|
{
|
|
return "msm";
|
|
}
|
|
|
|
static const char *msm_fence_get_timeline_name(struct dma_fence *fence)
|
|
{
|
|
struct msm_fence *f = to_msm_fence(fence);
|
|
return f->fctx->name;
|
|
}
|
|
|
|
static bool msm_fence_enable_signaling(struct dma_fence *fence)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
static bool msm_fence_signaled(struct dma_fence *fence)
|
|
{
|
|
struct msm_fence *f = to_msm_fence(fence);
|
|
return fence_completed(f->fctx, f->base.seqno);
|
|
}
|
|
|
|
static void msm_fence_release(struct dma_fence *fence)
|
|
{
|
|
struct msm_fence *f = to_msm_fence(fence);
|
|
kfree_rcu(f, base.rcu);
|
|
}
|
|
|
|
static const struct dma_fence_ops msm_fence_ops = {
|
|
.get_driver_name = msm_fence_get_driver_name,
|
|
.get_timeline_name = msm_fence_get_timeline_name,
|
|
.enable_signaling = msm_fence_enable_signaling,
|
|
.signaled = msm_fence_signaled,
|
|
.wait = dma_fence_default_wait,
|
|
.release = msm_fence_release,
|
|
};
|
|
|
|
struct dma_fence *
|
|
msm_fence_alloc(struct msm_fence_context *fctx)
|
|
{
|
|
struct msm_fence *f;
|
|
|
|
f = kzalloc(sizeof(*f), GFP_KERNEL);
|
|
if (!f)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
f->fctx = fctx;
|
|
|
|
dma_fence_init(&f->base, &msm_fence_ops, &fctx->spinlock,
|
|
fctx->context, ++fctx->last_fence);
|
|
|
|
return &f->base;
|
|
}
|