mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
drm: rename null fence to stub fence in syncobj v2
moved to front of file. stub fence will be used by timeline syncobj as well. Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Cc: Jason Ekstrand <jason@jlekstrand.net> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Christian König <christian.koenig@amd.com> Link: https://patchwork.freedesktop.org/patch/246539/
This commit is contained in:
parent
94e4c5305a
commit
e28bd101ae
1 changed files with 29 additions and 24 deletions
|
@ -56,6 +56,33 @@
|
|||
#include "drm_internal.h"
|
||||
#include <drm/drm_syncobj.h>
|
||||
|
||||
struct drm_syncobj_stub_fence {
|
||||
struct dma_fence base;
|
||||
spinlock_t lock;
|
||||
};
|
||||
|
||||
static const char *drm_syncobj_stub_fence_get_name(struct dma_fence *fence)
|
||||
{
|
||||
return "syncobjstub";
|
||||
}
|
||||
|
||||
static bool drm_syncobj_stub_fence_enable_signaling(struct dma_fence *fence)
|
||||
{
|
||||
return !dma_fence_is_signaled(fence);
|
||||
}
|
||||
|
||||
static void drm_syncobj_stub_fence_release(struct dma_fence *f)
|
||||
{
|
||||
kfree(f);
|
||||
}
|
||||
static const struct dma_fence_ops drm_syncobj_stub_fence_ops = {
|
||||
.get_driver_name = drm_syncobj_stub_fence_get_name,
|
||||
.get_timeline_name = drm_syncobj_stub_fence_get_name,
|
||||
.enable_signaling = drm_syncobj_stub_fence_enable_signaling,
|
||||
.release = drm_syncobj_stub_fence_release,
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* drm_syncobj_find - lookup and reference a sync object.
|
||||
* @file_private: drm file private pointer
|
||||
|
@ -172,37 +199,15 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,
|
|||
}
|
||||
EXPORT_SYMBOL(drm_syncobj_replace_fence);
|
||||
|
||||
struct drm_syncobj_null_fence {
|
||||
struct dma_fence base;
|
||||
spinlock_t lock;
|
||||
};
|
||||
|
||||
static const char *drm_syncobj_null_fence_get_name(struct dma_fence *fence)
|
||||
{
|
||||
return "syncobjnull";
|
||||
}
|
||||
|
||||
static bool drm_syncobj_null_fence_enable_signaling(struct dma_fence *fence)
|
||||
{
|
||||
return !dma_fence_is_signaled(fence);
|
||||
}
|
||||
|
||||
static const struct dma_fence_ops drm_syncobj_null_fence_ops = {
|
||||
.get_driver_name = drm_syncobj_null_fence_get_name,
|
||||
.get_timeline_name = drm_syncobj_null_fence_get_name,
|
||||
.enable_signaling = drm_syncobj_null_fence_enable_signaling,
|
||||
.release = NULL,
|
||||
};
|
||||
|
||||
static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj)
|
||||
{
|
||||
struct drm_syncobj_null_fence *fence;
|
||||
struct drm_syncobj_stub_fence *fence;
|
||||
fence = kzalloc(sizeof(*fence), GFP_KERNEL);
|
||||
if (fence == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
spin_lock_init(&fence->lock);
|
||||
dma_fence_init(&fence->base, &drm_syncobj_null_fence_ops,
|
||||
dma_fence_init(&fence->base, &drm_syncobj_stub_fence_ops,
|
||||
&fence->lock, 0, 0);
|
||||
dma_fence_signal(&fence->base);
|
||||
|
||||
|
|
Loading…
Reference in a new issue