Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus' and 'sched-urgent...

[mirror_ubuntu-artful-kernel.git] / drivers / staging / gma500 / psb_fb.c

diff --git a/drivers/staging/gma500/psb_fb.c b/drivers/staging/gma500/psb_fb.c
index 99c03a2e06bdb32e8a20f579be0f4c975314805c..084c36bbfe86997428b52158dbedaa48c7d69611 100644 (file)
--- a/drivers/staging/gma500/psb_fb.c
+++ b/drivers/staging/gma500/psb_fb.c
@@ -441,6 +441,16 @@ static int psbfb_create(struct psb_fbdev *fbdev,
        info->screen_size = size;
        memset(info->screen_base, 0, size);
 
+       if (dev_priv->pg->stolen_size) {
+               info->apertures = alloc_apertures(1);
+               if (!info->apertures) {
+                       ret = -ENOMEM;
+                       goto out_err0;
+               }
+               info->apertures->ranges[0].base = dev->mode_config.fb_base;
+               info->apertures->ranges[0].size = dev_priv->pg->stolen_size;
+       }
+
        drm_fb_helper_fill_fix(info, fb->pitch, fb->depth);
        drm_fb_helper_fill_var(info, &fbdev->psb_fb_helper,
                                sizes->fb_width, sizes->fb_height);