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

main
Dave Airlie 2008-06-06 15:38:53 +10:00
parent ec774e4d72
commit 00bb548c61
1 changed files with 5 additions and 6 deletions

View File

@ -218,7 +218,6 @@ static int intelfb_set_par(struct fb_info *info)
DRM_DEBUG("%d %d\n", var->xres, var->pixclock); DRM_DEBUG("%d %d\n", var->xres, var->pixclock);
if (var->pixclock != -1) { if (var->pixclock != -1) {
DRM_ERROR("PIXEL CLCOK SET\n"); DRM_ERROR("PIXEL CLCOK SET\n");
@ -332,10 +331,12 @@ static int intelfb_set_par(struct fb_info *info)
if (i == par->crtc_count) if (i == par->crtc_count)
continue; continue;
if (crtc->fb == intel_crtc->mode_set.fb) {
ret = crtc->funcs->set_config(&intel_crtc->mode_set); ret = crtc->funcs->set_config(&intel_crtc->mode_set);
if (ret) if (ret)
return ret; return ret;
} }
}
return 0; return 0;
} }
} }
@ -984,8 +985,6 @@ int intelfb_probe(struct drm_device *dev)
ret = intelfb_single_fb_probe(dev); ret = intelfb_single_fb_probe(dev);
} }
fail:
/* TODO */
return ret; return ret;
} }
EXPORT_SYMBOL(intelfb_probe); EXPORT_SYMBOL(intelfb_probe);