* [PATCH] drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.
@ 2016-02-29 8:18 Maarten Lankhorst
2016-02-29 14:31 ` Ville Syrjälä
0 siblings, 1 reply; 2+ messages in thread
From: Maarten Lankhorst @ 2016-02-29 8:18 UTC (permalink / raw)
To: Intel Graphics Development
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 <maarten.lankhorst@linux.intel.com>
---
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 7c4ce3828d9d..09e4852bd752 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.
2016-02-29 8:18 [PATCH] drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect Maarten Lankhorst
@ 2016-02-29 14:31 ` Ville Syrjälä
0 siblings, 0 replies; 2+ messages in thread
From: Ville Syrjälä @ 2016-02-29 14:31 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: Intel Graphics Development
On Mon, Feb 29, 2016 at 09:18:57AM +0100, Maarten Lankhorst wrote:
> 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 <maarten.lankhorst@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 7c4ce3828d9d..09e4852bd752 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -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
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-29 14:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-29 8:18 [PATCH] drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect Maarten Lankhorst
2016-02-29 14:31 ` Ville Syrjälä
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.