From 113a8b9be9dd7ffbc6f7c713bc40561bdf38e8b0 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 19 Jun 2014 20:39:59 +0100 Subject: [PATCH] sna: Mark upload from SHM segment as read-only As this may be mapped by the Xserver using a read-only SHM segment, we are forced to treat it always as read-only. And this being X, that it is using a SHM segment is opaque to the driver. Fantastic middlelayer. This was incorrectly removed in commit e680e54eab6ffa72e5e1eb6cc0e3fe4b235b06a1 Author: Chris Wilson Date: Wed Jun 11 10:48:26 2014 +0100 sna: Ignore setting read-only for temporary userptr maps Also let's not forget the ShmPutImage -> CopyArea path. Reported-by: Christoph Haag Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=78411 Signed-off-by: Chris Wilson --- src/sna/sna_accel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index e53f1b8b..d77f4c9a 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -6368,7 +6368,7 @@ discard_cow: src_bo = kgem_create_map(&sna->kgem, src_pixmap->devPrivate.ptr, src_pixmap->devKind * src_pixmap->drawable.height, - false); + true); if (src_bo) { src_bo->pitch = src_pixmap->devKind; kgem_bo_mark_unreusable(src_bo);