rpms/kernel/F-8 linux-2.6-drm-fix-i915-allocation.patch, NONE, 1.1 kernel.spec, 1.223, 1.224

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15479

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-drm-fix-i915-allocation.patch 
Log Message:
* Tue Oct 16 2007 Dave Airlie <airlied at redhat.com>
- fix i915 drm memory allocation issue


linux-2.6-drm-fix-i915-allocation.patch:

--- NEW FILE linux-2.6-drm-fix-i915-allocation.patch ---
>From 54583bf4efda79388fc13163e35c016c8bc5de81 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Sun, 14 Oct 2007 21:21:30 +1000
Subject: [PATCH] i915: fix vbl swap allocation size.

Oops...

Signed-off-by: Dave Airlie <airlied at linux.ie>
---
 drivers/char/drm/i915_irq.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index 380c3f3..a443f4a 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -540,7 +540,7 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
 		return -EBUSY;
 	}
 
-	vbl_swap = drm_calloc(1, sizeof(vbl_swap), DRM_MEM_DRIVER);
+	vbl_swap = drm_calloc(1, sizeof(*vbl_swap), DRM_MEM_DRIVER);
 
 	if (!vbl_swap) {
 		DRM_ERROR("Failed to allocate memory to queue swap\n");
-- 
1.5.2.4



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- kernel.spec	15 Oct 2007 21:39:45 -0000	1.223
+++ kernel.spec	16 Oct 2007 00:15:21 -0000	1.224
@@ -684,6 +684,8 @@
 #nouveau + drm fixes
 Patch1800: drm-mm-git.patch
 Patch1801: nouveau-drm.patch
+Patch1802: linux-2.6-drm-fix-i915-allocation.patch
+
 # Fix lockdep bug in firewire.
 Patch1900: linux-2.6-firewire-lockdep.patch
 # Work around E1000 corrupt EEPROM problem.
@@ -1014,6 +1016,7 @@
 # Nouveau DRM + drm fixes
 ApplyPatch drm-mm-git.patch
 ApplyPatch nouveau-drm.patch
+ApplyPatch linux-2.6-drm-fix-i915-allocation.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
@@ -1837,6 +1840,9 @@
 
 
 %changelog
+* Tue Oct 16 2007 Dave Airlie <airlied at redhat.com>
+- fix i915 drm memory allocation issue
+
 * Mon Oct 15 2007 Jeremy Katz <katzj at redhat.com>
 - fix thinkpad key events for volume/brightness