Merge branch 'karo-tx6-mainline' into stable

[karo-tx-linux.git] / drivers / gpu / drm / i915 / intel_fbdev.c

diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 4fd5fdfef6bd000974d3cf82949fc2b45f4907df..c0c094d5b822aaafad4f33418910704602b4aaf0 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -362,12 +362,12 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
        uint64_t conn_configured = 0, mask;
        int pass = 0;
 
-       save_enabled = kcalloc(dev->mode_config.num_connector, sizeof(bool),
+       save_enabled = kcalloc(fb_helper->connector_count, sizeof(bool),
                               GFP_KERNEL);
        if (!save_enabled)
                return false;
 
-       memcpy(save_enabled, enabled, dev->mode_config.num_connector);
+       memcpy(save_enabled, enabled, fb_helper->connector_count);
        mask = (1 << fb_helper->connector_count) - 1;
 retry:
        for (i = 0; i < fb_helper->connector_count; i++) {
@@ -501,7 +501,7 @@ retry:
        if (fallback) {
 bail:
                DRM_DEBUG_KMS("Not using firmware configuration\n");
-               memcpy(enabled, save_enabled, dev->mode_config.num_connector);
+               memcpy(enabled, save_enabled, fb_helper->connector_count);
                kfree(save_enabled);
                return false;
        }