From: Dave Airlie <airlied@linux.ie>
Date: Fri, 6 Jun 2008 05:38:53 +0000 (+1000)
Subject: intel: don't set the mode on the framebuffer if isn't set to scanout our framebuffer
X-Git-Tag: android-x86-1.6~141^2~139
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=00bb548c6129ee712742d0e893aaa50fc65e49fc;p=android-x86%2Fexternal-libdrm.git

intel: don't set the mode on the framebuffer if isn't set to scanout our framebuffer
---

diff --git a/linux-core/intel_fb.c b/linux-core/intel_fb.c
index 85a173e1..856ec868 100644
--- a/linux-core/intel_fb.c
+++ b/linux-core/intel_fb.c
@@ -218,7 +218,6 @@ static int intelfb_set_par(struct fb_info *info)
 
 	DRM_DEBUG("%d %d\n", var->xres, var->pixclock);
 
-
 	if (var->pixclock != -1) {
 
 		DRM_ERROR("PIXEL CLCOK SET\n");
@@ -332,9 +331,11 @@ static int intelfb_set_par(struct fb_info *info)
 			if (i == par->crtc_count)
 				continue;
 
-			ret = crtc->funcs->set_config(&intel_crtc->mode_set);
-			if (ret)
-				return ret;
+			if (crtc->fb == intel_crtc->mode_set.fb) {
+				ret = crtc->funcs->set_config(&intel_crtc->mode_set);
+				if (ret)
+					return ret;
+			}
 		}
 		return 0;
 	}
@@ -984,8 +985,6 @@ int intelfb_probe(struct drm_device *dev)
 		ret = intelfb_single_fb_probe(dev);
 	}
 
-fail:
-	/*  TODO */
 	return ret;
 }
 EXPORT_SYMBOL(intelfb_probe);