rpms/kernel/F-11 drm-intel-lying-systems-without-lvds.patch, 1.2, 1.3

[Jarod Wilson]

Author: jwilson

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

Modified Files:
	drm-intel-lying-systems-without-lvds.patch 
Log Message:
put in the right version of the patch this time

drm-intel-lying-systems-without-lvds.patch:

Index: drm-intel-lying-systems-without-lvds.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-intel-lying-systems-without-lvds.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drm-intel-lying-systems-without-lvds.patch	3 Apr 2009 19:48:24 -0000	1.2
+++ drm-intel-lying-systems-without-lvds.patch	3 Apr 2009 20:56:02 -0000	1.3
@@ -16,24 +16,23 @@
 Signed-off-by: Jarod Wilson <jarod at redhat.com>
 
 ---
- drivers/gpu/drm/i915/intel_lvds.c |   50 ++++++++++++++++++++++++++++++------
- 1 files changed, 41 insertions(+), 9 deletions(-)
+ drivers/gpu/drm/i915/intel_lvds.c |   46 ++++++++++++++++++++++++++++++------
+ 1 files changed, 38 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
-index 6619f26..4607662 100644
+index 6619f26..4d64686 100644
 --- a/drivers/gpu/drm/i915/intel_lvds.c
 +++ b/drivers/gpu/drm/i915/intel_lvds.c
-@@ -384,7 +384,44 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = {
+@@ -384,7 +384,43 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = {
  	.destroy = intel_lvds_enc_destroy,
  };
  
 +static int __init intel_no_lvds_dmi_callback(const struct dmi_system_id *id)
 +{
-+	//DRM_DEBUG("Skipping LVDS initialization for %s\n", id->ident);
-+	printk("Skipping LVDS initialization for %s\n", id->ident);
++	DRM_DEBUG("Skipping LVDS initialization for %s\n", id->ident);
 +	return 1;
 +}
-+
+ 
 +/* These systems claim to have LVDS, but really don't */
 +static const struct dmi_system_id __initdata intel_no_lvds[] = {
 +	{
@@ -62,13 +61,13 @@
 +	},
 +
 +	/* FIXME: add a check for the Aopen Mini PC */
- 
++
 +	{ }	/* terminating entry */
 +};
  
  /**
   * intel_lvds_init - setup LVDS connectors on this device
-@@ -404,15 +441,10 @@ void intel_lvds_init(struct drm_device *dev)
+@@ -404,15 +440,9 @@ void intel_lvds_init(struct drm_device *dev)
  	u32 lvds;
  	int pipe;
  
@@ -79,12 +78,10 @@
 -	if(dmi_match(DMI_PRODUCT_NAME, "Macmini1,1") ||
 -	   dmi_match(DMI_PRODUCT_NAME, "Macmini2,1")) {
 -		DRM_DEBUG("Skipping LVDS initialization for Apple Mac Mini\n");
--		return;
--	}
 +	/* Skip init on machines we know falsely report LVDS */
 +	if (dmi_check_system(intel_no_lvds))
-+		printk("woulda disabled bogus lvds, but it fucks up Xv...\n");
-+		//return;
+ 		return;
+-	}
  
  	intel_output = kzalloc(sizeof(struct intel_output), GFP_KERNEL);
  	if (!intel_output) {