74fa0af473
Up until recently sync_file were create to export a single dma-fence to
userspace, and so we could canabalise a bit insie dma-fence to mark
whether or not we had enable polling for the sync_file itself. However,
with the advent of syncobj, we do allow userspace to create multiple
sync_files for a single dma-fence. (Similarly, that the sw-sync
validation framework also started returning multiple sync-files wrapping
a single dma-fence for a syncpt also triggering the problem.)
This patch reverts my suggestion in commit e241655373
("dma-buf/sync_file: only enable fence signalling on poll()") to use a
single bit in the shared dma-fence and restores the sync_file->flags for
tracking the bits individually.
Reported-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Fixes: f1e8c67123cf ("dma-buf/sw-sync: Use an rbtree to sort fences in the timeline")
Fixes: e9083420bbac ("drm: introduce sync objects (v4)")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170728212951.7818-1-chris@chris-wilson.co.uk
[astrachan: rediffed against changed context lines in 4.9]
Bug: 79383895
Change-Id: If98fa920693045fdab21886960657bbe8ef550c0
Signed-off-by: Alistair Strachan <astrachan@google.com>
55 lines
1.3 KiB
C
55 lines
1.3 KiB
C
/*
|
|
* include/linux/sync_file.h
|
|
*
|
|
* Copyright (C) 2012 Google, Inc.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
#ifndef _LINUX_SYNC_FILE_H
|
|
#define _LINUX_SYNC_FILE_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/ktime.h>
|
|
#include <linux/list.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/fence.h>
|
|
#include <linux/fence-array.h>
|
|
|
|
/**
|
|
* struct sync_file - sync file to export to the userspace
|
|
* @file: file representing this fence
|
|
* @kref: reference count on fence.
|
|
* @name: name of sync_file. Useful for debugging
|
|
* @sync_file_list: membership in global file list
|
|
* @wq: wait queue for fence signaling
|
|
* @fence: fence with the fences in the sync_file
|
|
* @cb: fence callback information
|
|
*/
|
|
struct sync_file {
|
|
struct file *file;
|
|
struct kref kref;
|
|
char name[32];
|
|
#ifdef CONFIG_DEBUG_FS
|
|
struct list_head sync_file_list;
|
|
#endif
|
|
|
|
wait_queue_head_t wq;
|
|
unsigned long flags;
|
|
|
|
struct fence *fence;
|
|
struct fence_cb cb;
|
|
};
|
|
|
|
#define POLL_ENABLED 0
|
|
|
|
struct sync_file *sync_file_create(struct fence *fence);
|
|
struct fence *sync_file_get_fence(int fd);
|
|
|
|
#endif /* _LINUX_SYNC_H */
|