xf86-video-intel: 3 commits - src/sna/sna_accel.c src/sna/sna.h
Chris Wilson
ickle at kemper.freedesktop.org
Sun Oct 21 07:04:31 PDT 2012
src/sna/sna.h | 3
src/sna/sna_accel.c | 197 +++++-----------------------------------------------
2 files changed, 21 insertions(+), 179 deletions(-)
New commits:
commit fb729788872ccb429ddde8a9a4281b1933243096
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Oct 21 14:36:48 2012 +0100
sna: Only query the system time if we are processing timers
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 6f2da84..6bb8eae 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -13832,6 +13832,8 @@ static bool sna_accel_do_flush(struct sna *sna)
if (priv)
kgem_bo_flush(&sna->kgem, priv->gpu_bo);
} else {
+ if (!sna->timer_active)
+ UpdateCurrentTimeIf();
sna->timer_active |= 1 << FLUSH_TIMER;
sna->timer_expire[FLUSH_TIMER] = TIME + interval / 2;
DBG(("%s (time=%ld), starting\n", __FUNCTION__, (long)TIME));
@@ -13858,6 +13860,8 @@ static bool sna_accel_do_throttle(struct sna *sna)
DBG(("%s -- no pending activity\n", __FUNCTION__));
} else {
DBG(("%s (time=%ld), starting\n", __FUNCTION__, (long)TIME));
+ if (!sna->timer_active)
+ UpdateCurrentTimeIf();
sna->timer_active |= 1 << THROTTLE_TIMER;
sna->timer_expire[THROTTLE_TIMER] = TIME + 20;
}
@@ -13878,6 +13882,8 @@ static bool sna_accel_do_expire(struct sna *sna)
}
} else {
if (sna->kgem.need_expire) {
+ if (!sna->timer_active)
+ UpdateCurrentTimeIf();
sna->timer_active |= 1 << EXPIRE_TIMER;
sna->timer_expire[EXPIRE_TIMER] =
TIME + MAX_INACTIVE_TIME * 1000;
@@ -14343,7 +14349,8 @@ void sna_accel_close(struct sna *sna)
void sna_accel_block_handler(struct sna *sna, struct timeval **tv)
{
- UpdateCurrentTimeIf();
+ if (sna->timer_active)
+ UpdateCurrentTimeIf();
if (sna->kgem.nbatch && kgem_is_idle(&sna->kgem)) {
DBG(("%s: GPU idle, flushing\n", __FUNCTION__));
commit c0d6a75f02eb97e5c80a4345ae5c68e9a81d49b6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Oct 21 14:32:14 2012 +0100
sna: Use the FLUSH_TIMER as the only wakeup timer source
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 9a792e5..6f2da84 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -13888,28 +13888,6 @@ static bool sna_accel_do_expire(struct sna *sna)
return false;
}
-static int32_t sna_timeout(struct sna *sna)
-{
- int32_t now = TIME, next = 0;
- int i;
-
- DBG(("%s: now=%d, active=%08x\n",
- __FUNCTION__, (int)now, sna->timer_active));
- for (i = 0; i < NUM_TIMERS; i++) {
- if (sna->timer_active & (1 << i)) {
- int32_t delta = sna->timer_expire[i] - now;
- DBG(("%s: timer[%d] expires in %d [%d]\n",
- __FUNCTION__, i, delta, sna->timer_expire[i]));
- if (next == 0 || delta < next)
- next = delta;
- }
- }
-
- DBG(("%s: active=%08x, next=+%d\n",
- __FUNCTION__, sna->timer_active, next));
- return next;
-}
-
static void sna_accel_post_damage(struct sna *sna)
{
#if HAS_PIXMAP_SHARING
@@ -14399,22 +14377,24 @@ void sna_accel_block_handler(struct sna *sna, struct timeval **tv)
sna->watch_flush = 0;
}
- if (sna->timer_active) {
+ if (sna->timer_active & 1) {
int32_t timeout;
DBG(("%s: evaluating timers, active=%x\n",
__FUNCTION__, sna->timer_active));
- timeout = sna_timeout(sna);
- if (timeout) {
- if (*tv == NULL) {
- *tv = &sna->timer_tv;
- goto set_tv;
- }
- if ((*tv)->tv_sec * 1000 + (*tv)->tv_usec / 1000 > timeout) {
+
+ timeout = sna->timer_expire[0] - TIME;
+ DBG(("%s: flush timer expires in %d [%d]\n",
+ __FUNCTION__, timeout, sna->timer_expire[0]));
+
+ if (*tv == NULL) {
+ *tv = &sna->timer_tv;
+ goto set_tv;
+ }
+ if ((*tv)->tv_sec * 1000 + (*tv)->tv_usec / 1000 > timeout) {
set_tv:
- (*tv)->tv_sec = timeout / 1000;
- (*tv)->tv_usec = timeout % 1000 * 1000;
- }
+ (*tv)->tv_sec = timeout / 1000;
+ (*tv)->tv_usec = timeout % 1000 * 1000;
}
}
}
commit 7bc829c39a203c17053eb728412f698a429ad9fe
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Oct 21 14:24:01 2012 +0100
sna: Remove the unused inactive eviction
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna.h b/src/sna/sna.h
index 031be72..dc18fee 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -114,7 +114,6 @@ struct sna_pixmap {
void *ptr;
struct list list;
- struct list inactive;
uint32_t stride;
uint32_t clear_color;
@@ -185,7 +184,6 @@ enum {
FLUSH_TIMER = 0,
THROTTLE_TIMER,
EXPIRE_TIMER,
- INACTIVE_TIMER,
#if DEBUG_MEMORY
DEBUG_MEMORY_TIMER,
#endif
@@ -213,7 +211,6 @@ struct sna {
struct list flush_pixmaps;
struct list active_pixmaps;
- struct list inactive_clock[2];
PixmapPtr front;
PixmapPtr freed_pixmap;
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 8d2a3f9..9a792e5 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -60,7 +60,6 @@
#define USE_INPLACE 1
#define USE_WIDE_SPANS 0 /* -1 force CPU, 1 force GPU */
#define USE_ZERO_SPANS 1 /* -1 force CPU, 1 force GPU */
-#define USE_INACTIVE 0
#define USE_CPU_BO 1
#define MIGRATE_ALL 0
@@ -405,8 +404,6 @@ static void sna_pixmap_free_gpu(struct sna *sna, struct sna_pixmap *priv)
priv->mapped = false;
}
- list_del(&priv->inactive);
-
/* and reset the upload counter */
priv->source_count = SOURCE_BIAS;
}
@@ -619,7 +616,6 @@ static struct sna_pixmap *
_sna_pixmap_init(struct sna_pixmap *priv, PixmapPtr pixmap)
{
list_init(&priv->list);
- list_init(&priv->inactive);
priv->source_count = SOURCE_BIAS;
priv->pixmap = pixmap;
@@ -1248,7 +1244,6 @@ static void __sna_free_pixmap(struct sna *sna,
struct sna_pixmap *priv)
{
list_del(&priv->list);
- list_del(&priv->inactive);
sna_damage_destroy(&priv->gpu_damage);
sna_damage_destroy(&priv->cpu_damage);
@@ -2354,10 +2349,6 @@ static inline struct sna_pixmap *
sna_pixmap_mark_active(struct sna *sna, struct sna_pixmap *priv)
{
assert(priv->gpu_bo);
- if (USE_INACTIVE &&
- !priv->pinned && priv->gpu_bo->proxy == NULL &&
- (priv->create & KGEM_CAN_CREATE_LARGE) == 0)
- list_move(&priv->inactive, &sna->active_pixmaps);
return priv;
}
@@ -2803,10 +2794,6 @@ use_gpu_bo:
assert(priv->gpu_bo->proxy == NULL);
priv->clear = false;
priv->cpu = false;
- if (USE_INACTIVE &&
- !priv->pinned && (priv->create & KGEM_CAN_CREATE_LARGE) == 0)
- list_move(&priv->inactive,
- &to_sna_from_pixmap(pixmap)->active_pixmaps);
*damage = NULL;
return priv->gpu_bo;
@@ -13901,31 +13888,6 @@ static bool sna_accel_do_expire(struct sna *sna)
return false;
}
-static bool sna_accel_do_inactive(struct sna *sna)
-{
- if (!USE_INACTIVE)
- return false;
-
- if (sna->timer_active & (1<<(INACTIVE_TIMER))) {
- int32_t delta = sna->timer_expire[INACTIVE_TIMER] - TIME;
- if (delta <= 3) {
- sna->timer_expire[INACTIVE_TIMER] =
- TIME + 120 * 1000;
- DBG(("%s (time=%ld), triggered\n", __FUNCTION__, (long)TIME));
- return true;
- }
- } else {
- if (!list_is_empty(&sna->active_pixmaps)) {
- sna->timer_active |= 1 << INACTIVE_TIMER;
- sna->timer_expire[INACTIVE_TIMER] =
- TIME + 120 * 1000;
- DBG(("%s (time=%ld), starting\n", __FUNCTION__, (long)TIME));
- }
- }
-
- return false;
-}
-
static int32_t sna_timeout(struct sna *sna)
{
int32_t now = TIME, next = 0;
@@ -14103,105 +14065,6 @@ static void sna_accel_expire(struct sna *sna)
sna_accel_disarm_timer(sna, EXPIRE_TIMER);
}
-static void sna_accel_inactive(struct sna *sna)
-{
- struct sna_pixmap *priv;
- struct list preserve;
-
- DBG(("%s (time=%ld)\n", __FUNCTION__, (long)TIME));
-
-#if HAS_FULL_DEBUG
- {
- unsigned count, bytes;
-
- count = bytes = 0;
- list_for_each_entry(priv, &sna->inactive_clock[1], inactive)
- if (!priv->pinned)
- count++, bytes += kgem_bo_size(priv->gpu_bo);
-
- DBG(("%s: trimming %d inactive GPU buffers, %d bytes\n",
- __FUNCTION__, count, bytes));
-
- count = bytes = 0;
- list_for_each_entry(priv, &sna->active_pixmaps, inactive) {
- if (priv->ptr &&
- sna_damage_is_all(&priv->gpu_damage,
- priv->pixmap->drawable.width,
- priv->pixmap->drawable.height)) {
- count++, bytes += priv->pixmap->devKind * priv->pixmap->drawable.height;
- }
- }
-
- DBG(("%s: trimming %d inactive CPU buffers, %d bytes\n",
- __FUNCTION__, count, bytes));
- }
-#endif
-
- /* clear out the oldest inactive pixmaps */
- list_init(&preserve);
- while (!list_is_empty(&sna->inactive_clock[1])) {
- priv = list_first_entry(&sna->inactive_clock[1],
- struct sna_pixmap,
- inactive);
- assert((priv->create & KGEM_CAN_CREATE_LARGE) == 0);
- assert(priv->gpu_bo);
- assert(!priv->gpu_bo->proxy);
-
- /* XXX Rather than discarding the GPU buffer here, we
- * could mark it purgeable and allow the shrinker to
- * reap its storage only under memory pressure.
- */
- list_del(&priv->inactive);
- if (priv->pinned)
- continue;
-
- if (priv->ptr &&
- sna_damage_is_all(&priv->gpu_damage,
- priv->pixmap->drawable.width,
- priv->pixmap->drawable.height)) {
- DBG(("%s: discarding inactive CPU shadow\n",
- __FUNCTION__));
- sna_damage_destroy(&priv->cpu_damage);
- list_del(&priv->list);
-
- assert(priv->cpu_bo == NULL || !priv->cpu_bo->flush);
- assert(!priv->shm);
- sna_pixmap_free_cpu(sna, priv);
- priv->undamaged = false;
- priv->cpu = false;
-
- list_add(&priv->inactive, &preserve);
- } else {
- DBG(("%s: discarding inactive GPU bo handle=%d\n",
- __FUNCTION__, priv->gpu_bo->handle));
- if (!sna_pixmap_move_to_cpu(priv->pixmap,
- MOVE_READ | MOVE_WRITE | MOVE_ASYNC_HINT))
- list_add(&priv->inactive, &preserve);
- }
- }
-
- /* Age the current inactive pixmaps */
- sna->inactive_clock[1].next = sna->inactive_clock[0].next;
- sna->inactive_clock[0].next->prev = &sna->inactive_clock[1];
- sna->inactive_clock[0].prev->next = &sna->inactive_clock[1];
- sna->inactive_clock[1].prev = sna->inactive_clock[0].prev;
-
- sna->inactive_clock[0].next = sna->active_pixmaps.next;
- sna->active_pixmaps.next->prev = &sna->inactive_clock[0];
- sna->active_pixmaps.prev->next = &sna->inactive_clock[0];
- sna->inactive_clock[0].prev = sna->active_pixmaps.prev;
-
- sna->active_pixmaps.next = preserve.next;
- preserve.next->prev = &sna->active_pixmaps;
- preserve.prev->next = &sna->active_pixmaps;
- sna->active_pixmaps.prev = preserve.prev;
-
- if (list_is_empty(&sna->inactive_clock[1]) &&
- list_is_empty(&sna->inactive_clock[0]) &&
- list_is_empty(&sna->active_pixmaps))
- sna_accel_disarm_timer(sna, INACTIVE_TIMER);
-}
-
#ifdef DEBUG_MEMORY
static bool sna_accel_do_debug_memory(struct sna *sna)
{
@@ -14341,8 +14204,6 @@ bool sna_accel_init(ScreenPtr screen, struct sna *sna)
list_init(&sna->flush_pixmaps);
list_init(&sna->active_pixmaps);
- list_init(&sna->inactive_clock[0]);
- list_init(&sna->inactive_clock[1]);
AddGeneralSocket(sna->kgem.fd);
@@ -14529,9 +14390,6 @@ void sna_accel_block_handler(struct sna *sna, struct timeval **tv)
assert(!sna->kgem.need_expire ||
sna->timer_active & (1<<(EXPIRE_TIMER)));
- if (sna_accel_do_inactive(sna))
- sna_accel_inactive(sna);
-
if (sna_accel_do_debug_memory(sna))
sna_accel_debug_memory(sna);
More information about the xorg-commit
mailing list