rpms/kernel/devel drm-modesetting-radeon.patch, 1.22, 1.23 kernel.spec, 1.936, 1.937

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5244

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Mon Sep 08 2008 Dave Airlie <airlied at redhat.com>
- disable VGA bashing in radeon - make text reserve larger.


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- drm-modesetting-radeon.patch	6 Sep 2008 21:39:17 -0000	1.22
+++ drm-modesetting-radeon.patch	8 Sep 2008 00:35:14 -0000	1.23
@@ -1,3 +1,21 @@
+commit 563e90db2ca306fe0dee104703a48b5bc5d7fd93
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 10:27:48 2008 +1000
+
+    radeon: disable debugging that sneaky itself on
+
+commit aa65ff0b4b4e5309a5df36886170b97780245d53
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 10:20:44 2008 +1000
+
+    radeon: make text reserve 256k
+
+commit 65e46dddb8d5626c7299b22ee775a2592cbcca1b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 10:11:27 2008 +1000
+
+    radeon: don't disable VGA bits it breaks X later
+
 commit 7111e3e07597d2eaeea9e39e22e9228458eb615b
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Sep 5 11:26:55 2008 +1000
@@ -33512,7 +33530,7 @@
  }
  
 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index 0993816..e35122e 100644
+index 0993816..c7a565c 100644
 --- a/drivers/gpu/drm/radeon/radeon_drv.h
 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
 @@ -34,6 +34,8 @@
@@ -36346,10 +36364,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
 new file mode 100644
-index 0000000..f4a0a6c
+index 0000000..12a0358
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1387 @@
+@@ -0,0 +1,1382 @@
 +/*
 + * Copyright 2008 Red Hat Inc.
 + *
@@ -37062,11 +37080,6 @@
 +	u32 mem_size, aper_size;
 +	u32 tmp;
 +
-+	/* turn off VGA IO bits */
-+	tmp = RADEON_READ(RADEON_CONFIG_CNTL);
-+	tmp |= (1 << 9);
-+	RADEON_WRITE(RADEON_CONFIG_CNTL, tmp);
-+
 +	dev_priv->mc_fb_location = radeon_read_fb_location(dev_priv);
 +	radeon_read_agp_location(dev_priv, &dev_priv->mc_agp_loc_lo, &dev_priv->mc_agp_loc_hi);
 +
@@ -37161,7 +37174,7 @@
 +	
 +	radeon_init_memory_map(dev);
 +
-+#define VRAM_RESERVE_TEXT (64*1024)
++#define VRAM_RESERVE_TEXT (256*1024) /* need to reserve 256 for text mode for now */
 +	dev_priv->mm.vram_visible -= VRAM_RESERVE_TEXT;
 +	pg_offset = VRAM_RESERVE_TEXT >> PAGE_SHIFT;
 +	drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, pg_offset, /*dev_priv->mm.vram_offset >> PAGE_SHIFT,*/


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.936
retrieving revision 1.937
diff -u -r1.936 -r1.937
--- kernel.spec	7 Sep 2008 18:01:05 -0000	1.936
+++ kernel.spec	8 Sep 2008 00:35:14 -0000	1.937
@@ -1746,6 +1746,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 08 2008 Dave Airlie <airlied at redhat.com>
+- disable VGA bashing in radeon - make text reserve larger.
+
 * Sun Sep 07 2008 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.27-rc5-git9