xf86-video-intel: src/sna/kgem.c src/sna/sna_dri2.c
Chris Wilson
ickle at kemper.freedesktop.org
Wed Jun 24 03:04:09 PDT 2015
src/sna/kgem.c | 8 ++++----
src/sna/sna_dri2.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit f414ed4e40292e91e9c6850fb01a26334e6b43c7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Jun 24 11:02:28 2015 +0100
sna: Fix misspelling of "caching"
Apply s/cacheing/caching/ because I am alone in my belief of how to
spell cacheing correctly :)
Suggested-by: Sedat Dilek <sedat.dilek at gmail.com>
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 0178df7..68f3128 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -295,7 +295,7 @@ static void assert_tiling(struct kgem *kgem, struct kgem_bo *bo)
assert(tiling.tiling_mode == bo->tiling);
}
-static void assert_cacheing(struct kgem *kgem, struct kgem_bo *bo)
+static void assert_caching(struct kgem *kgem, struct kgem_bo *bo)
{
struct local_i915_gem_caching arg;
int expect = kgem->has_llc ? SNOOPED : UNCACHED;
@@ -321,7 +321,7 @@ static void assert_bo_retired(struct kgem_bo *bo)
}
#else
#define assert_tiling(kgem, bo)
-#define assert_cacheing(kgem, bo)
+#define assert_caching(kgem, bo)
#define assert_bo_retired(bo)
#endif
@@ -2452,7 +2452,7 @@ inline static void kgem_bo_move_to_inactive(struct kgem *kgem,
assert(!bo->delta);
assert(list_is_empty(&bo->vma));
assert_tiling(kgem, bo);
- assert_cacheing(kgem, bo);
+ assert_caching(kgem, bo);
ASSERT_IDLE(kgem, bo->handle);
if (bucket(bo) >= NUM_CACHE_BUCKETS) {
@@ -2838,7 +2838,7 @@ static void __kgem_bo_destroy(struct kgem *kgem, struct kgem_bo *bo)
assert(bo->snoop == false);
assert(bo->io == false);
assert(bo->scanout == false);
- assert_cacheing(kgem, bo);
+ assert_caching(kgem, bo);
kgem_bo_undo(kgem, bo);
assert(bo->refcnt == 0);
diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 5d0492a..54acdbf 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -242,7 +242,7 @@ sna_dri2_cache_bo(struct sna *sna,
if (!c)
goto err;
- DBG(("%s: cacheing handle=%d (name=%d, flags=%d, active_scanout=%d)\n", __FUNCTION__, bo->handle, name, flags, bo->active_scanout));
+ DBG(("%s: caching handle=%d (name=%d, flags=%d, active_scanout=%d)\n", __FUNCTION__, bo->handle, name, flags, bo->active_scanout));
c->bo = bo;
c->name = name;
@@ -347,7 +347,7 @@ sna_dri2_get_back(struct sna *sna,
c->name = back->name;
c->flags = back->flags;
list_add(&c->link, &priv->cache);
- DBG(("%s: cacheing handle=%d (name=%d, flags=%d, active_scanout=%d)\n", __FUNCTION__, c->bo->handle, c->name, c->flags, c->bo->active_scanout));
+ DBG(("%s: caching handle=%d (name=%d, flags=%d, active_scanout=%d)\n", __FUNCTION__, c->bo->handle, c->name, c->flags, c->bo->active_scanout));
}
} else {
if (&c->link != &priv->cache)
More information about the xorg-commit
mailing list