nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

fbdev/hyperv-fb: Do not set struct fb_info.apertures

Browse source 
Generic fbdev drivers use the apertures field in struct fb_info to
control ownership of the framebuffer memory and graphics device. Do
not set the values in hyperv-fb.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221219160516.23436-9-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2022-12-19 17:05:06 +01:00
parent 7a73465e4c
commit 81d2393485
1 changed files with 6 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/video/fbdev/hyperv_fb.c
View file

@ -988,13 +988,10 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
struct pci_dev *pdev = NULL; struct pci_dev *pdev = NULL;
void __iomem *fb_virt; void __iomem *fb_virt;
int gen2vm = efi_enabled(EFI_BOOT); int gen2vm = efi_enabled(EFI_BOOT);
resource_size_t base, size;
phys_addr_t paddr; phys_addr_t paddr;
int ret; int ret;
info->apertures = alloc_apertures(1);
if (!info->apertures)
return -ENOMEM;
if (!gen2vm) { if (!gen2vm) {
pdev = pci_get_device(PCI_VENDOR_ID_MICROSOFT, pdev = pci_get_device(PCI_VENDOR_ID_MICROSOFT,
PCI_DEVICE_ID_HYPERV_VIDEO, NULL); PCI_DEVICE_ID_HYPERV_VIDEO, NULL);
@ -1003,8 +1000,8 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
return -ENODEV; return -ENODEV;
} }
info->apertures->ranges[0].base = pci_resource_start(pdev, 0); base = pci_resource_start(pdev, 0);
info->apertures->ranges[0].size = pci_resource_len(pdev, 0); size = pci_resource_len(pdev, 0);
/* /*
* For Gen 1 VM, we can directly use the contiguous memory * For Gen 1 VM, we can directly use the contiguous memory
@ -1027,8 +1024,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"); pr_info("Unable to allocate enough contiguous physical memory on Gen 1 VM. Using MMIO instead.\n");
} else { } else {
info->apertures->ranges[0].base = screen_info.lfb_base; base = screen_info.lfb_base;
info->apertures->ranges[0].size = screen_info.lfb_size; size = screen_info.lfb_size;
} }
/* /*
@ -1070,9 +1067,7 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
info->screen_size = dio_fb_size; info->screen_size = dio_fb_size;
getmem_done: getmem_done:
aperture_remove_conflicting_devices(info->apertures->ranges[0].base, aperture_remove_conflicting_devices(base, size, false, KBUILD_MODNAME);
info->apertures->ranges[0].size,
false, KBUILD_MODNAME);
if (gen2vm) { if (gen2vm) {
/* framebuffer is reallocated, clear screen_info to avoid misuse from kexec */ /* framebuffer is reallocated, clear screen_info to avoid misuse from kexec */