diff options
| author | Dave Barnish <dave.barnish@arm.com> | 2014-07-16 10:57:28 +0100 |
|---|---|---|
| committer | Dave Barnish <dave.barnish@arm.com> | 2014-07-16 10:57:28 +0100 |
| commit | 0abde2d6003b4245c1234a35d79d4ef3db0c8224 (patch) | |
| tree | c00d333d87061d55ae8e6725d150986254dcfd2e | |
| parent | bbb82b80b47b52763fa8a58b68e2d9689d68cd71 (diff) | |
Removed bad assert
In ModifyPixmapHeader we were asserting that a scratch pixmap's bo
does not have a dmabuf. We neglected to check whether the scratch
pixmap has a bo. If it doesn't this assert caused a segfault.
Change-Id: I9f2eee88f69e9d7c20a3506e618b3eadce716c2a
| -rw-r--r-- | src/armsoc_exa.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/armsoc_exa.c b/src/armsoc_exa.c index a578a27..87f28e1 100644 --- a/src/armsoc_exa.c +++ b/src/armsoc_exa.c @@ -173,11 +173,7 @@ ARMSOCModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, if (pPixData && pPixData != armsoc_bo_map(pARMSOC->scanout)) { /* scratch-pixmap (see GetScratchPixmapHeader()) gets recycled, * so could have a previous bo! - */ - - /* scratch pixmap should not have a dmabuf */ - assert(!armsoc_bo_has_dmabuf(priv->bo)); - /* Pixmap drops ref on its old bo */ + * Pixmap drops ref on its old bo */ armsoc_bo_unreference(priv->bo); priv->bo = NULL; |