Oops, when merging the extra details following an OOM, I missed that
driver_private is now NULL and the correct way to convert from the
drm_gem_object into the drm_i915_gem_object is to use to_intel_bo().
BUG: unable to handle kernel NULL pointer dereference at 0069
IP: [c11a4a02] i915_gem_do_execbuffer+0x71f/0xbb6
*pde =
Oops: [#1] SMP
last sysfs file: /sys/devices/virtual/vc/vcsa3/uevent
Pid: 10993, comm: X Not tainted 2.6.35-rc2+ #67 /
EIP: 0060:[c11a4a02] EFLAGS: 00213202 CPU: 0
EIP is at i915_gem_do_execbuffer+0x71f/0xbb6
EAX: f647e8a8 EBX: ECX: 0003 EDX:
ESI: 00424000 EDI: EBP: f6508e48 ESP: f6508dd4
DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
Process X (pid: 10993, ti=f6508000 task=f6432880 task.ti=f6508000)
Stack:
f6508de0 f713 0001 f647e8a8 f64f8480
0 f7974414 0006 f6578000 0008 0006
0 f6797880 0040 ffe4 f7974400 00d0 00d0 01c0
Call Trace:
[c11a4f3a] ? i915_gem_execbuffer2+0xa1/0xe7
[c118ab96] ? drm_ioctl+0x22c/0x2fa
[c11a4e99] ? i915_gem_execbuffer2+0x0/0xe7
[c107e88c] ? do_sync_read+0x8f/0xca
[c1088cbd] ? vfs_ioctl+0x2c/0x96
[c118a96a] ? drm_ioctl+0x0/0x2fa
[c10891f4] ? do_vfs_ioctl+0x429/0x45a
[c107e5c9] ? fsnotify_access+0x54/0x5f
[c107ee1c] ? vfs_read+0x9a/0xae
[c1089258] ? sys_ioctl+0x33/0x4d
[c1002610] ? sysenter_do_call+0x12/0x26
Code: d0 89 4d c4 31 c9 89 45 d8 eb 44 8b 45 cc 8b 14 88 8b 42 50 89 45
bc 8b 45 a0 8b 52 38 89 55 d0 31 d2 f6 40 20 01 74 0d 8b 55 bc f6 42
69 30 0f 95 c2 0f b6 d2 8b 45 d0 c7 45 d4 00 00 00 00 89
EIP: [c11a4a02] i915_gem_do_execbuffer+0x71f/0xbb6 SS:ESP 0068:f6508dd4
CR2: 0069
---[ end trace 3f1d514b34d39381 ]---
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
---
drivers/gpu/drm/i915/i915_gem.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 0cf9584..781bd09 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3665,6 +3665,7 @@ i915_gem_wait_for_pending_flip(struct drm_device *dev,
return ret;
}
+
int
i915_gem_do_execbuffer(struct drm_device *dev, void *data,
struct drm_file *file_priv,
@@ -3812,7 +3813,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
unsigned long long total_size = 0;
int num_fences = 0;
for (i = 0; i args-buffer_count; i++) {
- obj_priv =
object_list[i]-driver_private;
+ obj_priv = to_intel_bo(object_list[i]);
total_size += object_list[i]-size;
num_fences +=
--
1.7.1
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
