diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-25 15:52:05 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-25 15:52:05 -0700 |
| commit | 93f01bb7609e698c06352b10993888489c826904 (patch) | |
| tree | 2fd30e2be71e72a5a2b68775657ae625388d1a0a /drivers | |
| parent | 2371551ec1009e1ab304cd336b2b2ade120c4c24 (diff) | |
| parent | bd15fce5dff4e57ebf54b9ad621f94c6886418e4 (diff) | |
Merge "msm: kgsl: Don't delete uninitialized preemption timer"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/msm/adreno_dispatch.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/msm/adreno_dispatch.c b/drivers/gpu/msm/adreno_dispatch.c index 54b8da5302e8..55f906c9cb90 100644 --- a/drivers/gpu/msm/adreno_dispatch.c +++ b/drivers/gpu/msm/adreno_dispatch.c @@ -2090,7 +2090,12 @@ static int dispatcher_do_fault(struct adreno_device *adreno_dev) /* Turn off all the timers */ del_timer_sync(&dispatcher->timer); del_timer_sync(&dispatcher->fault_timer); - del_timer_sync(&adreno_dev->preempt.timer); + /* + * Deleting uninitialized timer will block for ever on kernel debug + * disable build. Hence skip del timer if it is not initialized. + */ + if (adreno_is_preemption_enabled(adreno_dev)) + del_timer_sync(&adreno_dev->preempt.timer); mutex_lock(&device->mutex); |