projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.14' into drm-intel-next-queued
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_gem_tiling.c
diff --git
a/drivers/gpu/drm/i915/i915_gem_tiling.c
b/drivers/gpu/drm/i915/i915_gem_tiling.c
index b1390534804888e46d4db065fcb0837814743e4c..eb993584aa6babbe3894594b928a8e5a47fb9fbb 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/
drivers/gpu/drm/i915/i915_gem_tiling.c
@@
-308,7
+308,7
@@
i915_gem_set_tiling(struct drm_device *dev, void *data,
return -EINVAL;
}
- if (
obj->pin_count
|| obj->framebuffer_references) {
+ if (
i915_gem_obj_is_pinned(obj)
|| obj->framebuffer_references) {
drm_gem_object_unreference_unlocked(&obj->base);
return -EBUSY;
}
This page took
0.024969 seconds
and
5
git commands to generate.