summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/sna/sna_display.c2
-rw-r--r--src/sna/sna_video_textured.c2
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;