drm/fence: add drm_crtc_create_fence()
Instead of dealing with crtc details inside drm_atomic.c we should just export a function that creates a new crtc fence for us and use that. Suggested-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1481046437-18778-1-git-send-email-gustavo@padovan.org
This commit is contained in:
Родитель
8f34a54871
Коммит
35f8cc3b9a
|
@ -1864,20 +1864,6 @@ EXPORT_SYMBOL(drm_atomic_clean_old_fb);
|
||||||
* helpers and for the DRM event handling for existing userspace.
|
* helpers and for the DRM event handling for existing userspace.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static struct dma_fence *get_crtc_fence(struct drm_crtc *crtc)
|
|
||||||
{
|
|
||||||
struct dma_fence *fence;
|
|
||||||
|
|
||||||
fence = kzalloc(sizeof(*fence), GFP_KERNEL);
|
|
||||||
if (!fence)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
dma_fence_init(fence, &drm_crtc_fence_ops, &crtc->fence_lock,
|
|
||||||
crtc->fence_context, ++crtc->fence_seqno);
|
|
||||||
|
|
||||||
return fence;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct drm_out_fence_state {
|
struct drm_out_fence_state {
|
||||||
s64 __user *out_fence_ptr;
|
s64 __user *out_fence_ptr;
|
||||||
struct sync_file *sync_file;
|
struct sync_file *sync_file;
|
||||||
|
@ -1959,7 +1945,7 @@ static int prepare_crtc_signaling(struct drm_device *dev,
|
||||||
f[*num_fences].out_fence_ptr = fence_ptr;
|
f[*num_fences].out_fence_ptr = fence_ptr;
|
||||||
*fence_state = f;
|
*fence_state = f;
|
||||||
|
|
||||||
fence = get_crtc_fence(crtc);
|
fence = drm_crtc_create_fence(crtc);
|
||||||
if (!fence)
|
if (!fence)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
|
|
@ -152,6 +152,8 @@ static void drm_crtc_crc_fini(struct drm_crtc *crtc)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const struct dma_fence_ops drm_crtc_fence_ops;
|
||||||
|
|
||||||
static struct drm_crtc *fence_to_crtc(struct dma_fence *fence)
|
static struct drm_crtc *fence_to_crtc(struct dma_fence *fence)
|
||||||
{
|
{
|
||||||
BUG_ON(fence->ops != &drm_crtc_fence_ops);
|
BUG_ON(fence->ops != &drm_crtc_fence_ops);
|
||||||
|
@ -177,13 +179,27 @@ static bool drm_crtc_fence_enable_signaling(struct dma_fence *fence)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct dma_fence_ops drm_crtc_fence_ops = {
|
static const struct dma_fence_ops drm_crtc_fence_ops = {
|
||||||
.get_driver_name = drm_crtc_fence_get_driver_name,
|
.get_driver_name = drm_crtc_fence_get_driver_name,
|
||||||
.get_timeline_name = drm_crtc_fence_get_timeline_name,
|
.get_timeline_name = drm_crtc_fence_get_timeline_name,
|
||||||
.enable_signaling = drm_crtc_fence_enable_signaling,
|
.enable_signaling = drm_crtc_fence_enable_signaling,
|
||||||
.wait = dma_fence_default_wait,
|
.wait = dma_fence_default_wait,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc)
|
||||||
|
{
|
||||||
|
struct dma_fence *fence;
|
||||||
|
|
||||||
|
fence = kzalloc(sizeof(*fence), GFP_KERNEL);
|
||||||
|
if (!fence)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
dma_fence_init(fence, &drm_crtc_fence_ops, &crtc->fence_lock,
|
||||||
|
crtc->fence_context, ++crtc->fence_seqno);
|
||||||
|
|
||||||
|
return fence;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* drm_crtc_init_with_planes - Initialise a new CRTC object with
|
* drm_crtc_init_with_planes - Initialise a new CRTC object with
|
||||||
* specified primary and cursor planes.
|
* specified primary and cursor planes.
|
||||||
|
|
|
@ -43,7 +43,7 @@ int drm_crtc_check_viewport(const struct drm_crtc *crtc,
|
||||||
int drm_crtc_register_all(struct drm_device *dev);
|
int drm_crtc_register_all(struct drm_device *dev);
|
||||||
void drm_crtc_unregister_all(struct drm_device *dev);
|
void drm_crtc_unregister_all(struct drm_device *dev);
|
||||||
|
|
||||||
extern const struct dma_fence_ops drm_crtc_fence_ops;
|
struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc);
|
||||||
|
|
||||||
/* IOCTLs */
|
/* IOCTLs */
|
||||||
int drm_mode_getcrtc(struct drm_device *dev,
|
int drm_mode_getcrtc(struct drm_device *dev,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче