Skip to contentSkip to conversation

fbdev: Fix order of arguments to aperture_remove_conflicting_devices()

PATCH In review Thomas Zimmermann 3 participants 3 messages Jul 21, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fbdev: Fix order of arguments to aperture_remove_conflicting_devices()

Reverse the order of the final two arguments when calling aperture_remove_conflicting_devices(). An error report is available at [1].

Fixes 8d69d008f44c ("fbdev: Convert drivers to aperture helpers")
Cc Thomas Zimmermann <[email protected]>
Cc Javier Martinez Canillas <[email protected]>
Cc Sudip Mukherjee <[email protected]>
Cc Teddy Wang <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc "K. Y. Srinivasan" <[email protected]>
Cc Haiyang Zhang <[email protected]>
Cc Stephen Hemminger <[email protected]>
Cc Wei Liu <[email protected]>
Cc Dexuan Cui <[email protected]>
---
 drivers/video/fbdev/aty/radeon_base.c | 2 +-
 drivers/video/fbdev/hyperv_fb.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/aty/radeon_base.c +1 -1
index e5e362b8c9da..0a8199985d52 100644
@@ -2243,7 +2243,7 @@ static int radeon_kick_out_firmware_fb(struct pci_dev *pdev)
 	resource_size_t base = pci_resource_start(pdev, 0);
 	resource_size_t size = pci_resource_len(pdev, 0);
 
-	return aperture_remove_conflicting_devices(base, size, KBUILD_MODNAME, false);
+	return aperture_remove_conflicting_devices(base, size, false, KBUILD_MODNAME);
 }
 
 static int radeonfb_pci_register(struct pci_dev *pdev,
drivers/video/fbdev/hyperv_fb.c +1 -1
index a944a6620527..a0e1d70b90d7 100644
@@ -1077,7 +1077,7 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
 getmem_done:
 	aperture_remove_conflicting_devices(info->apertures->ranges[0].base,
 					    info->apertures->ranges[0].size,
-					    KBUILD_MODNAME, false);
+					    false, KBUILD_MODNAME);
 
 	if (gen2vm) {
 		/* framebuffer is reallocated, clear screen_info to avoid misuse from kexec */
Signature · 1 line
2.36.1
Reviewed-by on v1 1/1
#1 lore raw

Hello Thomas,

Quoted 30 lines · Thomas Zimmermann

Reverse the order of the final two arguments when calling aperture_remove_conflicting_devices(). An error report is available at [1].

Fixes 8d69d008f44c ("fbdev: Convert drivers to aperture helpers")
Cc Thomas Zimmermann <[email protected]>
Cc Javier Martinez Canillas <[email protected]>
Cc Sudip Mukherjee <[email protected]>
Cc Teddy Wang <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc "K. Y. Srinivasan" <[email protected]>
Cc Haiyang Zhang <[email protected]>
Cc Stephen Hemminger <[email protected]>
Cc Wei Liu <[email protected]>
Cc Dexuan Cui <[email protected]>
---
 drivers/video/fbdev/aty/radeon_base.c | 2 +-
 drivers/video/fbdev/hyperv_fb.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/aty/radeon_base.c +0 -0
index e5e362b8c9da..0a8199985d52 100644

drivers/video/fbdev/aty/radeon_base.c static int radeon_kick_out_firmware_fb(struct pci_dev *pdev) · line 2247

Quoted 6 lines
drivers/video/fbdev/aty/radeon_base.c +1 -1
@@ -2243,7 +2243,7 @@ static int radeon_kick_out_firmware_fb(struct pci_dev *pdev)
 	resource_size_t base = pci_resource_start(pdev, 0);
 	resource_size_t size = pci_resource_len(pdev, 0);
 
-	return aperture_remove_conflicting_devices(base, size, KBUILD_MODNAME, false);
+	return aperture_remove_conflicting_devices(base, size, false, KBUILD_MODNAME);
 }

I also missed that the order wasn't correct when reviewing.

Signature · 5 lines
Best regards,

Javier Martinez Canillas
Linux Engineering
Red Hat
Reviewed-by on v1 1/1
#2 lore raw
In reply to Thomas Zimmermann

From: Thomas Zimmermann <[email protected]> Sent: Thursday, July 21, 2022 1:17 AM

Quoted 56 lines

Reverse the order of the final two arguments when calling aperture_remove_conflicting_devices(). An error report is available at [1].

Fixes 8d69d008f44c ("fbdev: Convert drivers to aperture helpers")
Cc Thomas Zimmermann <[email protected]>
Cc Javier Martinez Canillas <[email protected]>
Cc Sudip Mukherjee <[email protected]>
Cc Teddy Wang <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc "K. Y. Srinivasan" <[email protected]>
Cc Haiyang Zhang <[email protected]>
Cc Stephen Hemminger <[email protected]>
Cc Wei Liu <[email protected]>
Cc Dexuan Cui <[email protected]>
---
 drivers/video/fbdev/aty/radeon_base.c | 2 +-
 drivers/video/fbdev/hyperv_fb.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/aty/radeon_base.c +1 -1
index e5e362b8c9da..0a8199985d52 100644
@@ -2243,7 +2243,7 @@ static int radeon_kick_out_firmware_fb(struct pci_dev
 *pdev)
 	resource_size_t base = pci_resource_start(pdev, 0);
 	resource_size_t size = pci_resource_len(pdev, 0);
 
-	return aperture_remove_conflicting_devices(base, size, KBUILD_MODNAME,
 false);
+	return aperture_remove_conflicting_devices(base, size, false,
 KBUILD_MODNAME);

}

static int radeonfb_pci_register(struct pci_dev *pdev,

drivers/video/fbdev/hyperv_fb.c +1 -1
index a944a6620527..a0e1d70b90d7 100644
@@ -1077,7 +1077,7 @@ static int hvfb_getmem(struct hv_device *hdev, struct
 fb_info *info)
 getmem_done:
 	aperture_remove_conflicting_devices(info->apertures->ranges[0].base,
 					    info->apertures->ranges[0].size,
-					    KBUILD_MODNAME, false);
+					    false, KBUILD_MODNAME);
 
 	if (gen2vm) {
Quoted 4 lines

/* framebuffer is reallocated, clear screen_info to avoid misuse from
kexec */
--
2.36.1

For the Hyper-V frame buffer driver: