lkml.org 
[lkml]   [2017]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] linux-next: drm/i916: fix nop_submit_request mismerge
Date
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.

Fixes: 05724bd054c3 ("Merge branch 'akpm/master'")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/gpu/drm/i915/i915_gem.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index b4b62f427a99..ee2aee869dc6 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -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);
--
2.9.0
\
 
 \ /
  Last update: 2017-10-17 10:20    [W:0.049 / U:0.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site