Attachment 579279 Details for Bug 815076 – removing the pre-oom update_area io exits

[patch] removing the pre-oom update_area io exits

0001-do-not-call-update_area-for-each-alloc-that-initiall.patch (text/plain), 3.04 KB, created by Yonit Halperin on 2012-04-22 11:46:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yonit Halperin

Created: 2012-04-22 11:46:50 UTC

Size: 3.04 KB

patch

obsolete

>From 843b58c261841aa1642d410d8038e8400dd4589a Mon Sep 17 00:00:00 2001
>From: Yonit Halperin <yhalperi@redhat.com>
>Date: Sun, 22 Apr 2012 13:31:13 +0300
>Subject: [PATCH] do not call update_area for each alloc that initially fails
>
>---
> ...-update-primary-surface-when-memory-is-mi.patch |   37 ++++++++++++++++++++
> xorg-x11-drv-qxl.spec                              |    4 ++-
> 2 files changed, 40 insertions(+), 1 deletions(-)
> create mode 100644 0001-do-not-call-update-primary-surface-when-memory-is-mi.patch
>
>diff --git a/0001-do-not-call-update-primary-surface-when-memory-is-mi.patch b/0001-do-not-call-update-primary-surface-when-memory-is-mi.patch
>new file mode 100644
>index 0000000..97b26a1
>--- /dev/null
>+++ b/0001-do-not-call-update-primary-surface-when-memory-is-mi.patch
>@@ -0,0 +1,37 @@
>+From 4560f357c01e9048f68ab0d8c86a7581eeb1bc29 Mon Sep 17 00:00:00 2001
>+From: Yonit Halperin <yhalperi@redhat.com>
>+Date: Sun, 22 Apr 2012 13:26:21 +0300
>+Subject: [PATCH] do not call update primary surface when memory is missing
>+
>+---
>+ src/qxl_driver.c |   14 --------------
>+ 1 files changed, 0 insertions(+), 14 deletions(-)
>+
>+diff --git a/src/qxl_driver.c b/src/qxl_driver.c
>+index cce0597..bbc8cfc 100644
>+--- a/src/qxl_driver.c
>++++ b/src/qxl_driver.c
>+@@ -170,20 +170,6 @@ qxl_allocnf (qxl_screen_t *qxl, unsigned long size)
>+     
>+     while (!(result = qxl_alloc (qxl->mem, size)))
>+     {
>+-	struct QXLRam *ram_header = (void *)(
>+-	    (unsigned long)qxl->ram + qxl->rom->ram_header_offset);
>+-    
>+-	/* Rather than go out of memory, we simply tell the
>+-	 * device to dump everything
>+-	 */
>+-	ram_header->update_area.top = 0;
>+-	ram_header->update_area.bottom = qxl->virtual_y;
>+-	ram_header->update_area.left = 0;
>+-	ram_header->update_area.right = qxl->virtual_x;
>+-	ram_header->update_surface = 0;		/* Only primary for now */
>+-	
>+-	outb (qxl->io_base + QXL_IO_UPDATE_AREA, 0);
>+-	
>+ #if 0
>+  	ErrorF ("eliminated memory (%d)\n", nth_oom++);
>+ #endif
>+-- 
>+1.7.7.6
>+
>diff --git a/xorg-x11-drv-qxl.spec b/xorg-x11-drv-qxl.spec
>index 4bc1641..2107a10 100644
>--- a/xorg-x11-drv-qxl.spec
>+++ b/xorg-x11-drv-qxl.spec
>@@ -7,7 +7,7 @@
> Summary:   Xorg X11 qxl video driver
> Name:      xorg-x11-drv-qxl
> Version:   0.0.14
>-Release:   15%{?dist}
>+Release:   16%{?dist}
> URL:       http://www.x.org
> Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
> Source1:   qxl.xinf
>@@ -29,6 +29,7 @@ Patch11: 0011-Enable-caching-of-images-based-on-the-configuration-.patch
> Patch12: 0012-options-Turn-surfaces-and-caching-on-by-default.patch
> Patch13: 0001-murmur.patch
> Patch14: 0001-do-not-hash-if-cache-is-disabled.patch
>+Patch15: 0001-do-not-call-update-primary-surface-when-memory-is-mi.patch
> 
> ExclusiveArch: %{ix86} x86_64
> 
>@@ -62,6 +63,7 @@ SPICE protocol.
> %patch12 -p1 -b .0012-options-Turn-surfaces-and-caching-on-by-default.patch
> %patch13 -p1 -b .0001-murmur.patch
> %patch14 -p1 -b .0001-do-not-hash-if-cache-is-disabled.patch
>+%patch15 -p1 -b .0001-do-not-call-update-primary-surface-when-memory-is-mi.patch
> 
> %build
> aclocal -I .
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 815076: 579279