summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-07-21 13:01:09 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-07-21 13:01:09 +0100
commit37dfdb0e9e86effc3ca8b590c98aa2382e8f0cea (patch)
tree54bb47e0fefdbbb729fcbce8fea312ae085e0471
parent83ad661bc73e9d0094b669c5203e25afc3937bb7 (diff)
sna: Correct assertion for __kgem_bo_size()
Only proxies are measured in bytes not pages. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/kgem.c2
-rw-r--r--src/sna/kgem.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 3853379c..dbe64233 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -127,7 +127,7 @@ static struct drm_i915_gem_exec_object2 _kgem_dummy_exec;
static inline int bytes(struct kgem_bo *bo)
{
- return kgem_bo_size(bo);
+ return __kgem_bo_size(bo);
}
#define bucket(B) (B)->size.pages.bucket
diff --git a/src/sna/kgem.h b/src/sna/kgem.h
index f1ded245..7b388fbb 100644
--- a/src/sna/kgem.h
+++ b/src/sna/kgem.h
@@ -423,7 +423,7 @@ static inline int __kgem_buffer_size(struct kgem_bo *bo)
static inline int __kgem_bo_size(struct kgem_bo *bo)
{
- assert(!(bo->proxy && bo->io));
+ assert(bo->proxy == NULL);
return PAGE_SIZE * bo->size.pages.count;
}