 @@ -1,14 +1,14 @@
-/*	$NetBSD: radeon_bios.c,v 1.8 2021/12/18 23:45:43 riastradh Exp $	*/
+/*	$NetBSD: radeon_bios.c,v 1.9 2022/02/27 14:23:16 riastradh Exp $	*/
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
  * Copyright 2008 Red Hat Inc.
  * Copyright 2009 Jerome Glisse.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
 @@ -19,38 +19,40 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
+ *
  * Authors: Dave Airlie
  *          Alex Deucher
  *          Jerome Glisse
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.8 2021/12/18 23:45:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.9 2022/02/27 14:23:16 riastradh Exp $");
 #include <linux/acpi.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <drm/drm_device.h>
 #include "atom.h"
 #include "radeon.h"
 #include "radeon_reg.h"
 #include <linux/nbsd-namespace-acpi.h>
 /*
  * BIOS.
  */
 /* If you boot an IGP board with a discrete card as the primary,
  * the IGP rom is not accessible via the rom bar as the IGP rom is
  * part of the system bios.  On boot, the system bios puts a
  * copy of the igp rom at the start of vram if a discrete card is
  * present.
  */
 static bool igp_read_bios_from_vram(struct radeon_device *rdev)
+{
 #ifdef __NetBSD__
 @@ -173,27 +175,26 @@ static bool radeon_read_platform_bios(st
 	if (size == 0 || bios[0] != 0x55 || bios[1] != 0xaa) {
 		return false;
+	}
 	rdev->bios = kmemdup(bios, size, GFP_KERNEL);
 	if (rdev->bios == NULL) {
 		return false;
+	}
 	return true;
 #endif
+}
 /* XXX radeon acpi */
 #ifdef CONFIG_ACPI
 /* ATRM is used to get the BIOS on the discrete cards in
  * dual-gpu systems.
  */
 /* retrieve the ROM in 4k blocks */
 #define ATRM_BIOS_PAGE 4096
 /**
  * radeon_atrm_call - fetch a chunk of the vbios
+ *
  * @atrm_handle: acpi ATRM handle
  * @bios: vbios image pointer
  * @offset: offset of vbios image data to fetch
  * @len: length of vbios image data to fetch
 @@ -237,40 +238,49 @@ static bool radeon_atrm_get_bios(struct
 	int ret;
 	int size = 256 * 1024;
 	int i;
 	struct pci_dev *pdev = NULL;
 	acpi_handle dhandle, atrm_handle;
 	acpi_status status;
 	bool found = false;
 	/* ATRM is for the discrete card only */
 	if (rdev->flags & RADEON_IS_IGP)
 		return false;
 	while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
 #ifdef __NetBSD__
 		dhandle = (pdev->pd_ad ? pdev->pd_ad->ad_handle : NULL);
 #else
 		dhandle = ACPI_HANDLE(&pdev->dev);
 #endif
 		if (!dhandle)
 			continue;
 		status = acpi_get_handle(dhandle, "ATRM", &atrm_handle);
 		if (!ACPI_FAILURE(status)) {
 			found = true;
 			break;
+		}
+	}
 	if (!found) {
 		while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {
 #ifdef __NetBSD__
 			dhandle = (pdev->pd_ad ? pdev->pd_ad->ad_handle
 			    : NULL);
 #else
 			dhandle = ACPI_HANDLE(&pdev->dev);
 #endif
 			if (!dhandle)
 				continue;
 			status = acpi_get_handle(dhandle, "ATRM", &atrm_handle);
 			if (!ACPI_FAILURE(status)) {
 				found = true;
 				break;
+			}
+		}
+	}
 	if (!found)
 		return false;