superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging/android: rename sync_pt_info to sync_fence_info 

As struct sync_pt doesn't exist anymore it is a good idea remove any
reference to it in the sync_framework. sync_pts were replaced directly by
fences and here we rename it to sync_fence_info to let the fence namespace
clean.

v2: rename fence_info to sync_fence_info (Maarten)

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
pull/291/head
Gustavo Padovan 2016-02-03 11:25:31 -02:00 committed by Greg Kroah-Hartman
parent 84013bb465
commit e1786348e4
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/android/sync.c
View File

@ -490,15 +490,15 @@ err_put_fd:
return err;
}
static int sync_fill_pt_info(struct fence *fence, void *data, int size)
static int sync_fill_fence_info(struct fence *fence, void *data, int size)
{
struct sync_pt_info *info = data;
struct sync_fence_info *info = data;
int ret;
if (size < sizeof(struct sync_pt_info))
if (size < sizeof(*info))
return -ENOMEM;
info->len = sizeof(struct sync_pt_info);
info->len = sizeof(*info);
if (fence->ops->fill_driver_data) {
ret = fence->ops->fill_driver_data(fence, info->driver_data,
@ -553,7 +553,7 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file,
for (i = 0; i < sync_file->num_fences; ++i) {
struct fence *fence = sync_file->cbs[i].fence;
ret = sync_fill_pt_info(fence, (u8 *)data + len, size - len);
ret = sync_fill_fence_info(fence, (u8 *)data + len, size - len);
if (ret < 0)
goto out;

12
drivers/staging/android/uapi/sync.h
View File

@ -27,15 +27,15 @@ struct sync_merge_data {
};
/**
* struct sync_pt_info - detailed sync_pt information
* @len: length of sync_pt_info including any driver_data
* struct sync_fence_info - detailed fence information
* @len: length of sync_fence_info including any driver_data
* @obj_name: name of parent sync_timeline
* @driver_name: name of driver implementing the parent
* @status: status of the sync_pt 0:active 1:signaled <0:error
* @status: status of the fence 0:active 1:signaled <0:error
* @timestamp_ns: timestamp of status change in nanoseconds
* @driver_data: any driver dependent data
*/
struct sync_pt_info {
struct sync_fence_info {
__u32 len;
char obj_name[32];
char driver_name[32];
@ -52,14 +52,14 @@ struct sync_pt_info {
* userspace including pt_info.
* @name: name of fence
* @status: status of fence. 1: signaled 0:active <0:error
* @pt_info: a sync_pt_info struct for every sync_pt in the fence
* @sync_fence_info: array of sync_fence_info for every fence in the sync_file
*/
struct sync_file_info_data {
__u32 len;
char name[32];
__s32 status;
__u8 pt_info[0];
__u8 sync_fence_info[0];
};
#define SYNC_IOC_MAGIC '>'