mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
db6a94b263
vmwgfx's fencing predates dma_fence and as a result dma_fence_ops was never properly implemented, especially with respect to enabling signaling. Because of this dma_fence callbacks don't work properly. This change implements enable_signaling properly so that dma_fence callbacks now work as expected. It also removes vmwgfx's custom implementation of fence callbacks and removes vmwgfx's custom dma_fence_ops::wait function which is no longer necessary now that enable_signaling works. Signed-off-by: Ian Forbes <ian.forbes@broadcom.com> Signed-off-by: Zack Rusin <zack.rusin@broadcom.com> Link: https://lore.kernel.org/r/20250530183510.733175-2-ian.forbes@broadcom.com
110 lines
3.6 KiB
C
110 lines
3.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 OR MIT */
|
|
/**************************************************************************
|
|
*
|
|
* Copyright 2011-2012 VMware, Inc., Palo Alto, CA., USA
|
|
*
|
|
* 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, sub license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDERS, AUTHORS 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.
|
|
*
|
|
**************************************************************************/
|
|
|
|
#ifndef _VMWGFX_FENCE_H_
|
|
|
|
#include <linux/dma-fence.h>
|
|
#include <linux/dma-fence-array.h>
|
|
|
|
#define VMW_FENCE_WAIT_TIMEOUT (5*HZ)
|
|
|
|
struct drm_device;
|
|
struct drm_file;
|
|
struct drm_pending_event;
|
|
|
|
struct vmw_private;
|
|
struct vmw_fence_manager;
|
|
|
|
struct vmw_fence_obj {
|
|
struct dma_fence base;
|
|
bool waiter_added;
|
|
struct list_head head;
|
|
void (*destroy)(struct vmw_fence_obj *fence);
|
|
};
|
|
|
|
extern struct vmw_fence_manager *
|
|
vmw_fence_manager_init(struct vmw_private *dev_priv);
|
|
|
|
extern void vmw_fence_manager_takedown(struct vmw_fence_manager *fman);
|
|
|
|
static inline void
|
|
vmw_fence_obj_unreference(struct vmw_fence_obj **fence_p)
|
|
{
|
|
struct vmw_fence_obj *fence = *fence_p;
|
|
|
|
*fence_p = NULL;
|
|
if (fence)
|
|
dma_fence_put(&fence->base);
|
|
}
|
|
|
|
static inline struct vmw_fence_obj *
|
|
vmw_fence_obj_reference(struct vmw_fence_obj *fence)
|
|
{
|
|
if (fence)
|
|
dma_fence_get(&fence->base);
|
|
return fence;
|
|
}
|
|
|
|
u32 vmw_fences_update(struct vmw_fence_manager *fman);
|
|
|
|
extern bool vmw_fence_obj_signaled(struct vmw_fence_obj *fence);
|
|
|
|
extern int vmw_fence_obj_wait(struct vmw_fence_obj *fence,
|
|
bool lazy,
|
|
bool interruptible, unsigned long timeout);
|
|
|
|
extern int vmw_fence_create(struct vmw_fence_manager *fman,
|
|
uint32_t seqno,
|
|
struct vmw_fence_obj **p_fence);
|
|
|
|
extern int vmw_user_fence_create(struct drm_file *file_priv,
|
|
struct vmw_fence_manager *fman,
|
|
uint32_t sequence,
|
|
struct vmw_fence_obj **p_fence,
|
|
uint32_t *p_handle);
|
|
|
|
extern void vmw_fence_fifo_up(struct vmw_fence_manager *fman);
|
|
|
|
extern void vmw_fence_fifo_down(struct vmw_fence_manager *fman);
|
|
|
|
extern int vmw_fence_obj_wait_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
|
|
extern int vmw_fence_obj_signaled_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
|
|
extern int vmw_fence_obj_unref_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
extern int vmw_fence_event_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
extern int vmw_event_fence_action_queue(struct drm_file *filee_priv,
|
|
struct vmw_fence_obj *fence,
|
|
struct drm_pending_event *event,
|
|
uint32_t *tv_sec,
|
|
uint32_t *tv_usec,
|
|
bool interruptible);
|
|
#endif /* _VMWGFX_FENCE_H_ */
|