drm/i915: Error out if we are trying to use VGA with SPLL already in use

[cascardo/linux.git] / drivers / gpu / drm / i915 / intel_fb.c

diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index 981bdce..f203418 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -150,8 +150,6 @@ static int intelfb_create(struct drm_fb_helper *helper,
        }
        info->screen_size = size;
 
-//     memset(info->screen_base, 0, size);
-
        drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
        drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height);
 
@@ -227,7 +225,7 @@ int intel_fbdev_init(struct drm_device *dev)
        ifbdev->helper.funcs = &intel_fb_helper_funcs;
 
        ret = drm_fb_helper_init(dev, &ifbdev->helper,
-                                dev_priv->num_pipe,
+                                INTEL_INFO(dev)->num_pipes,
                                 INTELFB_CONN_LIMIT);
        if (ret) {
                kfree(ifbdev);