diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-21 05:33:16 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-21 05:33:16 -0800 |
| commit | 328a15d380fcb537b8957208e85bd51176eff02b (patch) | |
| tree | 1eefb8f7827e1fb3ef940a0c2f79f4c87bff35d5 /drivers | |
| parent | 921ba81bc34af0d84abee17e8dfc2a03c283d202 (diff) | |
| parent | 5967ecda8f30b56a8c2876d61ed71922049736ea (diff) | |
Merge "msm: kgsl: Fix false timeout gpu faults"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/msm/adreno_dispatch.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/msm/adreno_dispatch.c b/drivers/gpu/msm/adreno_dispatch.c index 0d068e9c5805..89218b62bb7d 100644 --- a/drivers/gpu/msm/adreno_dispatch.c +++ b/drivers/gpu/msm/adreno_dispatch.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2013-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 @@ -2327,10 +2327,6 @@ static int adreno_dispatch_process_drawqueue(struct adreno_device *adreno_dev, if (adreno_drawqueue_is_empty(drawqueue)) return count; - /* Don't update the drawqueue timeout if we are about to preempt out */ - if (!adreno_in_preempt_state(adreno_dev, ADRENO_PREEMPT_NONE)) - return count; - /* Don't update the drawqueue timeout if it isn't active */ if (!drawqueue_is_current(drawqueue)) return count; |