[Intel-gfx] [CI 09/13] drm/i915: add wait flags to i915_active_request_retire

2019-09-09 Thread Lionel Landwerlin 
An upcoming change needs not to be interrupted.

Signed-off-by: Lionel Landwerlin 
---
 drivers/gpu/drm/i915/i915_active.c | 4 +++-
 drivers/gpu/drm/i915/i915_active.h | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_active.c 
b/drivers/gpu/drm/i915/i915_active.c
index 6a447f1d0110..c808c28c9464 100644
--- a/drivers/gpu/drm/i915/i915_active.c
+++ b/drivers/gpu/drm/i915/i915_active.c
@@ -425,7 +425,9 @@ int i915_active_wait(struct i915_active *ref)
break;
}
 
-   err = i915_active_request_retire(&it->base, BKL(ref));
+   err = i915_active_request_retire(&it->base,
+I915_WAIT_INTERRUPTIBLE,
+BKL(ref));
if (err)
break;
}
diff --git a/drivers/gpu/drm/i915/i915_active.h 
b/drivers/gpu/drm/i915/i915_active.h
index f95058f99057..35a6089b44fd 100644
--- a/drivers/gpu/drm/i915/i915_active.h
+++ b/drivers/gpu/drm/i915/i915_active.h
@@ -309,6 +309,7 @@ i915_active_request_isset(const struct i915_active_request 
*active)
  */
 static inline int __must_check
 i915_active_request_retire(struct i915_active_request *active,
+  unsigned int flags,
   struct mutex *mutex)
 {
struct i915_request *request;
@@ -318,9 +319,7 @@ i915_active_request_retire(struct i915_active_request 
*active,
if (!request)
return 0;
 
-   ret = i915_request_wait(request,
-   I915_WAIT_INTERRUPTIBLE,
-   MAX_SCHEDULE_TIMEOUT);
+   ret = i915_request_wait(request, flags, MAX_SCHEDULE_TIMEOUT);
if (ret < 0)
return ret;
 
-- 
2.23.0

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [CI 09/13] drm/i915: add wait flags to i915_active_request_retire

2019-09-09 Thread Lionel Landwerlin 
An upcoming change needs not to be interrupted.

Signed-off-by: Lionel Landwerlin 
---
 drivers/gpu/drm/i915/i915_active.c | 4 +++-
 drivers/gpu/drm/i915/i915_active.h | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_active.c 
b/drivers/gpu/drm/i915/i915_active.c
index 6a447f1d0110..c808c28c9464 100644
--- a/drivers/gpu/drm/i915/i915_active.c
+++ b/drivers/gpu/drm/i915/i915_active.c
@@ -425,7 +425,9 @@ int i915_active_wait(struct i915_active *ref)
break;
}
 
-   err = i915_active_request_retire(&it->base, BKL(ref));
+   err = i915_active_request_retire(&it->base,
+I915_WAIT_INTERRUPTIBLE,
+BKL(ref));
if (err)
break;
}
diff --git a/drivers/gpu/drm/i915/i915_active.h 
b/drivers/gpu/drm/i915/i915_active.h
index f95058f99057..35a6089b44fd 100644
--- a/drivers/gpu/drm/i915/i915_active.h
+++ b/drivers/gpu/drm/i915/i915_active.h
@@ -309,6 +309,7 @@ i915_active_request_isset(const struct i915_active_request 
*active)
  */
 static inline int __must_check
 i915_active_request_retire(struct i915_active_request *active,
+  unsigned int flags,
   struct mutex *mutex)
 {
struct i915_request *request;
@@ -318,9 +319,7 @@ i915_active_request_retire(struct i915_active_request 
*active,
if (!request)
return 0;
 
-   ret = i915_request_wait(request,
-   I915_WAIT_INTERRUPTIBLE,
-   MAX_SCHEDULE_TIMEOUT);
+   ret = i915_request_wait(request, flags, MAX_SCHEDULE_TIMEOUT);
if (ret < 0)
return ret;
 
-- 
2.23.0

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx