geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[gem] Rename sequence numbers from "cookie" to "seqno"

main
Eric Anholt 2008-05-20 10:52:24 -07:00
parent 6c3ac484b0
commit ab36a6f983
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
linux-core/i915_gem.c
View File

@ -196,7 +196,7 @@ i915_gem_object_wait_rendering(struct drm_gem_object *obj)
int ret; int ret;
/* If there are writes queued to the buffer, flush and /* If there are writes queued to the buffer, flush and
* create a new cookie to wait for. * create a new seqno to wait for.
*/ */
if (obj->write_domain & ~(DRM_GEM_DOMAIN_CPU)) { if (obj->write_domain & ~(DRM_GEM_DOMAIN_CPU)) {
#if WATCH_BUF #if WATCH_BUF
@ -207,8 +207,8 @@ i915_gem_object_wait_rendering(struct drm_gem_object *obj)
obj->write_domain = 0; obj->write_domain = 0;
i915_gem_object_move_to_active(obj); i915_gem_object_move_to_active(obj);
obj_priv->last_rendering_cookie = i915_emit_irq(dev); obj_priv->last_rendering_seqno = i915_emit_irq(dev);
BUG_ON(obj_priv->last_rendering_cookie == 0); BUG_ON(obj_priv->last_rendering_seqno == 0);
#if WATCH_LRU #if WATCH_LRU
DRM_INFO("%s: flush moves to exec list %p\n", __func__, obj); DRM_INFO("%s: flush moves to exec list %p\n", __func__, obj);
#endif #endif
@ -218,10 +218,10 @@ i915_gem_object_wait_rendering(struct drm_gem_object *obj)
*/ */
if (obj_priv->active) { if (obj_priv->active) {
#if WATCH_BUF #if WATCH_BUF
DRM_INFO("%s: object %p wait for cookie %08x\n", DRM_INFO("%s: object %p wait for seqno %08x\n",
__func__, obj, obj_priv->last_rendering_cookie); __func__, obj, obj_priv->last_rendering_seqno);
#endif #endif
ret = i915_wait_irq(dev, obj_priv->last_rendering_cookie); ret = i915_wait_irq(dev, obj_priv->last_rendering_seqno);
if (ret != 0) if (ret != 0)
return ret; return ret;
@ -336,12 +336,12 @@ i915_dump_lru(struct drm_device *dev, const char *where)
list) list)
{ {
DRM_INFO(" %p: %08x\n", obj_priv, DRM_INFO(" %p: %08x\n", obj_priv,
obj_priv->last_rendering_cookie); obj_priv->last_rendering_seqno);
} }
DRM_INFO("GTT LRU %s {\n", where); DRM_INFO("GTT LRU %s {\n", where);
list_for_each_entry(obj_priv, &dev_priv->mm.inactive_list, list) { list_for_each_entry(obj_priv, &dev_priv->mm.inactive_list, list) {
DRM_INFO(" %p: %08x\n", obj_priv, DRM_INFO(" %p: %08x\n", obj_priv,
obj_priv->last_rendering_cookie); obj_priv->last_rendering_seqno);
} }
DRM_INFO("}\n"); DRM_INFO("}\n");
} }
@ -885,7 +885,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
struct drm_gem_object *batch_obj; struct drm_gem_object *batch_obj;
int ret, i; int ret, i;
uint64_t exec_offset; uint64_t exec_offset;
uint32_t cookie; uint32_t seqno;
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
@ -989,20 +989,20 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
} }
/* /*
* Get a cookie representing the execution of the current buffer, * Get a seqno representing the execution of the current buffer,
* which we can wait on. We would like to mitigate these interrupts, * which we can wait on. We would like to mitigate these interrupts,
* likely by only creating cookies occasionally (so that we have * likely by only creating seqnos occasionally (so that we have
* *some* interrupts representing completion of buffers that we can * *some* interrupts representing completion of buffers that we can
* wait on when trying to clear up gtt space). * wait on when trying to clear up gtt space).
*/ */
cookie = i915_emit_irq(dev); seqno = i915_emit_irq(dev);
BUG_ON(cookie == 0); BUG_ON(seqno == 0);
for (i = 0; i < args->buffer_count; i++) { for (i = 0; i < args->buffer_count; i++) {
struct drm_gem_object *obj = object_list[i]; struct drm_gem_object *obj = object_list[i];
struct drm_i915_gem_object *obj_priv = obj->driver_private; struct drm_i915_gem_object *obj_priv = obj->driver_private;
i915_gem_object_move_to_active(obj); i915_gem_object_move_to_active(obj);
obj_priv->last_rendering_cookie = cookie; obj_priv->last_rendering_seqno = seqno;
#if WATCH_LRU #if WATCH_LRU
DRM_INFO("%s: move to exec list %p\n", __func__, obj); DRM_INFO("%s: move to exec list %p\n", __func__, obj);
#endif #endif

2
shared-core/i915_drv.h
View File

@ -306,7 +306,7 @@ struct drm_i915_gem_object {
int pin_count; int pin_count;
/** Breadcrumb of last rendering to the buffer. */ /** Breadcrumb of last rendering to the buffer. */
uint32_t last_rendering_cookie; uint32_t last_rendering_seqno;
}; };
extern struct drm_ioctl_desc i915_ioctls[]; extern struct drm_ioctl_desc i915_ioctls[];