rpms/kernel/devel drm-modesetting-radeon.patch,1.45,1.46

[Dave Airlie]

Author: airlied

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

Modified Files:
	drm-modesetting-radeon.patch 
Log Message:
- radeon modesetting : misc fixes - rs690, agp unload, module unload warning


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- drm-modesetting-radeon.patch	29 Oct 2008 05:48:41 -0000	1.45
+++ drm-modesetting-radeon.patch	29 Oct 2008 06:54:40 -0000	1.46
@@ -1,15 +1,27 @@
-commit 73ccb7f611c5ec18522651f30bbe5bcabd8fe777
+commit 3c57b60805cc6d8bbec85ce147fa8bbd0404cb08
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 29 15:45:47 2008 +1000
 
     radeon: disable debugging message
 
-commit e80d0aef05538b1fd374770755475fe6192dbf27
+commit ff8636f1cad7c113e028f193a375cab3fa89b754
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 29 15:37:32 2008 +1000
 
     radeon: commit ring after emitting the buffer discards
 
+commit 8b47ffa57ec22f6ccbfe26e42ae669a780b47519
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 29 17:39:27 2008 +1100
+
+    radeon: fix whitespace in encoders C file
+
+commit d0c8c7eec6c3be242773189f5efeeb79ed3551c0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 29 17:39:08 2008 +1100
+
+    radeon: add more HDMI bits
+
 commit f033476f111cadd20f347b124256e17f0d1aa7c8
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Oct 30 01:41:34 2008 +1000
@@ -25904,10 +25916,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
 new file mode 100644
-index 0000000..95cccdf
+index 0000000..46baf45
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -0,0 +1,717 @@
+@@ -0,0 +1,719 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -26173,7 +26185,9 @@
 +
 +		/* TMDS on DVI */
 +		if ((mode_info->bios_connector[i].connector_type == CONNECTOR_DVI_I) ||
-+		    (mode_info->bios_connector[i].connector_type == CONNECTOR_DVI_D)) {
++		    (mode_info->bios_connector[i].connector_type == CONNECTOR_DVI_D) ||
++		    (mode_info->bios_connector[i].connector_type == CONNECTOR_HDMI_TYPE_A) ||
++		    (mode_info->bios_connector[i].connector_type == CONNECTOR_HDMI_TYPE_B)) {
 +			if (radeon_is_avivo(dev_priv) || radeon_r4xx_atom)
 +				encoder = radeon_encoder_atom_tmds_add(dev, i, mode_info->bios_connector[i].tmds_type);
 +			else {
@@ -27548,7 +27562,7 @@
  #endif				/* __RADEON_DRV_H__ */
 diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
 new file mode 100644
-index 0000000..09c760b
+index 0000000..7800035
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_encoders.c
 @@ -0,0 +1,1107 @@
@@ -28639,7 +28653,7 @@
 +	struct drm_encoder *encoder;
 +	int analog_enc_mask = ~(ATOM_DEVICE_CRT1_SUPPORT | ATOM_DEVICE_CRT2_SUPPORT);
 +
-+		radeon_encoder = kzalloc(sizeof(struct radeon_encoder), GFP_KERNEL);
++	radeon_encoder = kzalloc(sizeof(struct radeon_encoder), GFP_KERNEL);
 +	if (!radeon_encoder) {
 +		return NULL;
 +	}