eda054e8bd
Comment out merged patches: aio-check-for-multiplication-overflow-in-do_io_submit.patch linux-2.6.35.4-virtio_console-fix-poll.patch fix-unprotected-access-to-task-credentials-in-whatid.patch dell-wmi-add-support-for-eject-key-studio-1555.patch irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch keys-fix-bug-in-keyctl_session_to_parent-if-parent-has-no-session-keyring.patch keys-fix-rcu-no-lock-warning-in-keyctl_session_to_parent.patch sched-00-fix-user-time-incorrectly-accounted-as-system-time-on-32-bit.patch Revert: "drm/nv50: initialize ramht_refs list for faked 0 channel" (our DRM update removes ramht_refs entirely.)
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 615661f3948a066fd22a36fe8ea0c528b75ee373 Mon Sep 17 00:00:00 2001
|
|
From: Marcin Slusarz <marcin.slusarz@gmail.com>
|
|
Date: Sun, 22 Aug 2010 20:54:08 +0200
|
|
Subject: drm/nv50: initialize ramht_refs list for faked 0 channel
|
|
|
|
From: Marcin Slusarz <marcin.slusarz@gmail.com>
|
|
|
|
commit 615661f3948a066fd22a36fe8ea0c528b75ee373 upstream.
|
|
|
|
We need it for PFIFO_INTR_CACHE_ERROR interrupt handling,
|
|
because nouveau_fifo_swmthd looks for matching gpuobj in
|
|
ramht_refs list.
|
|
It fixes kernel panic in nouveau_gpuobj_ref_find.
|
|
|
|
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
|
|
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
|
|
---
|
|
drivers/gpu/drm/nouveau/nv50_instmem.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/nouveau/nv50_instmem.c
|
|
+++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
|
|
@@ -141,6 +141,8 @@ nv50_instmem_init(struct drm_device *dev
|
|
chan->file_priv = (struct drm_file *)-2;
|
|
dev_priv->fifos[0] = dev_priv->fifos[127] = chan;
|
|
|
|
+ INIT_LIST_HEAD(&chan->ramht_refs);
|
|
+
|
|
/* Channel's PRAMIN object + heap */
|
|
ret = nouveau_gpuobj_new_fake(dev, 0, c_offset, c_size, 0,
|
|
NULL, &chan->ramin);
|