summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2008-06-06 15:38:53 +1000
committerDave Airlie <airlied@linux.ie>2008-06-06 15:38:53 +1000
commit00bb548c6129ee712742d0e893aaa50fc65e49fc (patch)
treeb7e69f53ffa016b3fc06bfc0ecaee4340ea75287
parentec774e4d7201cf875a48cd2fb799e8e5b7f30cc8 (diff)
intel: don't set the mode on the framebuffer if isn't set to scanout our framebuffer
-rw-r--r--linux-core/intel_fb.c11
1 files changed, 5 insertions, 6 deletions
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);