fbdev: allow passing more than one aperture for handoff

[GitHub/mt8127/android_kernel_alcatel_ttab.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 b04e0a86bf9af6ddc3e5096a7377c5eb5fa7a0b0..7f1eabbaa2bb589b55ab280216756c40ada53dfb 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -128,11 +128,16 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
        info->fbops = &intelfb_ops;
 
        /* setup aperture base/size for vesafb takeover */
-       info->aperture_base = dev->mode_config.fb_base;
+       info->apertures = alloc_apertures(1);
+       if (!info->apertures) {
+               ret = -ENOMEM;
+               goto out_unpin;
+       }
+       info->apertures->ranges[0].base = dev->mode_config.fb_base;
        if (IS_I9XX(dev))
-               info->aperture_size = pci_resource_len(dev->pdev, 2);
+               info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 2);
        else
-               info->aperture_size = pci_resource_len(dev->pdev, 0);
+               info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
 
        info->fix.smem_start = dev->mode_config.fb_base + obj_priv->gtt_offset;
        info->fix.smem_len = size;