From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9ocR-0001Wg-Sd for qemu-devel@nongnu.org; Mon, 06 Jun 2016 03:06:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9ocE-0006c4-Ig for qemu-devel@nongnu.org; Mon, 06 Jun 2016 03:06:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9ocE-0006bu-CQ for qemu-devel@nongnu.org; Mon, 06 Jun 2016 03:06:26 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0B4136F699 for ; Mon, 6 Jun 2016 07:06:26 +0000 (UTC) From: Gerd Hoffmann Date: Mon, 6 Jun 2016 09:06:17 +0200 Message-Id: <1465196782-28073-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1465196782-28073-1-git-send-email-kraxel@redhat.com> References: <1465196782-28073-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 1/6] virtio-gpu: fix scanout rectangles List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , "Michael S. Tsirkin" Commit "ca58b45 ui/virtio-gpu: add and use qemu_create_displaysurface_pix= man" breaks scanouts which use a region of the underlying resource only. So, we need another way to handle the underlying issue. Lets create a new pixman image, grab a reference on the pixman providing the underlying storage, hook up a destroy callback which releases the reference. That way regions work again and releasing the backing storage should still be impossible thanks to the extra reference we are holding. Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau Message-id: 1464597655-26341-1-git-send-email-kraxel@redhat.com --- hw/display/virtio-gpu.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index f3b0f14..a836e35 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -495,6 +495,11 @@ static void virtio_gpu_resource_flush(VirtIOGPU *g, pixman_region_fini(&flush_region); } =20 +static void virtio_unref_resource(pixman_image_t *image, void *data) +{ + pixman_image_unref(data); +} + static void virtio_gpu_set_scanout(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd) { @@ -571,8 +576,15 @@ static void virtio_gpu_set_scanout(VirtIOGPU *g, !=3D ((uint8_t *)pixman_image_get_data(res->image) + offset) || scanout->width !=3D ss.r.width || scanout->height !=3D ss.r.height) { + pixman_image_t *rect; + void *ptr =3D (uint8_t *)pixman_image_get_data(res->image) + off= set; + rect =3D pixman_image_create_bits(format, ss.r.width, ss.r.heigh= t, ptr, + pixman_image_get_stride(res->ima= ge)); + pixman_image_ref(res->image); + pixman_image_set_destroy_function(rect, virtio_unref_resource, + res->image); /* realloc the surface ptr */ - scanout->ds =3D qemu_create_displaysurface_pixman(res->image); + scanout->ds =3D qemu_create_displaysurface_pixman(rect); if (!scanout->ds) { cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; return; --=20 1.8.3.1