diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-08 10:11:38 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-08 10:11:38 +0100 |
commit | d2800e9cfd6bb876f597adbb806de21774067413 (patch) | |
tree | 5236f073d5af51d5060a46d09884a55b36ea3440 /drivers/gpu/mali400/r3p2/mali/include/linux/mali/mali_utgard_uk_types.h | |
parent | 3fe26611bb4999c3717d3aface0bac722b9d2653 (diff) | |
parent | afabf37012e839802f9f3819f621e16aa4acefd2 (diff) | |
download | kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.zip kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.tar.gz kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.tar.bz2 |
Merge commit 'afabf37012e839802f9f3819f621e16aa4acefd2' into upstreaming
update from cm-13.0
Conflicts:
Makefile
crypto/algapi.c
drivers/char/diag/diagchar.h
drivers/char/diag/diagchar_core.c
drivers/misc/Makefile
kernel/timeconst.pl
Diffstat (limited to 'drivers/gpu/mali400/r3p2/mali/include/linux/mali/mali_utgard_uk_types.h')
-rw-r--r-- | drivers/gpu/mali400/r3p2/mali/include/linux/mali/mali_utgard_uk_types.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/gpu/mali400/r3p2/mali/include/linux/mali/mali_utgard_uk_types.h b/drivers/gpu/mali400/r3p2/mali/include/linux/mali/mali_utgard_uk_types.h index 4957095..b78e6e2 100644 --- a/drivers/gpu/mali400/r3p2/mali/include/linux/mali/mali_utgard_uk_types.h +++ b/drivers/gpu/mali400/r3p2/mali/include/linux/mali/mali_utgard_uk_types.h @@ -70,6 +70,7 @@ typedef enum _MALI_UK_GET_USER_SETTINGS, /**< _mali_ukk_get_user_settings() *//**< [out] */ _MALI_UK_STREAM_CREATE, /**< _mali_ukk_stream_create() */ _MALI_UK_FENCE_CREATE_EMPTY, /**< _mali_ukk_fence_create_empty() */ + _MALI_UK_FENCE_CREATE_SIGNALLED, /**< _mali_ukk_fence_create_signalled() */ _MALI_UK_FENCE_VALIDATE, /**< _mali_ukk_fence_validate() */ /** Memory functions */ @@ -721,7 +722,7 @@ typedef struct * The 16bit integer is stored twice in a 32bit integer * For example, for version 1 the value would be 0x00010001 */ -#define _MALI_API_VERSION 23 +#define _MALI_API_VERSION 29 #define _MALI_UK_API_VERSION _MAKE_VERSION_ID(_MALI_API_VERSION) /** @@ -1144,6 +1145,15 @@ typedef struct s32 fence; /**< [out] file descriptor describing fence */ } _mali_uk_fence_create_empty_s; +/** @brief Create signalled fence + */ +typedef struct +{ + void *ctx; /**< [in,out] user-kernel context (trashed on output) */ + s32 stream; /**< [in] stream to create fence on */ + s32 fence; /**< [out] file descriptor describing fence */ +} _mali_uk_fence_create_signalled_s; + /** @brief Check fence validity */ typedef struct |