UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Use VMA directly for checking tiling parameters 

v2: Rename functions to suit their more active role

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1471254551-25805-14-git-send-email-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2016-08-15 10:48:53 +01:00
parent a83718b681
commit f23eda8cb4
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/gpu/drm/i915/i915_gem_tiling.c
View File

@ -116,35 +116,46 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode)
return true; return true;
} }
/* Is the current GTT allocation valid for the change in tiling? */ /* Make the current GTT allocation valid for the change in tiling. */
static bool static int
i915_gem_object_fence_ok(struct drm_i915_gem_object *obj, int tiling_mode) i915_gem_object_fence_prepare(struct drm_i915_gem_object *obj, int tiling_mode)
{ {
struct drm_i915_private *dev_priv = to_i915(obj->base.dev); struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
struct i915_vma *vma;
u32 size; u32 size;
if (tiling_mode == I915_TILING_NONE) if (tiling_mode == I915_TILING_NONE)
return true; return 0;
if (INTEL_GEN(dev_priv) >= 4) if (INTEL_GEN(dev_priv) >= 4)
return true; return 0;
vma = i915_gem_obj_to_ggtt(obj);
if (!vma)
return 0;
if (!obj->map_and_fenceable)
return 0;
if (IS_GEN3(dev_priv)) { if (IS_GEN3(dev_priv)) {
if (i915_gem_obj_ggtt_offset(obj) & ~I915_FENCE_START_MASK) if (vma->node.start & ~I915_FENCE_START_MASK)
return false; goto bad;
} else { } else {
if (i915_gem_obj_ggtt_offset(obj) & ~I830_FENCE_START_MASK) if (vma->node.start & ~I830_FENCE_START_MASK)
return false; goto bad;
} }
size = i915_gem_get_ggtt_size(dev_priv, obj->base.size, tiling_mode); size = i915_gem_get_ggtt_size(dev_priv, obj->base.size, tiling_mode);
if (i915_gem_obj_ggtt_size(obj) != size) if (vma->node.size < size)
return false; goto bad;
if (i915_gem_obj_ggtt_offset(obj) & (size - 1)) if (vma->node.start & (size - 1))
return false; goto bad;
return true; return 0;
bad:
return i915_vma_unbind(vma);
} }
/** /**
@ -168,7 +179,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
struct drm_i915_gem_set_tiling *args = data; struct drm_i915_gem_set_tiling *args = data;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
int ret = 0; int err = 0;
/* Make sure we don't cross-contaminate obj->tiling_and_stride */ /* Make sure we don't cross-contaminate obj->tiling_and_stride */
BUILD_BUG_ON(I915_TILING_LAST & STRIDE_MASK); BUILD_BUG_ON(I915_TILING_LAST & STRIDE_MASK);
@ -187,7 +198,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
if (obj->pin_display || obj->framebuffer_references) { if (obj->pin_display || obj->framebuffer_references) {
ret = -EBUSY; err = -EBUSY;
goto err; goto err;
} }
@ -234,11 +245,9 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
* has to also include the unfenced register the GPU uses * has to also include the unfenced register the GPU uses
* whilst executing a fenced command for an untiled object. * whilst executing a fenced command for an untiled object.
*/ */
if (obj->map_and_fenceable &&
!i915_gem_object_fence_ok(obj, args->tiling_mode))
ret = i915_vma_unbind(i915_gem_obj_to_ggtt(obj));
if (ret == 0) { err = i915_gem_object_fence_prepare(obj, args->tiling_mode);
if (!err) {
if (obj->pages && if (obj->pages &&
obj->madv == I915_MADV_WILLNEED && obj->madv == I915_MADV_WILLNEED &&
dev_priv->quirks & QUIRK_PIN_SWIZZLED_PAGES) { dev_priv->quirks & QUIRK_PIN_SWIZZLED_PAGES) {
@ -281,7 +290,7 @@ err:
intel_runtime_pm_put(dev_priv); intel_runtime_pm_put(dev_priv);
return ret; return err;
} }
/** /**