summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-08-09 14:17:14 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-08-09 14:17:14 -0700
commit39b5f76de03e17a0b80cb94a92496b1f95bf32b0 (patch)
tree3912599434281926b632f3b23de5281658a15569
parent25918b144a0f99cc5080184bb13bf5c7241f853a (diff)
parenta9d6b142e1acc3f6780de1eef9b8b3611c72d41c (diff)
Merge "msm: kgsl: Correctly update fence_name for larger timestamp"
-rw-r--r--drivers/gpu/msm/kgsl_sync.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/msm/kgsl_sync.c b/drivers/gpu/msm/kgsl_sync.c
index 358b3b038899..4bf591c236a7 100644
--- a/drivers/gpu/msm/kgsl_sync.c
+++ b/drivers/gpu/msm/kgsl_sync.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -179,7 +179,7 @@ int kgsl_add_fence_event(struct kgsl_device *device,
goto out;
}
snprintf(fence_name, sizeof(fence_name),
- "%s-pid-%d-ctx-%d-ts-%d",
+ "%s-pid-%d-ctx-%d-ts-%u",
device->name, current->group_leader->pid,
context_id, timestamp);