diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-11-14 06:21:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-11-14 06:21:40 +1000 |
| commit | 64e5fcc68baaf5301af2c4d28229fcfeb99c009a (patch) | |
| tree | 6d46bd42e88fbcc355cdd7d19180bf14f0a17512 /drivers/gpu/drm | |
| parent | 5f2fcdbd100e4f296141d23d03413c1303d97bed (diff) | |
| parent | e9d784d535e43777f9ff44d7e582946f4776c000 (diff) | |
| download | blackbird-op-linux-64e5fcc68baaf5301af2c4d28229fcfeb99c009a.tar.gz blackbird-op-linux-64e5fcc68baaf5301af2c4d28229fcfeb99c009a.zip | |
Merge tag 'drm-intel-fixes-2014-11-13' of git://anongit.freedesktop.org/drm-intel into drm-fixes
one regression fix.
* tag 'drm-intel-fixes-2014-11-13' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Fix obj->map_and_fenceable across tiling changes
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_tiling.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index 2cefb597df6d..2b1eaa29ada4 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c @@ -364,22 +364,9 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, * has to also include the unfenced register the GPU uses * whilst executing a fenced command for an untiled object. */ - - obj->map_and_fenceable = - !i915_gem_obj_ggtt_bound(obj) || - (i915_gem_obj_ggtt_offset(obj) + - obj->base.size <= dev_priv->gtt.mappable_end && - i915_gem_object_fence_ok(obj, args->tiling_mode)); - - /* Rebind if we need a change of alignment */ - if (!obj->map_and_fenceable) { - u32 unfenced_align = - i915_gem_get_gtt_alignment(dev, obj->base.size, - args->tiling_mode, - false); - if (i915_gem_obj_ggtt_offset(obj) & (unfenced_align - 1)) - ret = i915_gem_object_ggtt_unbind(obj); - } + if (obj->map_and_fenceable && + !i915_gem_object_fence_ok(obj, args->tiling_mode)) + ret = i915_gem_object_ggtt_unbind(obj); if (ret == 0) { obj->fence_dirty = |
