Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / video / fbdev / hyperv_fb.c

diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
index fdbf02b42723c00a377e9ebcf9c11b7a359d4a63..4a6a3303b6b4e59efa0b3a6a756e00392a39e6d9 100644 (file)
--- a/drivers/video/fbdev/hyperv_fb.c
+++ b/drivers/video/fbdev/hyperv_fb.c
@@ -994,13 +994,10 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
        struct pci_dev *pdev  = NULL;
        void __iomem *fb_virt;
        int gen2vm = efi_enabled(EFI_BOOT);
+       resource_size_t base, size;
        phys_addr_t paddr;
        int ret;
 
-       info->apertures = alloc_apertures(1);
-       if (!info->apertures)
-               return -ENOMEM;
-
        if (!gen2vm) {
                pdev = pci_get_device(PCI_VENDOR_ID_MICROSOFT,
                        PCI_DEVICE_ID_HYPERV_VIDEO, NULL);
@@ -1009,8 +1006,8 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
                        return -ENODEV;
                }
 
-               info->apertures->ranges[0].base = pci_resource_start(pdev, 0);
-               info->apertures->ranges[0].size = pci_resource_len(pdev, 0);
+               base = pci_resource_start(pdev, 0);
+               size = pci_resource_len(pdev, 0);
 
                /*
                 * For Gen 1 VM, we can directly use the contiguous memory
@@ -1033,8 +1030,8 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
                }
                pr_info("Unable to allocate enough contiguous physical memory on Gen 1 VM. Using MMIO instead.\n");
        } else {
-               info->apertures->ranges[0].base = screen_info.lfb_base;
-               info->apertures->ranges[0].size = screen_info.lfb_size;
+               base = screen_info.lfb_base;
+               size = screen_info.lfb_size;
        }
 
        /*
@@ -1076,9 +1073,7 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
        info->screen_size = dio_fb_size;
 
 getmem_done:
-       aperture_remove_conflicting_devices(info->apertures->ranges[0].base,
-                                           info->apertures->ranges[0].size,
-                                           false, KBUILD_MODNAME);
+       aperture_remove_conflicting_devices(base, size, false, KBUILD_MODNAME);
 
        if (gen2vm) {
                /* framebuffer is reallocated, clear screen_info to avoid misuse from kexec */