]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: propagate the error code from runtime PM callbacks
authorImre Deak <imre.deak@intel.com>
Tue, 15 Apr 2014 13:39:45 +0000 (16:39 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 7 May 2014 08:01:39 +0000 (10:01 +0200)
commitd20b8013dc10c71b2452a4d311b913191e2a2c33
tree2241ee49d864d2f5f17a8fbbf77c89946b8518ca
parentf6afbb3a16d28b0e22f7d57d869a17010e47ca19
drm/i915: propagate the error code from runtime PM callbacks

Atm, none of the RPM callbacks can fail, but the next patch adding
RPM support for VLV changes this, so prepare for it.

In case one of these callbacks return error RPM will get permanently
disabled until the error is explicitly cleared. In the future we could
add support for re-enabling it, for example after resetting the HW, but
for now - hopefully - we can live with the simpler solution.

v2:
- propagate the error from the resume callbacks too (Paulo)
v3:
- fix rebase fail typo around IS_GEN6() check in intel_runtime_suspend()

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.c