projects
/
platform
/
upstream
/
xf86-video-intel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21b6e55
)
sna/gen8: Fix cleanup after failing to convert channel
author
Chris Wilson
<chris@chris-wilson.co.uk>
Wed, 18 Jun 2014 13:48:33 +0000
(14:48 +0100)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Wed, 18 Jun 2014 13:52:45 +0000
(14:52 +0100)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
src/sna/gen8_render.c
patch
|
blob
|
history
diff --git
a/src/sna/gen8_render.c
b/src/sna/gen8_render.c
index
26a3579
..
7fd37c1
100644
(file)
--- a/
src/sna/gen8_render.c
+++ b/
src/sna/gen8_render.c
@@
-2306,7
+2306,7
@@
gen8_render_composite(struct sna *sna,
return true;
if (!gen8_composite_channel_convert(&tmp->src))
- goto cleanup_
dst
;
+ goto cleanup_
src
;
break;
}
@@
-2353,7
+2353,7
@@
gen8_render_composite(struct sna *sna,
/* fall through to fixup */
case 1:
if (!gen8_composite_channel_convert(&tmp->mask))
- goto cleanup_
src
;
+ goto cleanup_
mask
;
break;
}
}
@@
-2588,7
+2588,7
@@
gen8_render_composite_spans(struct sna *sna,
/* fall through to fixup */
case 1:
if (!gen8_composite_channel_convert(&tmp->base.src))
- goto cleanup_
dst
;
+ goto cleanup_
src
;
break;
}
tmp->base.mask.bo = NULL;