|
@@ -1989,13 +1989,13 @@ static void drm_setup_crtcs(struct drm_fb_helper *fb_helper)
|
|
|
width = dev->mode_config.max_width;
|
|
|
height = dev->mode_config.max_height;
|
|
|
|
|
|
- crtcs = kcalloc(dev->mode_config.num_connector,
|
|
|
+ crtcs = kcalloc(fb_helper->connector_count,
|
|
|
sizeof(struct drm_fb_helper_crtc *), GFP_KERNEL);
|
|
|
- modes = kcalloc(dev->mode_config.num_connector,
|
|
|
+ modes = kcalloc(fb_helper->connector_count,
|
|
|
sizeof(struct drm_display_mode *), GFP_KERNEL);
|
|
|
- offsets = kcalloc(dev->mode_config.num_connector,
|
|
|
+ offsets = kcalloc(fb_helper->connector_count,
|
|
|
sizeof(struct drm_fb_offset), GFP_KERNEL);
|
|
|
- enabled = kcalloc(dev->mode_config.num_connector,
|
|
|
+ enabled = kcalloc(fb_helper->connector_count,
|
|
|
sizeof(bool), GFP_KERNEL);
|
|
|
if (!crtcs || !modes || !enabled || !offsets) {
|
|
|
DRM_ERROR("Memory allocation failed\n");
|
|
@@ -2009,9 +2009,9 @@ static void drm_setup_crtcs(struct drm_fb_helper *fb_helper)
|
|
|
fb_helper->funcs->initial_config(fb_helper, crtcs, modes,
|
|
|
offsets,
|
|
|
enabled, width, height))) {
|
|
|
- memset(modes, 0, dev->mode_config.num_connector*sizeof(modes[0]));
|
|
|
- memset(crtcs, 0, dev->mode_config.num_connector*sizeof(crtcs[0]));
|
|
|
- memset(offsets, 0, dev->mode_config.num_connector*sizeof(offsets[0]));
|
|
|
+ memset(modes, 0, fb_helper->connector_count*sizeof(modes[0]));
|
|
|
+ memset(crtcs, 0, fb_helper->connector_count*sizeof(crtcs[0]));
|
|
|
+ memset(offsets, 0, fb_helper->connector_count*sizeof(offsets[0]));
|
|
|
|
|
|
if (!drm_target_cloned(fb_helper, modes, offsets,
|
|
|
enabled, width, height) &&
|