openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Track gpu fence usage 

Track if the gpu requires the fence for the execution of a batch buffer
and so only wait upon the retirement of the object's last rendering
seqno if the fence is in use by the GPU.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2010-09-20 11:40:50 +01:00
parent ab6f8e3250
commit 53640e1d07
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/i915/i915_drv.h
View File

@ -128,6 +128,7 @@ struct drm_i915_master_private {
struct drm_i915_fence_reg { struct drm_i915_fence_reg {
struct drm_gem_object *obj; struct drm_gem_object *obj;
struct list_head lru_list; struct list_head lru_list;
bool gpu;
}; };
struct sdvo_device_mapping { struct sdvo_device_mapping {

11
drivers/gpu/drm/i915/i915_gem.c
View File

@ -2461,7 +2461,9 @@ i915_gem_object_put_fence_reg(struct drm_gem_object *obj,
bool interruptible) bool interruptible)
{ {
struct drm_device *dev = obj->dev; struct drm_device *dev = obj->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct drm_i915_gem_object *obj_priv = to_intel_bo(obj); struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);
struct drm_i915_fence_reg *reg;
if (obj_priv->fence_reg == I915_FENCE_REG_NONE) if (obj_priv->fence_reg == I915_FENCE_REG_NONE)
return 0; return 0;
@ -2476,7 +2478,8 @@ i915_gem_object_put_fence_reg(struct drm_gem_object *obj,
* therefore we must wait for any outstanding access to complete * therefore we must wait for any outstanding access to complete
* before clearing the fence. * before clearing the fence.
*/ */
if (INTEL_INFO(dev)->gen < 4) { reg = &dev_priv->fence_regs[obj_priv->fence_reg];
if (reg->gpu) {
int ret; int ret;
ret = i915_gem_object_flush_gpu_write_domain(obj, true); ret = i915_gem_object_flush_gpu_write_domain(obj, true);
@ -2486,6 +2489,8 @@ i915_gem_object_put_fence_reg(struct drm_gem_object *obj,
ret = i915_gem_object_wait_rendering(obj, interruptible); ret = i915_gem_object_wait_rendering(obj, interruptible);
if (ret) if (ret)
return ret; return ret;
reg->gpu = false;
} }
i915_gem_object_flush_gtt_write_domain(obj); i915_gem_object_flush_gtt_write_domain(obj);
@ -3180,11 +3185,13 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
* properly handle blits to/from tiled surfaces. * properly handle blits to/from tiled surfaces.
*/ */
if (need_fence) { if (need_fence) {
ret = i915_gem_object_get_fence_reg(obj, false); ret = i915_gem_object_get_fence_reg(obj, true);
if (ret != 0) { if (ret != 0) {
i915_gem_object_unpin(obj); i915_gem_object_unpin(obj);
return ret; return ret;
} }
dev_priv->fence_regs[obj_priv->fence_reg].gpu = true;
} }
entry->offset = obj_priv->gtt_offset; entry->offset = obj_priv->gtt_offset;