Re: 2.6.23(.1) Regression? i915 oopses and panics

["Dave Airlie" <airlied@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 607 bytes --]

On 10/14/07, Thomas Bächler <thomas@archlinux.org> wrote:
> Dave Airlie schrieb:
> > lets start with:
> > http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=e4a7b1d1d90d202a030688ab5b177c3c0f15ee3e
> >
> > and work from there..
>
> I'm sorry, I forgot to mention that: As I _thought_ it had worked with
> rc6, I already found that commit. I reverted it and got a panic again
> (no trace, as I was in X), so this one doesn't seem to cause the problem.
>

Okay I've spotted a potential bug that might lay hidden, try the
attached patch to see if it helps..

Dave.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-i915-fix-vbl-swap-allocation-size.patch --]
[-- Type: text/x-patch; name="0001-i915-fix-vbl-swap-allocation-size.patch", Size: 827 bytes --]

From 7c63ae4527355d8f52dc285a9163a5947a61572e Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@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@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 bb8e9e9..94d638e 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -553,7 +553,7 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
 		return DRM_ERR(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