diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-06 15:10:22 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-06 16:03:15 +0100 |
| commit | 5aaab9ea0310d48bb1a1ca20308d1c9721a9de3f (patch) | |
| tree | 7031a3d5befbe43ad2fb24fabed030103dd2a5bc /src | |
| parent | 8751c0f5ad202850bdd56dbb4eedb211c023cf23 (diff) | |
sna: Relax assertion that the source of the cloned pixmap cannot be mapped
I was being overzealous at the time of making the COW and trying to be
sure that we would never write through a mapping. Then I started to
allow clones to be mapped (for reads) and missed relaxing this assertion.
Reported-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/sna_accel.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 010f6e43..da1ca409 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -1729,13 +1729,7 @@ sna_pixmap_make_cow(struct sna *sna, src_priv->cow = MAKE_COW_OWNER(cow); list_init(&src_priv->cow_list); - - if (src_priv->mapped) { - src_priv->pixmap->devPrivate.ptr = NULL; - src_priv->mapped = false; - } } - assert(!src_priv->mapped); if (cow == COW(dst_priv->cow)) { assert(dst_priv->gpu_bo == cow->bo); |