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
119 lines
3.7 KiB
C
119 lines
3.7 KiB
C
/*
|
|
* Copyright (C) 2015 Red Hat, Inc.
|
|
* All Rights Reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining
|
|
* a copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the
|
|
* next paragraph) shall be included in all copies or substantial
|
|
* portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
* IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
|
|
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include <drm/drmP.h>
|
|
#include "virtgpu_drv.h"
|
|
|
|
static const char *virtio_get_driver_name(struct dma_fence *f)
|
|
{
|
|
return "virtio_gpu";
|
|
}
|
|
|
|
static const char *virtio_get_timeline_name(struct dma_fence *f)
|
|
{
|
|
return "controlq";
|
|
}
|
|
|
|
static bool virtio_enable_signaling(struct dma_fence *f)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
static bool virtio_signaled(struct dma_fence *f)
|
|
{
|
|
struct virtio_gpu_fence *fence = to_virtio_fence(f);
|
|
|
|
if (atomic64_read(&fence->drv->last_seq) >= fence->seq)
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
static void virtio_fence_value_str(struct dma_fence *f, char *str, int size)
|
|
{
|
|
struct virtio_gpu_fence *fence = to_virtio_fence(f);
|
|
|
|
snprintf(str, size, "%llu", fence->seq);
|
|
}
|
|
|
|
static void virtio_timeline_value_str(struct dma_fence *f, char *str, int size)
|
|
{
|
|
struct virtio_gpu_fence *fence = to_virtio_fence(f);
|
|
|
|
snprintf(str, size, "%llu", (u64)atomic64_read(&fence->drv->last_seq));
|
|
}
|
|
|
|
static const struct dma_fence_ops virtio_fence_ops = {
|
|
.get_driver_name = virtio_get_driver_name,
|
|
.get_timeline_name = virtio_get_timeline_name,
|
|
.enable_signaling = virtio_enable_signaling,
|
|
.signaled = virtio_signaled,
|
|
.wait = dma_fence_default_wait,
|
|
.fence_value_str = virtio_fence_value_str,
|
|
.timeline_value_str = virtio_timeline_value_str,
|
|
};
|
|
|
|
int virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev,
|
|
struct virtio_gpu_ctrl_hdr *cmd_hdr,
|
|
struct virtio_gpu_fence **fence)
|
|
{
|
|
struct virtio_gpu_fence_driver *drv = &vgdev->fence_drv;
|
|
unsigned long irq_flags;
|
|
|
|
*fence = kmalloc(sizeof(struct virtio_gpu_fence), GFP_ATOMIC);
|
|
if ((*fence) == NULL)
|
|
return -ENOMEM;
|
|
|
|
spin_lock_irqsave(&drv->lock, irq_flags);
|
|
(*fence)->drv = drv;
|
|
(*fence)->seq = ++drv->sync_seq;
|
|
dma_fence_init(&(*fence)->f, &virtio_fence_ops, &drv->lock,
|
|
drv->context, (*fence)->seq);
|
|
dma_fence_get(&(*fence)->f);
|
|
list_add_tail(&(*fence)->node, &drv->fences);
|
|
spin_unlock_irqrestore(&drv->lock, irq_flags);
|
|
|
|
cmd_hdr->flags |= cpu_to_le32(VIRTIO_GPU_FLAG_FENCE);
|
|
cmd_hdr->fence_id = cpu_to_le64((*fence)->seq);
|
|
return 0;
|
|
}
|
|
|
|
void virtio_gpu_fence_event_process(struct virtio_gpu_device *vgdev,
|
|
u64 last_seq)
|
|
{
|
|
struct virtio_gpu_fence_driver *drv = &vgdev->fence_drv;
|
|
struct virtio_gpu_fence *fence, *tmp;
|
|
unsigned long irq_flags;
|
|
|
|
spin_lock_irqsave(&drv->lock, irq_flags);
|
|
atomic64_set(&vgdev->fence_drv.last_seq, last_seq);
|
|
list_for_each_entry_safe(fence, tmp, &drv->fences, node) {
|
|
if (last_seq < fence->seq)
|
|
continue;
|
|
dma_fence_signal_locked(&fence->f);
|
|
list_del(&fence->node);
|
|
dma_fence_put(&fence->f);
|
|
}
|
|
spin_unlock_irqrestore(&drv->lock, irq_flags);
|
|
}
|