From patchwork Fri Nov 8 21:13:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 11235585 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9260714E5 for ; Fri, 8 Nov 2019 21:14:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7ADE52178F for ; Fri, 8 Nov 2019 21:14:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7ADE52178F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 07A176FA87; Fri, 8 Nov 2019 21:14:39 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id CDE386FA87 for ; Fri, 8 Nov 2019 21:14:37 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Nov 2019 13:14:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,283,1569308400"; d="scan'208";a="213309407" Received: from ldmartin-desk1.jf.intel.com (HELO ldmartin-desk1.intel.com) ([10.24.10.155]) by fmsmga001.fm.intel.com with ESMTP; 08 Nov 2019 13:14:37 -0800 From: Lucas De Marchi To: intel-gfx@lists.freedesktop.org Date: Fri, 8 Nov 2019 13:13:51 -0800 Message-Id: <20191108211353.22288-1-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 1/3] drm/i915/bios: rename bios to oprom when mapping pci rom X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" oprom is actually a better name to use when using pci_map_rom(). "bios" is way too generic and confusing. Signed-off-by: Lucas De Marchi Reviewed-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/20191108003602.33526-2-lucas.demarchi@intel.com --- drivers/gpu/drm/i915/display/intel_bios.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index a03f56b7b4ef..1f83616cfc32 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -1804,7 +1804,7 @@ bool intel_bios_is_valid_vbt(const void *buf, size_t size) 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; @@ -1812,14 +1812,14 @@ static const struct vbt_header *find_vbt(void __iomem *bios, size_t size) for (i = 0; i + 4 < size; i++) { void *vbt; - if (ioread32(bios + i) != *((const u32 *) "$VBT")) + if (ioread32(oprom + i) != *((const u32 *)"$VBT")) continue; /* * This is the one place where we explicitly discard the address * 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)) return vbt; @@ -1842,7 +1842,7 @@ void intel_bios_init(struct drm_i915_private *dev_priv) struct pci_dev *pdev = dev_priv->drm.pdev; const struct vbt_header *vbt = dev_priv->opregion.vbt; const struct bdb_header *bdb; - u8 __iomem *bios = NULL; + u8 __iomem *oprom = NULL; if (!HAS_DISPLAY(dev_priv) || !INTEL_DISPLAY_ENABLED(dev_priv)) { DRM_DEBUG_KMS("Skipping VBT init due to disabled display.\n"); @@ -1855,11 +1855,11 @@ void intel_bios_init(struct drm_i915_private *dev_priv) if (!vbt) { size_t size; - bios = pci_map_rom(pdev, &size); - if (!bios) + oprom = pci_map_rom(pdev, &size); + if (!oprom) goto out; - vbt = find_vbt(bios, size); + vbt = find_vbt(oprom, size); if (!vbt) goto out; @@ -1893,8 +1893,8 @@ void intel_bios_init(struct drm_i915_private *dev_priv) init_vbt_missing_defaults(dev_priv); } - if (bios) - pci_unmap_rom(pdev, bios); + if (oprom) + pci_unmap_rom(pdev, oprom); } /**