projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-intel-next-2014-04-16' of git://anongit.freedesktop.org/drm-intel...
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_gem_execbuffer.c
diff --git
a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 34914025e75013798f3233d672fa9ce8acc5ed4d..0ec8621eb4f8545f9e6f809d9858d3089370a33c 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/
drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@
-1222,7
+1222,7
@@
i915_gem_do_execbuffer(struct drm_device *dev, void *data,
if (ret)
goto err;
- ret = i915_switch_context(ring,
file,
ctx);
+ ret = i915_switch_context(ring, ctx);
if (ret)
goto err;