Rev 4280 | Rev 4539 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4280 | Rev 4293 | ||
|---|---|---|---|
| Line 361... | Line 361... | ||
| 361 | 361 | ||
| 362 | /* Synchronisation is provided by struct_mutex and checking of |
362 | /* Synchronisation is provided by struct_mutex and checking of |
| 363 | * dev_priv->fbc.fbc_work, so we can perform the cancellation |
363 | * dev_priv->fbc.fbc_work, so we can perform the cancellation |
| 364 | * entirely asynchronously. |
364 | * entirely asynchronously. |
| 365 | */ |
365 | */ |
| 366 | // if (cancel_delayed_work(&dev_priv->fbc_work->work)) |
366 | if (cancel_delayed_work(&dev_priv->fbc.fbc_work->work)) |
| 367 | /* tasklet was killed before being run, clean up */ |
367 | /* tasklet was killed before being run, clean up */ |
| Line 368... | Line 368... | ||
| 368 | // kfree(dev_priv->fbc_work); |
368 | kfree(dev_priv->fbc.fbc_work); |
| 369 | 369 | ||
| 370 | /* Mark the work as no longer wanted so that if it does |
370 | /* Mark the work as no longer wanted so that if it does |
| 371 | * wake-up (because the work was already running and waiting |
371 | * wake-up (because the work was already running and waiting |
| Line 4606... | Line 4606... | ||
| 4606 | WARN_ON(dev->irq_enabled); |
4606 | WARN_ON(dev->irq_enabled); |
| Line 4607... | Line 4607... | ||
| 4607 | 4607 | ||
| 4608 | if (IS_IRONLAKE_M(dev)) { |
4608 | if (IS_IRONLAKE_M(dev)) { |
| 4609 | ironlake_disable_drps(dev); |
4609 | ironlake_disable_drps(dev); |
| 4610 | ironlake_disable_rc6(dev); |
4610 | ironlake_disable_rc6(dev); |
| 4611 | } else if (INTEL_INFO(dev)->gen >= 6 && !IS_VALLEYVIEW(dev)) { |
4611 | } else if (INTEL_INFO(dev)->gen >= 6) { |
| - | 4612 | cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work); |
|
| - | 4613 | cancel_work_sync(&dev_priv->rps.work); |
|
| - | 4614 | if (IS_VALLEYVIEW(dev)) |
|
| 4612 | // cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work); |
4615 | cancel_delayed_work_sync(&dev_priv->rps.vlv_work); |
| 4613 | mutex_lock(&dev_priv->rps.hw_lock); |
4616 | mutex_lock(&dev_priv->rps.hw_lock); |
| 4614 | if (IS_VALLEYVIEW(dev)) |
4617 | if (IS_VALLEYVIEW(dev)) |
| 4615 | valleyview_disable_rps(dev); |
4618 | valleyview_disable_rps(dev); |
| 4616 | else |
4619 | else |