diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-26 15:19:14 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-26 15:20:05 +0100 |
| commit | 52d2491a1bafb979d79bb970027c55788f199acb (patch) | |
| tree | 3bb24db2aa737d839fefdf31ec1a09a6df5d83f9 /src | |
| parent | 8c0e3bbb0c301d0fa4652aa38edd84a9fd6b555e (diff) | |
sna/video: Protect against attempting to use TexturedVideo whilst wedged
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/sna_display.c | 2 | ||||
| -rw-r--r-- | src/sna/sna_video_textured.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index 37a5e9fe..a908596a 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -2419,7 +2419,7 @@ sna_covering_crtc(ScrnInfoPtr scrn, int best_coverage, c; /* If we do not own the VT, we do not own the CRTC either */ - if (!scrn->vtSema || wedged(to_sna(scrn))) + if (!scrn->vtSema) return NULL; DBG(("%s for box=(%d, %d), (%d, %d)\n", diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c index 2332ce20..27fc09f4 100644 --- a/src/sna/sna_video_textured.c +++ b/src/sna/sna_video_textured.c @@ -235,7 +235,7 @@ sna_video_textured_put_image(ScrnInfoPtr scrn, return BadAlloc; } - if (!sna_pixmap_force_to_gpu(pixmap, MOVE_READ | MOVE_WRITE)) { + if (!sna_pixmap_move_to_gpu(pixmap, MOVE_READ | MOVE_WRITE)) { DBG(("%s: attempting to render to a non-GPU pixmap\n", __FUNCTION__)); return BadAlloc; |