summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_fb.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-06-06 18:59:41 +1000
committerDave Airlie <airlied@redhat.com>2010-06-08 09:31:16 +1000
commita3524f1b27671eda909cde37da9caff41133b272 (patch)
treecbad6f7fa8408ad0d26d706ae92d5adfcfcccec4 /drivers/gpu/drm/i915/intel_fb.c
parent386f40c86d6c8d5b717ef20620af1a750d0dacb4 (diff)
downloadop-kernel-dev-a3524f1b27671eda909cde37da9caff41133b272.zip
op-kernel-dev-a3524f1b27671eda909cde37da9caff41133b272.tar.gz
drm/i915: fix oops on single crtc devices.
(regression fix since fbdev/kms rework). My fb rework didn't remember about the 84/65s. Reported-by: Ondrej Zary <linux@rainbow-software.org> Tested-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fb.c')
-rw-r--r--drivers/gpu/drm/i915/intel_fb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index f8c76e6..dfbb0c6 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -253,7 +253,7 @@ int intel_fbdev_init(struct drm_device *dev)
dev_priv->fbdev = ifbdev;
ifbdev->helper.funcs = &intel_fb_helper_funcs;
- drm_fb_helper_init(dev, &ifbdev->helper, 2,
+ drm_fb_helper_init(dev, &ifbdev->helper, dev_priv->num_pipe,
INTELFB_CONN_LIMIT);
drm_fb_helper_single_add_all_connectors(&ifbdev->helper);
OpenPOWER on IntegriCloud