drm/i915: Extract intel_mmio_bar()

We have the same code to determine the MMIO BAR in
two places. Collect it to a single place.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221005154159.18750-1-ville.syrjala@linux.intel.com
Reviewed-by: Matthew Auld <matthew.auld@intel.com>

diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
index 27dbb9e4bd6c4b0111b06fb39b2732ca1289e814..2e796ffad9115c062e03118b03b17d0703f0e094 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt.c
@@ -880,7 +880,7 @@ int intel_gt_probe_all(struct drm_i915_private *i915)
        unsigned int i;
        int ret;
 
-       mmio_bar = GRAPHICS_VER(i915) == 2 ? GEN2_GTTMMADR_BAR : GTTMMADR_BAR;
+       mmio_bar = intel_mmio_bar(GRAPHICS_VER(i915));
        phys_addr = pci_resource_start(pdev, mmio_bar);
 
        /*

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 4757ad0173da6053b1cd85933a4e9991bfc3eb74..53c6b7cf7879779750328e942b5b9169af0ff983 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -1295,9 +1295,7 @@ bool i915_pci_resource_valid(struct pci_dev *pdev, int bar)
 
 static bool intel_mmio_bar_valid(struct pci_dev *pdev, struct intel_device_info *intel_info)
 {
-       int gttmmaddr_bar = intel_info->__runtime.graphics.ip.ver == 2 ? GEN2_GTTMMADR_BAR : GTTMMADR_BAR;
-
-       return i915_pci_resource_valid(pdev, gttmmaddr_bar);
+       return i915_pci_resource_valid(pdev, intel_mmio_bar(intel_info->__runtime.graphics.ip.ver));
 }
 
 static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

diff --git a/drivers/gpu/drm/i915/intel_pci_config.h b/drivers/gpu/drm/i915/intel_pci_config.h
index 4977a524ce6f3f458704360a6dbeebe4265ece03..305f137d2ebd365e56c9f6d9b5c9a4b995e00012 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pci_config.h
+++ b/drivers/gpu/drm/i915/intel_pci_config.h
@@ -13,6 +13,14 @@
 #define GTT_APERTURE_BAR                       GFXMEM_BAR
 #define GEN12_LMEM_BAR                         GFXMEM_BAR
 
+static inline int intel_mmio_bar(int graphics_ver)
+{
+       switch (graphics_ver) {
+       case 2: return GEN2_GTTMMADR_BAR;
+       default: return GTTMMADR_BAR;
+       }
+}
+
 /* BSM in include/drm/i915_drm.h */
 
 #define MCHBAR_I915                            0x44