rpms/kernel/F-11 drm-modesetting-radeon.patch, 1.74, 1.75 kernel.spec, 1.1549, 1.1550

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30056

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com>
- radeon drm: fix rv410 ddc + add another agp test hook


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- drm-modesetting-radeon.patch	15 Apr 2009 06:36:55 -0000	1.74
+++ drm-modesetting-radeon.patch	17 Apr 2009 01:36:01 -0000	1.75
@@ -1,3 +1,31 @@
+commit 4fb1fe8e8696cd2fd7485ebf3fa01c0ac491a6ae
+Merge: 18efcb5 37267b0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 17 11:05:43 2009 +1000
+
+    Merge remote branch 'origin/drm-rawhide' into drm-f11
+
+commit 37267b0eab798dbdb336470ba3fbe05269665acc
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 17 10:50:48 2009 +1000
+
+    radeon: add yet another test hook for agp
+
+commit 80a878ea6be30bcd9a48d9b825f0bc5f42a6f31f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 17 10:45:51 2009 +1000
+
+    radeon: r3xx/r4xx hw i2c engine ties up lines when in reset
+    
+    When the hw offload engine is in reset, it ties up the DDC
+    lines on certain chips
+
+commit 19f4dc490ab0417a28c100012bdd8d3633fd42a7
+Author: Adam Jackson <ajax at redhat.com>
+Date:   Fri Apr 17 08:41:09 2009 +1000
+
+    radeon: fix panel mode name
+
 commit 18efcb54320d301dc356647a8fc2a2d308d8ef46
 Merge: e9777f8 1d8fea4
 Author: Dave Airlie <airlied at redhat.com>
@@ -1973,7 +2001,7 @@
  int __read_mostly pat_enabled = 1;
 +EXPORT_SYMBOL_GPL(pat_enabled);
  
- void __cpuinit pat_disable(char *reason)
+ void __cpuinit pat_disable(const char *reason)
  {
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
 index 3a22eb9..a74980b 100644
@@ -16782,10 +16810,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_buffer.c b/drivers/gpu/drm/radeon/radeon_buffer.c
 new file mode 100644
-index 0000000..8b360e0
+index 0000000..7f3b75a
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_buffer.c
-@@ -0,0 +1,469 @@
+@@ -0,0 +1,471 @@
 +/**************************************************************************
 + * 
 + * Copyright 2007 Dave Airlie
@@ -16888,6 +16916,8 @@
 +			man->io_addr = NULL;
 +			man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
 +				_DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP;
++			if (radeon_no_gart_wb == 2)
++				man->flags |= _DRM_FLAG_MEMTYPE_CMA;
 +			man->drm_bus_maptype = _DRM_AGP;
 +		} else {
 +			man->io_offset = dev_priv->gart_vm_start;
@@ -19030,7 +19060,7 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
 new file mode 100644
-index 0000000..d45bd6c
+index 0000000..cd3acf0
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
 @@ -0,0 +1,608 @@
@@ -19155,9 +19185,9 @@
 +		mode->flags = 0;
 +
 +		mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER;
++		drm_mode_set_name(mode);
 +
-+		DRM_DEBUG("Adding native panel mode %dx%d\n",
-+			  native_mode->panel_xres, native_mode->panel_yres);
++		DRM_DEBUG("Adding native panel mode %s\n", mode->name);
 +	}
 +	return mode;
 +}
@@ -28918,10 +28948,10 @@
 +#endif
 diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
 new file mode 100644
-index 0000000..1cd47bc
+index 0000000..042eb09
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_i2c.c
-@@ -0,0 +1,195 @@
+@@ -0,0 +1,205 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -28989,6 +29019,16 @@
 +	uint32_t temp;
 +	struct radeon_i2c_bus_rec *rec = &radeon_connector->ddc_bus->rec;
 +
++	/*
++ 	 * on certain r3xx/rv4xx the hw i2c block appears to hold the
++	 * gpio lines in reset, select different gpios to avoid this
++	 */
++	if (radeon_is_r300(dev_priv)) {
++		if (rec->a_clk_reg == RADEON_GPIO_VGA_DDC)
++			RADEON_WRITE(RADEON_DVI_I2C_CNTL_0, 0x30);
++		else
++			RADEON_WRITE(RADEON_DVI_I2C_CNTL_0, 0x20);
++	}
 +	if (lock_state) {
 +		temp = RADEON_READ(rec->a_clk_reg);
 +		temp &= ~(rec->a_clk_mask);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1549
retrieving revision 1.1550
diff -u -r1.1549 -r1.1550
--- kernel.spec	16 Apr 2009 20:58:51 -0000	1.1549
+++ kernel.spec	17 Apr 2009 01:36:01 -0000	1.1550
@@ -1971,6 +1971,9 @@
 # and build.
 
 %changelog
+* Fri Apr 17 2009 Dave Airlie <airlied at redhat.com>
+- radeon drm: fix rv410 ddc + add another agp test hook
+
 * Thu Apr 16 2009 Adam Jackson <ajax at redhat.com>
 - radeon drm: Be sure to set a name for LVDS panel modes.