On 01/08/2016 09:36 PM, Daniel Vetter wrote:
Again since the drm core takes care of event unlinking/disarming this is now just needless code.
Cc: Thomas Hellström thellstrom@vmware.com Signed-off-by: Daniel Vetter daniel.vetter@intel.com
Hmm,
IIRC this is actually a list of events that core drm is not aware of yet. They sit on this list waiting for a fence to pass and are then transferred to core drm....
/Thomas
drivers/gpu/drm/vc4/vc4_drv.h | 1 - drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 10 --------- drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 38 ----------------------------------- drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 2 -- 4 files changed, 51 deletions(-)
diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h index 080865ec2bae..4c734d087d7f 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -376,7 +376,6 @@ int vc4_bo_stats_debugfs(struct seq_file *m, void *arg); extern struct platform_driver vc4_crtc_driver; int vc4_enable_vblank(struct drm_device *dev, unsigned int crtc_id); void vc4_disable_vblank(struct drm_device *dev, unsigned int crtc_id); -void vc4_cancel_page_flip(struct drm_crtc *crtc, struct drm_file *file); int vc4_crtc_debugfs_regs(struct seq_file *m, void *arg);
/* vc4_debugfs.c */ diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index c49812b80dd0..c04c4d1e2f3e 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -971,15 +971,6 @@ static int vmw_driver_unload(struct drm_device *dev) return 0; }
-static void vmw_preclose(struct drm_device *dev,
struct drm_file *file_priv)-{
- struct vmw_fpriv *vmw_fp = vmw_fpriv(file_priv);
- struct vmw_private *dev_priv = vmw_priv(dev);
- vmw_event_fence_fpriv_gone(dev_priv->fman, &vmw_fp->fence_events);
-}
static void vmw_postclose(struct drm_device *dev, struct drm_file *file_priv) { @@ -1500,7 +1491,6 @@ static struct drm_driver driver = { .master_set = vmw_master_set, .master_drop = vmw_master_drop, .open = vmw_driver_open,
- .preclose = vmw_preclose, .postclose = vmw_postclose, .set_busid = drm_pci_set_busid,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c index e0edf149d9d5..55dc3e4754df 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c @@ -808,44 +808,6 @@ int vmw_fence_obj_unref_ioctl(struct drm_device *dev, void *data, }
/**
- vmw_event_fence_fpriv_gone - Remove references to struct drm_file objects
- @fman: Pointer to a struct vmw_fence_manager
- @event_list: Pointer to linked list of struct vmw_event_fence_action objects
- with pointers to a struct drm_file object about to be closed.
- This function removes all pending fence events with references to a
- specific struct drm_file object about to be closed. The caller is required
- to pass a list of all struct vmw_event_fence_action objects with such
- events attached. This function is typically called before the
- struct drm_file object's event management is taken down.
- */
-void vmw_event_fence_fpriv_gone(struct vmw_fence_manager *fman,
struct list_head *event_list)-{
- struct vmw_event_fence_action *eaction;
- struct drm_pending_event *event;
- unsigned long irq_flags;
- while (1) {
spin_lock_irqsave(&fman->lock, irq_flags);if (list_empty(event_list))goto out_unlock;eaction = list_first_entry(event_list,struct vmw_event_fence_action,fpriv_head);list_del_init(&eaction->fpriv_head);event = eaction->event;eaction->event = NULL;spin_unlock_irqrestore(&fman->lock, irq_flags);event->destroy(event);- }
-out_unlock:
- spin_unlock_irqrestore(&fman->lock, irq_flags);
-}
-/**
- vmw_event_fence_action_seq_passed
- @action: The struct vmw_fence_action embedded in a struct
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h index 8be6c29f5eb5..83ae301ee141 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h @@ -116,8 +116,6 @@ 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 void vmw_event_fence_fpriv_gone(struct vmw_fence_manager *fman,
struct list_head *event_list);extern int vmw_event_fence_action_queue(struct drm_file *filee_priv, struct vmw_fence_obj *fence, struct drm_pending_event *event,