drm/i915/uncore: fwtable read handlers are now used on all forcewake platforms

With the recent refactor of the uncore mmio handling, all
forcewake-based platforms (i.e., graphics version 6 and beyond) now use
the 'fwtable' read handlers.  Let's pull the assignment out of the
per-platform if/else ladder to make this more obvious.

Suggested-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Suggested-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210923003029.2194375-1-matthew.d.roper@intel.com

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index c8e7c71f089674791ac0220c465b2013b4fff95f..678a99de07fee0808c07bba7a08b2eac49d8b8cf 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -2088,49 +2088,42 @@ static int uncore_forcewake_init(struct intel_uncore *uncore)
                return ret;
        forcewake_early_sanitize(uncore, 0);
 
+       ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable);
+
        if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 55)) {
                ASSIGN_FW_DOMAINS_TABLE(uncore, __dg2_fw_ranges);
                ASSIGN_SHADOW_TABLE(uncore, dg2_shadowed_regs);
                ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable);
-               ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable);
        } else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) {
                ASSIGN_FW_DOMAINS_TABLE(uncore, __xehp_fw_ranges);
                ASSIGN_SHADOW_TABLE(uncore, gen12_shadowed_regs);
                ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable);
-               ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable);
        } else if (GRAPHICS_VER(i915) >= 12) {
                ASSIGN_FW_DOMAINS_TABLE(uncore, __gen12_fw_ranges);
                ASSIGN_SHADOW_TABLE(uncore, gen12_shadowed_regs);
                ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable);
-               ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable);
        } else if (GRAPHICS_VER(i915) == 11) {
                ASSIGN_FW_DOMAINS_TABLE(uncore, __gen11_fw_ranges);
                ASSIGN_SHADOW_TABLE(uncore, gen11_shadowed_regs);
                ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable);
-               ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable);
        } else if (IS_GRAPHICS_VER(i915, 9, 10)) {
                ASSIGN_FW_DOMAINS_TABLE(uncore, __gen9_fw_ranges);
                ASSIGN_SHADOW_TABLE(uncore, gen8_shadowed_regs);
                ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable);
-               ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable);
        } else if (IS_CHERRYVIEW(i915)) {
                ASSIGN_FW_DOMAINS_TABLE(uncore, __chv_fw_ranges);
                ASSIGN_SHADOW_TABLE(uncore, gen8_shadowed_regs);
                ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable);
-               ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable);
        } else if (GRAPHICS_VER(i915) == 8) {
                ASSIGN_FW_DOMAINS_TABLE(uncore, __gen6_fw_ranges);
                ASSIGN_SHADOW_TABLE(uncore, gen8_shadowed_regs);
                ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable);
-               ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable);
        } else if (IS_VALLEYVIEW(i915)) {
                ASSIGN_FW_DOMAINS_TABLE(uncore, __vlv_fw_ranges);
                ASSIGN_WRITE_MMIO_VFUNCS(uncore, gen6);
-               ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable);
        } else if (IS_GRAPHICS_VER(i915, 6, 7)) {
                ASSIGN_FW_DOMAINS_TABLE(uncore, __gen6_fw_ranges);
                ASSIGN_WRITE_MMIO_VFUNCS(uncore, gen6);
-               ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable);
        }
 
        uncore->pmic_bus_access_nb.notifier_call = i915_pmic_bus_access_notifier;