diff options
| author | Daniel Vetter | 2014-09-30 10:56:43 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-10-03 11:19:28 +0200 |
| commit | 2aeb7d3a4d425be7e9185e79dd745918f7f72552 (patch) | |
| tree | 9ec8786c4144cdb39a9ef2c0721db92e4474793d /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Clear TX FIFO reset master override bits on chv (diff) | |
| download | kernel-qcow2-linux-2aeb7d3a4d425be7e9185e79dd745918f7f72552.tar.gz kernel-qcow2-linux-2aeb7d3a4d425be7e9185e79dd745918f7f72552.tar.xz kernel-qcow2-linux-2aeb7d3a4d425be7e9185e79dd745918f7f72552.zip | |
drm/i915: s/pm._irqs_disabled/pm.irqs_enabled/
Double negations just parse harder. Also this allows us to ditch some
init code since clearing to 0 dtrt. Also ditch the assignment in
intel_pm_setup, that's not redundant since we do the assignement now
while setting up interrupts.
While at it do engage in a bit of OCD and wrap up the few lines of
setup/teardown code into little helper functions: intel_irq_fini for
cleanup and intel_irq_init_hw for hw setup.
v2: Use _install/_uninstall for the new wrapper function names as
Paulo suggested.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 7877b163b5b9..6fc77a100cc6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13372,9 +13372,7 @@ void intel_modeset_cleanup(struct drm_device *dev) * Too much stuff here (turning of rps, connectors, ...) would * experience fancy races otherwise. */ - drm_irq_uninstall(dev); - intel_hpd_cancel_work(dev_priv); - dev_priv->pm._irqs_disabled = true; + intel_irq_uninstall(dev_priv); /* * Due to the hpd irq storm handling the hotplug work can re-arm the |