projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-vc4-fixes-2016-08-29' of https://github.com/anholt/linux into drm...
[cascardo/linux.git]
/
include
/
linux
/
fence.h
diff --git
a/include/linux/fence.h
b/include/linux/fence.h
index
1de1b3f
..
8cc719a
100644
(file)
--- a/
include/linux/fence.h
+++ b/
include/linux/fence.h
@@
-77,7
+77,8
@@
struct fence {
struct rcu_head rcu;
struct list_head cb_list;
spinlock_t *lock;
struct rcu_head rcu;
struct list_head cb_list;
spinlock_t *lock;
- unsigned context, seqno;
+ u64 context;
+ unsigned seqno;
unsigned long flags;
ktime_t timestamp;
int status;
unsigned long flags;
ktime_t timestamp;
int status;
@@
-178,7
+179,7
@@
struct fence_ops {
};
void fence_init(struct fence *fence, const struct fence_ops *ops,
};
void fence_init(struct fence *fence, const struct fence_ops *ops,
- spinlock_t *lock, u
nsigned
context, unsigned seqno);
+ spinlock_t *lock, u
64
context, unsigned seqno);
void fence_release(struct kref *kref);
void fence_free(struct fence *fence);
void fence_release(struct kref *kref);
void fence_free(struct fence *fence);
@@
-352,27
+353,27
@@
static inline signed long fence_wait(struct fence *fence, bool intr)
return ret < 0 ? ret : 0;
}
return ret < 0 ? ret : 0;
}
-u
nsigned
fence_context_alloc(unsigned num);
+u
64
fence_context_alloc(unsigned num);
#define FENCE_TRACE(f, fmt, args...) \
do { \
struct fence *__ff = (f); \
#define FENCE_TRACE(f, fmt, args...) \
do { \
struct fence *__ff = (f); \
- if (
config_enabled(CONFIG_FENCE_TRACE))
\
- pr_info("f %
u#%u: " fmt,
\
+ if (
IS_ENABLED(CONFIG_FENCE_TRACE))
\
+ pr_info("f %
llu#%u: " fmt,
\
__ff->context, __ff->seqno, ##args); \
} while (0)
#define FENCE_WARN(f, fmt, args...) \
do { \
struct fence *__ff = (f); \
__ff->context, __ff->seqno, ##args); \
} while (0)
#define FENCE_WARN(f, fmt, args...) \
do { \
struct fence *__ff = (f); \
- pr_warn("f %
u#%u: " fmt, __ff->context, __ff->seqno,
\
+ pr_warn("f %
llu#%u: " fmt, __ff->context, __ff->seqno,
\
##args); \
} while (0)
#define FENCE_ERR(f, fmt, args...) \
do { \
struct fence *__ff = (f); \
##args); \
} while (0)
#define FENCE_ERR(f, fmt, args...) \
do { \
struct fence *__ff = (f); \
- pr_err("f %
u#%u: " fmt, __ff->context, __ff->seqno,
\
+ pr_err("f %
llu#%u: " fmt, __ff->context, __ff->seqno,
\
##args); \
} while (0)
##args); \
} while (0)