rpms/kernel/devel drm-modesetting-radeon.patch,1.67,1.68

[Dave Airlie]

Author: airlied

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

Modified Files:
	drm-modesetting-radeon.patch 
Log Message:
radeon: fix bug that snuck in


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- drm-modesetting-radeon.patch	18 Mar 2009 06:47:16 -0000	1.67
+++ drm-modesetting-radeon.patch	18 Mar 2009 07:13:54 -0000	1.68
@@ -1,3 +1,9 @@
+commit dea27f6e83efabdc3e37bc5a91d29d6dab893853
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Mar 18 17:07:07 2009 +1000
+
+    radeon: fixup encoder oops due to wrong ordering on init calls
+
 commit 4a90f1edefee2cba39d135f2866e1bacc1ac647e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Mar 19 00:16:00 2009 +1000
@@ -23851,7 +23857,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..a191644
+index 0000000..d3777a4
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_encoders.c
 @@ -0,0 +1,1743 @@
@@ -25566,12 +25572,12 @@
 +	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
 +	case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
 +		if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
-+			radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder);
 +			radeon_encoder->rmx_type = RMX_FULL;
 +			drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_LVDS);
++			radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder);
 +		} else {
-+			radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
 +			drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);
++			radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
 +		}
 +		drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);
 +		break;
@@ -25592,8 +25598,8 @@
 +	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
 +	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
 +	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
-+		radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
 +		drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);
++		radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
 +		drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);
 +		break;
 +	}