projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-intel-next' of git://anongit.freedesktop.org/drm-intel into drm...
[cascardo/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
b9bdb34
..
a6eb5c4
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/
drivers/gpu/drm/i915/i915_gem_tiling.c
@@
-125,7
+125,7
@@
i915_gem_object_fence_ok(struct drm_i915_gem_object *obj, int tiling_mode)
if (INTEL_INFO(obj->base.dev)->gen >= 4)
return true;
if (INTEL_INFO(obj->base.dev)->gen >= 4)
return true;
- if (I
NTEL_INFO(obj->base.dev)->gen == 3
) {
+ if (I
S_GEN3(obj->base.dev)
) {
if (i915_gem_obj_ggtt_offset(obj) & ~I915_FENCE_START_MASK)
return false;
} else {
if (i915_gem_obj_ggtt_offset(obj) & ~I915_FENCE_START_MASK)
return false;
} else {
@@
-229,7
+229,7
@@
i915_gem_set_tiling(struct drm_device *dev, void *data,
*/
if (obj->map_and_fenceable &&
!i915_gem_object_fence_ok(obj, args->tiling_mode))
*/
if (obj->map_and_fenceable &&
!i915_gem_object_fence_ok(obj, args->tiling_mode))
- ret = i915_
gem_object_ggtt_unbind(obj
);
+ ret = i915_
vma_unbind(i915_gem_obj_to_ggtt(obj)
);
if (ret == 0) {
if (obj->pages &&
if (ret == 0) {
if (obj->pages &&