drm/i915: Fix power domain HW state cleanup on error path
Subsystems (2)
PATCH 1/1 drm/i915: Fix power domain HW state cleanup on error path
Move the cleanup of the power domain HW state on the error path to the same function where the corresponding init call was called from. I noticed this problem when loading the module with load failure injection enabled, making i915_load_modeset_init() fail.
---
[This depends on
https://lists.freedesktop.org/archives/intel-gfx/2016-March/089597.html]
drivers/gpu/drm/i915/i915_dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +3 -3
@@ -456,6 +456,7 @@ cleanup_irq:intel_teardown_gmbus (dev); cleanup_csr:intel_csr_ucode_fini (dev_priv); +intel_power_domains_fini (dev_priv);vga_switcheroo_unregister_client (dev->pdev); cleanup_vga_client:vga_client_register (dev->pdev,NULL ,NULL ,NULL );
@@ -1319,7 +1320,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) ret =i915_load_modeset_init (dev);if (ret <0 ) {DRM_ERROR ("failed to init modeset\n" ); - goto out_power_well; + goto out_cleanup_vblank; }i915_driver_register (dev_priv);
@@ -1330,8 +1331,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)return 0 ; -out_power_well: -intel_power_domains_fini (dev_priv); +out_cleanup_vblank:drm_vblank_cleanup (dev); out_cleanup_hw:i915_driver_cleanup_hw (dev_priv);
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Fix power domain HW state cleanup on error path
== Series Details ==
== Series Details ==
Series: drm/i915: Fix power domain HW state cleanup on error path
URL : https://patchwork.freedesktop.org/series/4435/
State : failure
== Summary ==
Series 4435v1 drm/i915: Fix power domain HW state cleanup on error path
2016-03-14T14:52:33.167290 http://patchwork.freedesktop.org/api/1.0/series/4435/revisions/1/mbox/
Applying: drm/i915: Fix power domain HW state cleanup on error path Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_dma.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_dma.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c Patch failed at 0001 drm/i915: Fix power domain HW state cleanup on error path
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx