linux-next: drm/i916: fix nop_submit_request mismerge
Subsystems (2)
PATCH 1/1 linux-next: drm/i916: fix nop_submit_request mismerge
A mismerge in linux-next caused a build failure:
drivers/gpu/drm/i915/i915_gem.c: In function 'nop_submit_request':drivers/gpu/drm/i915/i915_gem.c:3092:54: error: 'flags' undeclared (first use in this function); did you mean 'class'?
This is the fixup I used to get a clean build on top of today's tree. I don't know which of the versions is the one we want, so this may just as well be wrong.
--- drivers/gpu/drm/i915/i915_gem.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/i915_gem.c +2 -0
@@ -3087,6 +3087,8 @@ void i915_gem_reset_finish(struct drm_i915_private *dev_priv)static void nop_submit_request (struct drm_i915_gem_request *request) { +unsigned long flags; +dma_fence_set_error (&request->fence, -EIO );spin_lock_irqsave (&request->engine->timeline->lock, flags);
Signature · 1 line
2.9.0
Patchwork
CI✗ Fi.CI.BAT: failure for linux-next: drm/i916: fix nop_submit_request mismerge
== Series Details ==
== Series Details ==
Series: linux-next: drm/i916: fix nop_submit_request mismerge
URL : https://patchwork.freedesktop.org/series/32095/
State : failure
== Summary ==
Series 32095 revision 1 was fully merged or fully failed: no git log
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx