Commit 496f50a6 authored by Lucas De Marchi's avatar Lucas De Marchi

drm/i915/bios: rename bios to oprom when mapping pci rom

oprom is actually a better name to use when using
pci_map_rom(). "bios"  is way too generic and confusing.
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191108003602.33526-2-lucas.demarchi@intel.com
parent 9381e2be
...@@ -1789,7 +1789,7 @@ bool intel_bios_is_valid_vbt(const void *buf, size_t size) ...@@ -1789,7 +1789,7 @@ bool intel_bios_is_valid_vbt(const void *buf, size_t size)
return vbt; return vbt;
} }
static const struct vbt_header *find_vbt(void __iomem *bios, size_t size) static const struct vbt_header *find_vbt(void __iomem *oprom, size_t size)
{ {
size_t i; size_t i;
...@@ -1797,14 +1797,14 @@ static const struct vbt_header *find_vbt(void __iomem *bios, size_t size) ...@@ -1797,14 +1797,14 @@ static const struct vbt_header *find_vbt(void __iomem *bios, size_t size)
for (i = 0; i + 4 < size; i++) { for (i = 0; i + 4 < size; i++) {
void *vbt; void *vbt;
if (ioread32(bios + i) != *((const u32 *) "$VBT")) if (ioread32(oprom + i) != *((const u32 *)"$VBT"))
continue; continue;
/* /*
* This is the one place where we explicitly discard the address * This is the one place where we explicitly discard the address
* space (__iomem) of the BIOS/VBT. * space (__iomem) of the BIOS/VBT.
*/ */
vbt = (void __force *) bios + i; vbt = (void __force *)oprom + i;
if (intel_bios_is_valid_vbt(vbt, size - i)) if (intel_bios_is_valid_vbt(vbt, size - i))
return vbt; return vbt;
...@@ -1827,7 +1827,7 @@ void intel_bios_init(struct drm_i915_private *dev_priv) ...@@ -1827,7 +1827,7 @@ void intel_bios_init(struct drm_i915_private *dev_priv)
struct pci_dev *pdev = dev_priv->drm.pdev; struct pci_dev *pdev = dev_priv->drm.pdev;
const struct vbt_header *vbt = dev_priv->opregion.vbt; const struct vbt_header *vbt = dev_priv->opregion.vbt;
const struct bdb_header *bdb; const struct bdb_header *bdb;
u8 __iomem *bios = NULL; u8 __iomem *oprom = NULL;
INIT_LIST_HEAD(&dev_priv->vbt.display_devices); INIT_LIST_HEAD(&dev_priv->vbt.display_devices);
...@@ -1842,11 +1842,11 @@ void intel_bios_init(struct drm_i915_private *dev_priv) ...@@ -1842,11 +1842,11 @@ void intel_bios_init(struct drm_i915_private *dev_priv)
if (!vbt) { if (!vbt) {
size_t size; size_t size;
bios = pci_map_rom(pdev, &size); oprom = pci_map_rom(pdev, &size);
if (!bios) if (!oprom)
goto out; goto out;
vbt = find_vbt(bios, size); vbt = find_vbt(oprom, size);
if (!vbt) if (!vbt)
goto out; goto out;
...@@ -1880,8 +1880,8 @@ void intel_bios_init(struct drm_i915_private *dev_priv) ...@@ -1880,8 +1880,8 @@ void intel_bios_init(struct drm_i915_private *dev_priv)
init_vbt_missing_defaults(dev_priv); init_vbt_missing_defaults(dev_priv);
} }
if (bios) if (oprom)
pci_unmap_rom(pdev, bios); pci_unmap_rom(pdev, oprom);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment