summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/host1x/syncpt.c
diff options
context:
space:
mode:
authorThierry Reding2016-06-23 11:33:31 +0200
committerThierry Reding2016-06-23 11:59:28 +0200
commit6df633d0dc333ffce683f46f2856024479b170b9 (patch)
tree7ec587a9e0fa9a9c2e6eb9352af4232fa91e1d7e /drivers/gpu/host1x/syncpt.c
parentgpu: host1x: syncpt: Use kcalloc() instead of kzalloc() (diff)
downloadkernel-qcow2-linux-6df633d0dc333ffce683f46f2856024479b170b9.tar.gz
kernel-qcow2-linux-6df633d0dc333ffce683f46f2856024479b170b9.tar.xz
kernel-qcow2-linux-6df633d0dc333ffce683f46f2856024479b170b9.zip
gpu: host1x: Fix a couple of checkpatch warnings
Fix a couple of occurrences where no blank line was used to separate variable declarations from code or where block comments were wrongly formatted. Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/host1x/syncpt.c')
-rw-r--r--drivers/gpu/host1x/syncpt.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/host1x/syncpt.c b/drivers/gpu/host1x/syncpt.c
index d70aad5c9f05..7c4848f4ce59 100644
--- a/drivers/gpu/host1x/syncpt.c
+++ b/drivers/gpu/host1x/syncpt.c
@@ -146,6 +146,7 @@ void host1x_syncpt_save(struct host1x *host)
u32 host1x_syncpt_load(struct host1x_syncpt *sp)
{
u32 val;
+
val = host1x_hw_syncpt_load(sp->host, sp);
trace_host1x_syncpt_load_min(sp->id, val);
@@ -158,6 +159,7 @@ u32 host1x_syncpt_load(struct host1x_syncpt *sp)
u32 host1x_syncpt_load_wait_base(struct host1x_syncpt *sp)
{
u32 val;
+
host1x_hw_syncpt_load_wait_base(sp->host, sp);
val = sp->base_val;
return val;
@@ -279,6 +281,7 @@ bool host1x_syncpt_is_expired(struct host1x_syncpt *sp, u32 thresh)
{
u32 current_val;
u32 future_val;
+
smp_rmb();
current_val = (u32)atomic_read(&sp->min_val);
future_val = (u32)atomic_read(&sp->max_val);
@@ -408,7 +411,7 @@ void host1x_syncpt_deinit(struct host1x *host)
/*
* Read max. It indicates how many operations there are in queue, either in
* channel or in a software thread.
- * */
+ */
u32 host1x_syncpt_read_max(struct host1x_syncpt *sp)
{
smp_rmb();