drm/i915/uncore: split the fw get function into separate vfunc

constify it while here. drop the put function since it was never
overloaded and always has done the same thing, no point in
indirecting it for show.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/41c3e1896162fc08e22e40b00642791365a8c00e.1632869550.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 6b38bc2811c1ba70b60b74f0fcf719bc0d6a2aef..2dac69d92c1b6c8ef11e2e6f43a8b98d3e259619 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -36,6 +36,12 @@
 
 #define __raw_posting_read(...) ((void)__raw_uncore_read32(__VA_ARGS__))
 
+static void
+fw_domains_get(struct intel_uncore *uncore, enum forcewake_domains fw_domains)
+{
+       uncore->fw_get_funcs->force_wake_get(uncore, fw_domains);
+}
+
 void
 intel_uncore_mmio_debug_init_early(struct intel_uncore_mmio_debug *mmio_debug)
 {
@@ -248,7 +254,7 @@ fw_domain_put(const struct intel_uncore_forcewake_domain *d)
 }
 
 static void
-fw_domains_get(struct intel_uncore *uncore, enum forcewake_domains fw_domains)
+fw_domains_get_normal(struct intel_uncore *uncore, enum forcewake_domains fw_domains)
 {
        struct intel_uncore_forcewake_domain *d;
        unsigned int tmp;
@@ -396,7 +402,7 @@ intel_uncore_fw_release_timer(struct hrtimer *timer)
 
        GEM_BUG_ON(!domain->wake_count);
        if (--domain->wake_count == 0)
-               uncore->funcs.force_wake_put(uncore, domain->mask);
+               fw_domains_put(uncore, domain->mask);
 
        spin_unlock_irqrestore(&uncore->lock, irqflags);
 
@@ -454,7 +460,7 @@ intel_uncore_forcewake_reset(struct intel_uncore *uncore)
 
        fw = uncore->fw_domains_active;
        if (fw)
-               uncore->funcs.force_wake_put(uncore, fw);
+               fw_domains_put(uncore, fw);
 
        fw_domains_reset(uncore, uncore->fw_domains);
        assert_forcewakes_inactive(uncore);
@@ -562,7 +568,7 @@ static void forcewake_early_sanitize(struct intel_uncore *uncore,
        intel_uncore_forcewake_reset(uncore);
        if (restore_forcewake) {
                spin_lock_irq(&uncore->lock);
-               uncore->funcs.force_wake_get(uncore, restore_forcewake);
+               fw_domains_get(uncore, restore_forcewake);
 
                if (intel_uncore_has_fifo(uncore))
                        uncore->fifo_count = fifo_free_entries(uncore);
@@ -623,7 +629,7 @@ static void __intel_uncore_forcewake_get(struct intel_uncore *uncore,
        }
 
        if (fw_domains)
-               uncore->funcs.force_wake_get(uncore, fw_domains);
+               fw_domains_get(uncore, fw_domains);
 }
 
 /**
@@ -644,7 +650,7 @@ void intel_uncore_forcewake_get(struct intel_uncore *uncore,
 {
        unsigned long irqflags;
 
-       if (!uncore->funcs.force_wake_get)
+       if (!uncore->fw_get_funcs)
                return;
 
        assert_rpm_wakelock_held(uncore->rpm);
@@ -711,7 +717,7 @@ void intel_uncore_forcewake_get__locked(struct intel_uncore *uncore,
 {
        lockdep_assert_held(&uncore->lock);
 
-       if (!uncore->funcs.force_wake_get)
+       if (!uncore->fw_get_funcs)
                return;
 
        __intel_uncore_forcewake_get(uncore, fw_domains);
@@ -733,7 +739,7 @@ static void __intel_uncore_forcewake_put(struct intel_uncore *uncore,
                        continue;
                }
 
-               uncore->funcs.force_wake_put(uncore, domain->mask);
+               fw_domains_put(uncore, domain->mask);
        }
 }
 
@@ -750,7 +756,7 @@ void intel_uncore_forcewake_put(struct intel_uncore *uncore,
 {
        unsigned long irqflags;
 
-       if (!uncore->funcs.force_wake_put)
+       if (!uncore->fw_get_funcs)
                return;
 
        spin_lock_irqsave(&uncore->lock, irqflags);
@@ -769,7 +775,7 @@ void intel_uncore_forcewake_flush(struct intel_uncore *uncore,
        struct intel_uncore_forcewake_domain *domain;
        unsigned int tmp;
 
-       if (!uncore->funcs.force_wake_put)
+       if (!uncore->fw_get_funcs)
                return;
 
        fw_domains &= uncore->fw_domains;
@@ -793,7 +799,7 @@ void intel_uncore_forcewake_put__locked(struct intel_uncore *uncore,
 {
        lockdep_assert_held(&uncore->lock);
 
-       if (!uncore->funcs.force_wake_put)
+       if (!uncore->fw_get_funcs)
                return;
 
        __intel_uncore_forcewake_put(uncore, fw_domains);
@@ -801,7 +807,7 @@ void intel_uncore_forcewake_put__locked(struct intel_uncore *uncore,
 
 void assert_forcewakes_inactive(struct intel_uncore *uncore)
 {
-       if (!uncore->funcs.force_wake_get)
+       if (!uncore->fw_get_funcs)
                return;
 
        drm_WARN(&uncore->i915->drm, uncore->fw_domains_active,
@@ -818,7 +824,7 @@ void assert_forcewakes_active(struct intel_uncore *uncore,
        if (!IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM))
                return;
 
-       if (!uncore->funcs.force_wake_get)
+       if (!uncore->fw_get_funcs)
                return;
 
        spin_lock_irq(&uncore->lock);
@@ -1605,7 +1611,7 @@ static noinline void ___force_wake_auto(struct intel_uncore *uncore,
        for_each_fw_domain_masked(domain, fw_domains, uncore, tmp)
                fw_domain_arm_timer(domain);
 
-       uncore->funcs.force_wake_get(uncore, fw_domains);
+       fw_domains_get(uncore, fw_domains);
 }
 
 static inline void __force_wake_auto(struct intel_uncore *uncore,
@@ -1866,6 +1872,18 @@ static void intel_uncore_fw_domains_fini(struct intel_uncore *uncore)
                fw_domain_fini(uncore, d->id);
 }
 
+static const struct intel_uncore_fw_get uncore_get_fallback = {
+       .force_wake_get = fw_domains_get_with_fallback
+};
+
+static const struct intel_uncore_fw_get uncore_get_normal = {
+       .force_wake_get = fw_domains_get_normal,
+};
+
+static const struct intel_uncore_fw_get uncore_get_thread_status = {
+       .force_wake_get = fw_domains_get_with_thread_status
+};
+
 static int intel_uncore_fw_domains_init(struct intel_uncore *uncore)
 {
        struct drm_i915_private *i915 = uncore->i915;
@@ -1881,8 +1899,7 @@ static int intel_uncore_fw_domains_init(struct intel_uncore *uncore)
                intel_engine_mask_t emask = INTEL_INFO(i915)->platform_engine_mask;
                int i;
 
-               uncore->funcs.force_wake_get = fw_domains_get_with_fallback;
-               uncore->funcs.force_wake_put = fw_domains_put;
+               uncore->fw_get_funcs = &uncore_get_fallback;
                fw_domain_init(uncore, FW_DOMAIN_ID_RENDER,
                               FORCEWAKE_RENDER_GEN9,
                               FORCEWAKE_ACK_RENDER_GEN9);
@@ -1907,8 +1924,7 @@ static int intel_uncore_fw_domains_init(struct intel_uncore *uncore)
                                       FORCEWAKE_ACK_MEDIA_VEBOX_GEN11(i));
                }
        } else if (IS_GRAPHICS_VER(i915, 9, 10)) {
-               uncore->funcs.force_wake_get = fw_domains_get_with_fallback;
-               uncore->funcs.force_wake_put = fw_domains_put;
+               uncore->fw_get_funcs = &uncore_get_fallback;
                fw_domain_init(uncore, FW_DOMAIN_ID_RENDER,
                               FORCEWAKE_RENDER_GEN9,
                               FORCEWAKE_ACK_RENDER_GEN9);
@@ -1918,16 +1934,13 @@ static int intel_uncore_fw_domains_init(struct intel_uncore *uncore)
                fw_domain_init(uncore, FW_DOMAIN_ID_MEDIA,
                               FORCEWAKE_MEDIA_GEN9, FORCEWAKE_ACK_MEDIA_GEN9);
        } else if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) {
-               uncore->funcs.force_wake_get = fw_domains_get;
-               uncore->funcs.force_wake_put = fw_domains_put;
+               uncore->fw_get_funcs = &uncore_get_normal;
                fw_domain_init(uncore, FW_DOMAIN_ID_RENDER,
                               FORCEWAKE_VLV, FORCEWAKE_ACK_VLV);
                fw_domain_init(uncore, FW_DOMAIN_ID_MEDIA,
                               FORCEWAKE_MEDIA_VLV, FORCEWAKE_ACK_MEDIA_VLV);
        } else if (IS_HASWELL(i915) || IS_BROADWELL(i915)) {
-               uncore->funcs.force_wake_get =
-                       fw_domains_get_with_thread_status;
-               uncore->funcs.force_wake_put = fw_domains_put;
+               uncore->fw_get_funcs = &uncore_get_thread_status;
                fw_domain_init(uncore, FW_DOMAIN_ID_RENDER,
                               FORCEWAKE_MT, FORCEWAKE_ACK_HSW);
        } else if (IS_IVYBRIDGE(i915)) {
@@ -1942,9 +1955,7 @@ static int intel_uncore_fw_domains_init(struct intel_uncore *uncore)
                 * (correctly) interpreted by the test below as MT
                 * forcewake being disabled.
                 */
-               uncore->funcs.force_wake_get =
-                       fw_domains_get_with_thread_status;
-               uncore->funcs.force_wake_put = fw_domains_put;
+               uncore->fw_get_funcs = &uncore_get_thread_status;
 
                /* We need to init first for ECOBUS access and then
                 * determine later if we want to reinit, in case of MT access is
@@ -1975,9 +1986,7 @@ static int intel_uncore_fw_domains_init(struct intel_uncore *uncore)
                                       FORCEWAKE, FORCEWAKE_ACK);
                }
        } else if (GRAPHICS_VER(i915) == 6) {
-               uncore->funcs.force_wake_get =
-                       fw_domains_get_with_thread_status;
-               uncore->funcs.force_wake_put = fw_domains_put;
+               uncore->fw_get_funcs = &uncore_get_thread_status;
                fw_domain_init(uncore, FW_DOMAIN_ID_RENDER,
                               FORCEWAKE, FORCEWAKE_ACK);
        }
@@ -2186,8 +2195,7 @@ int intel_uncore_init_mmio(struct intel_uncore *uncore)
        }
 
        /* make sure fw funcs are set if and only if we have fw*/
-       GEM_BUG_ON(intel_uncore_has_forcewake(uncore) != !!uncore->funcs.force_wake_get);
-       GEM_BUG_ON(intel_uncore_has_forcewake(uncore) != !!uncore->funcs.force_wake_put);
+       GEM_BUG_ON(intel_uncore_has_forcewake(uncore) != !!uncore->fw_get_funcs);
        GEM_BUG_ON(intel_uncore_has_forcewake(uncore) != !!uncore->funcs.read_fw_domains);
        GEM_BUG_ON(intel_uncore_has_forcewake(uncore) != !!uncore->funcs.write_fw_domains);
 

diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h
index 3c0b0a8b5250d1d6750e07385098aaca29ea3178..1a7448f5f16ff95cb08217a86828ebfb1011ab69 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.h
+++ b/drivers/gpu/drm/i915/intel_uncore.h
@@ -84,12 +84,12 @@ enum forcewake_domains {
        FORCEWAKE_ALL = BIT(FW_DOMAIN_ID_COUNT) - 1,
 };
 
-struct intel_uncore_funcs {
+struct intel_uncore_fw_get {
        void (*force_wake_get)(struct intel_uncore *uncore,
                               enum forcewake_domains domains);
-       void (*force_wake_put)(struct intel_uncore *uncore,
-                              enum forcewake_domains domains);
+};
 
+struct intel_uncore_funcs {
        enum forcewake_domains (*read_fw_domains)(struct intel_uncore *uncore,
                                                  i915_reg_t r);
        enum forcewake_domains (*write_fw_domains)(struct intel_uncore *uncore,
@@ -137,6 +137,7 @@ struct intel_uncore {
        unsigned int fw_domains_table_entries;
 
        struct notifier_block pmic_bus_access_nb;
+       const struct intel_uncore_fw_get *fw_get_funcs;
        struct intel_uncore_funcs funcs;
 
        unsigned int fifo_count;