rpms/kernel/devel linux-2.6-drm-radeon-fix-oops.patch, NONE, 1.1 kernel.spec, 1.559, 1.560

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27941

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-drm-radeon-fix-oops.patch 
Log Message:
* Mon Mar 31 2008 Dave Airlie <airlied at redhat.com> 
- add fix for radeon oops (#439656)


linux-2.6-drm-radeon-fix-oops.patch:

--- NEW FILE linux-2.6-drm-radeon-fix-oops.patch ---
diff -up linux-2.6.24.noarch/drivers/char/drm/radeon_state.c.da linux-2.6.24.noarch/drivers/char/drm/radeon_state.c
--- linux-2.6.24.noarch/drivers/char/drm/radeon_state.c.da	2008-03-31 11:28:35.000000000 +1000
+++ linux-2.6.24.noarch/drivers/char/drm/radeon_state.c	2008-03-31 11:28:48.000000000 +1000
@@ -3088,7 +3088,8 @@ static int radeon_cp_setparam(struct drm
 			dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
 		break;
 	case RADEON_SETPARAM_VBLANK_CRTC:
-		return radeon_vblank_crtc_set(dev, sp->value);
+		if (dev_priv)
+			return radeon_vblank_crtc_set(dev, sp->value);
 		break;
 	default:
 		DRM_DEBUG("Invalid parameter %d\n", sp->param);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -r1.559 -r1.560
--- kernel.spec	29 Mar 2008 19:03:01 -0000	1.559
+++ kernel.spec	31 Mar 2008 01:31:26 -0000	1.560
@@ -619,6 +619,7 @@
 Patch1801: linux-2.6-drm-git-mm.patch
 Patch1803: nouveau-drm.patch
 Patch1806: linux-2.6-drm-i915-modeset.patch
+Patch1807: linux-2.6-drm-radeon-fix-oops.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1126,6 +1127,7 @@
 ApplyPatch linux-2.6-drm-git-mm.patch
 ApplyPatch nouveau-drm.patch
 ApplyPatch linux-2.6-drm-i915-modeset.patch
+ApplyPatch linux-2.6-drm-radeon-fix-oops.patch
 
 # ext4dev stable patch queue, slated for 2.6.25
 #ApplyPatch linux-2.6-ext4-stable-queue.patch
@@ -1735,6 +1737,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Mon Mar 31 2008 Dave Airlie <airlied at redhat.com> 
+- add fix for radeon oops (#439656)
+
 * Sat Mar 29 2008 Dave Jones <davej at redhat.com>
 - Add a 'would have oomkilled' sysctl for debugging.