shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "BACKPORT: dma-buf/sync_file: Allow multiple sync_files to wrap a single dma-fence"

Browse Source 
This reverts commit 74fa0af473.

The commit 74fa0af caused GPU driver loading failed.

Change-Id: I255eb6b7a26e3b00e4f11489ece49896ff004d79
This commit is contained in:
Victor Wan
2018-08-07 14:45:33 +08:00
parent cc7b1eac54
commit 7152bce7ca
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/dma-buf/sync_file.c
View File

@@ -278,7 +278,7 @@ static void sync_file_free(struct kref *kref)
struct sync_file *sync_file = container_of(kref, struct sync_file,
kref);
if (test_bit(POLL_ENABLED, &sync_file->flags))
if (test_bit(POLL_ENABLED, &sync_file->fence->flags))
fence_remove_callback(sync_file->fence, &sync_file->cb);
fence_put(sync_file->fence);
kfree(sync_file);
@@ -298,8 +298,7 @@ static unsigned int sync_file_poll(struct file *file, poll_table *wait)
poll_wait(file, &sync_file->wq, wait);
if (list_empty(&sync_file->cb.node) &&
!test_and_set_bit(POLL_ENABLED, &sync_file->flags)) {
if (!test_and_set_bit(POLL_ENABLED, &sync_file->fence->flags)) {
if (fence_add_callback(sync_file->fence, &sync_file->cb,
fence_check_cb_func) < 0)
wake_up_all(&sync_file->wq);

3
include/linux/sync_file.h
View File

@@ -40,13 +40,12 @@ struct sync_file {
#endif
wait_queue_head_t wq;
unsigned long flags;
struct fence *fence;
struct fence_cb cb;
};
#define POLL_ENABLED 0
#define POLL_ENABLED FENCE_FLAG_USER_BITS
struct sync_file *sync_file_create(struct fence *fence);
struct fence *sync_file_get_fence(int fd);