Skip to content Skip to conversation

drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.

PATCH In review Maarten Lankhorst 2 participants 2 messages Feb 29, 2016

Subsystems (2)

DRM drivers Intel i915

Share & tools

Maarten Lankhorst

author

2016-02-29 08:21 UTC #0 lore raw

PATCH 1/1 drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.

CI runs with DEBUG_WW_MUTEX_SLOWPATH, so -EDEADLK occurs a lot more. Handle the case where drm_atomic_commit fails with -EDEADLK correctly.

Signed-off-by Maarten Lankhorst <[email protected]>

---

drivers/gpu/drm/i915/intel_display.c +2 -1

index 7c4ce3828d9d..09e4852bd752 100644
@@ -10557,7 +10557,8 @@ found:
 		goto fail;
 	}
 
-	if (drm_atomic_commit(state)) {
+	ret = drm_atomic_commit(state);
+	if (ret) {
 		DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n");
 		goto fail;
 	}

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Ville Syrjälä

Reviewed-by on v1 1/1

2016-02-29 14:32 UTC #1 lore raw

Quoted 4 lines · Maarten Lankhorst

CI runs with DEBUG_WW_MUTEX_SLOWPATH, so -EDEADLK occurs a lot more. Handle the case where drm_atomic_commit fails with -EDEADLK correctly.
Signed-off-by Maarten Lankhorst <[email protected]>

Reviewed-by Ville Syrjälä <[email protected]>

Quoted 20 lines

---
drivers/gpu/drm/i915/intel_display.c +2 -1
index 7c4ce3828d9d..09e4852bd752 100644
@@ -10557,7 +10557,8 @@ found:
 		goto fail;
 	}
 
-	if (drm_atomic_commit(state)) {
+	ret = drm_atomic_commit(state);
+	if (ret) {
 		DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n");
 		goto fail;
 	}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 6 lines

Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx