diff options
| author | Michael Kelley <mhklinux@outlook.com> | 2024-01-31 22:00:22 -0800 |
|---|---|---|
| committer | Wei Liu <wei.liu@kernel.org> | 2024-03-01 08:19:11 +0000 |
| commit | 20ee2ae8c58990ca9e98954b7ac2b66c53a0310e (patch) | |
| tree | e9de40d563396e450ac993bcecc3a439f788d6b4 | |
| parent | b8209544296edbd1af186e2ea9c648642c37b18c (diff) | |
| download | lwn-20ee2ae8c58990ca9e98954b7ac2b66c53a0310e.tar.gz lwn-20ee2ae8c58990ca9e98954b7ac2b66c53a0310e.zip | |
fbdev/hyperv_fb: Fix logic error for Gen2 VMs in hvfb_getmem()
A recent commit removing the use of screen_info introduced a logic
error. The error causes hvfb_getmem() to always return -ENOMEM
for Generation 2 VMs. As a result, the Hyper-V frame buffer
device fails to initialize. The error was introduced by removing
an "else if" clause, leaving Gen2 VMs to always take the -ENOMEM
error path.
Fix the problem by removing the error path "else" clause. Gen 2
VMs now always proceed through the MMIO memory allocation code,
but with "base" and "size" defaulting to 0.
Fixes: 0aa0838c84da ("fbdev/hyperv_fb: Remove firmware framebuffers with aperture helpers")
Signed-off-by: Michael Kelley <mhklinux@outlook.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Saurabh Sengar <ssengar@linux.microsoft.com>
Link: https://lore.kernel.org/r/20240201060022.233666-1-mhklinux@outlook.com
Signed-off-by: Wei Liu <wei.liu@kernel.org>
Message-ID: <20240201060022.233666-1-mhklinux@outlook.com>
| -rw-r--r-- | drivers/video/fbdev/hyperv_fb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index c26ee6fd73c9..8fdccf033b2d 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -1010,8 +1010,6 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) goto getmem_done; } pr_info("Unable to allocate enough contiguous physical memory on Gen 1 VM. Using MMIO instead.\n"); - } else { - goto err1; } /* |