From: Dave Airlie <airlied@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@linux.intel.com, Dave Airlie <airlied@redhat.com>
Subject: [Intel-gfx] [PATCH 20/21] drm/i915: constify clock gating init vtable.
Date: Wed, 8 Sep 2021 10:39:43 +1000 [thread overview]
Message-ID: <20210908003944.2972024-21-airlied@gmail.com> (raw)
In-Reply-To: <20210908003944.2972024-1-airlied@gmail.com>
From: Dave Airlie <airlied@redhat.com>
I used a macro to avoid making any really silly mistakes here.
---
drivers/gpu/drm/i915/i915_drv.h | 2 +-
drivers/gpu/drm/i915/intel_pm.c | 77 +++++++++++++++++++++++----------
2 files changed, 54 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index fbcafc7cc075..44094a25a110 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -990,7 +990,7 @@ struct drm_i915_private {
struct workqueue_struct *flip_wq;
/* pm private clock gating functions */
- struct drm_i915_cg_funcs cg_funcs;
+ const struct drm_i915_cg_funcs *cg_funcs;
/* pm display functions */
struct drm_i915_wm_disp_funcs wm_disp;
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 7a457646fb84..44f5582531ac 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -7871,7 +7871,7 @@ static void i830_init_clock_gating(struct drm_i915_private *dev_priv)
void intel_init_clock_gating(struct drm_i915_private *dev_priv)
{
- dev_priv->cg_funcs.init_clock_gating(dev_priv);
+ dev_priv->cg_funcs->init_clock_gating(dev_priv);
}
void intel_suspend_hw(struct drm_i915_private *dev_priv)
@@ -7886,6 +7886,35 @@ static void nop_init_clock_gating(struct drm_i915_private *dev_priv)
"No clock gating settings or workarounds applied.\n");
}
+#define CG_FUNCS(platform) \
+static const struct drm_i915_cg_funcs platform##_cg_funcs = { \
+ .init_clock_gating = platform##_init_clock_gating \
+}
+
+CG_FUNCS(adlp);
+CG_FUNCS(dg1);
+CG_FUNCS(gen12lp);
+CG_FUNCS(icl);
+CG_FUNCS(cfl);
+CG_FUNCS(skl);
+CG_FUNCS(kbl);
+CG_FUNCS(bxt);
+CG_FUNCS(glk);
+CG_FUNCS(bdw);
+CG_FUNCS(chv);
+CG_FUNCS(hsw);
+CG_FUNCS(ivb);
+CG_FUNCS(vlv);
+CG_FUNCS(gen6);
+CG_FUNCS(ilk);
+CG_FUNCS(g4x);
+CG_FUNCS(i965gm);
+CG_FUNCS(i965g);
+CG_FUNCS(gen3);
+CG_FUNCS(i85x);
+CG_FUNCS(i830);
+CG_FUNCS(nop);
+
/**
* intel_init_clock_gating_hooks - setup the clock gating hooks
* @dev_priv: device private
@@ -7898,52 +7927,52 @@ static void nop_init_clock_gating(struct drm_i915_private *dev_priv)
void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv)
{
if (IS_ALDERLAKE_P(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = adlp_init_clock_gating;
+ dev_priv->cg_funcs = &adlp_cg_funcs;
else if (IS_DG1(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = dg1_init_clock_gating;
+ dev_priv->cg_funcs = &dg1_cg_funcs;
else if (GRAPHICS_VER(dev_priv) == 12)
- dev_priv->cg_funcs.init_clock_gating = gen12lp_init_clock_gating;
+ dev_priv->cg_funcs = &gen12lp_cg_funcs;
else if (GRAPHICS_VER(dev_priv) == 11)
- dev_priv->cg_funcs.init_clock_gating = icl_init_clock_gating;
+ dev_priv->cg_funcs = &icl_cg_funcs;
else if (IS_COFFEELAKE(dev_priv) || IS_COMETLAKE(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = cfl_init_clock_gating;
+ dev_priv->cg_funcs = &cfl_cg_funcs;
else if (IS_SKYLAKE(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = skl_init_clock_gating;
+ dev_priv->cg_funcs = &skl_cg_funcs;
else if (IS_KABYLAKE(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = kbl_init_clock_gating;
+ dev_priv->cg_funcs = &kbl_cg_funcs;
else if (IS_BROXTON(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = bxt_init_clock_gating;
+ dev_priv->cg_funcs = &bxt_cg_funcs;
else if (IS_GEMINILAKE(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = glk_init_clock_gating;
+ dev_priv->cg_funcs = &glk_cg_funcs;
else if (IS_BROADWELL(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = bdw_init_clock_gating;
+ dev_priv->cg_funcs = &bdw_cg_funcs;
else if (IS_CHERRYVIEW(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = chv_init_clock_gating;
+ dev_priv->cg_funcs = &chv_cg_funcs;
else if (IS_HASWELL(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = hsw_init_clock_gating;
+ dev_priv->cg_funcs = &hsw_cg_funcs;
else if (IS_IVYBRIDGE(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = ivb_init_clock_gating;
+ dev_priv->cg_funcs = &ivb_cg_funcs;
else if (IS_VALLEYVIEW(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = vlv_init_clock_gating;
+ dev_priv->cg_funcs = &vlv_cg_funcs;
else if (GRAPHICS_VER(dev_priv) == 6)
- dev_priv->cg_funcs.init_clock_gating = gen6_init_clock_gating;
+ dev_priv->cg_funcs = &gen6_cg_funcs;
else if (GRAPHICS_VER(dev_priv) == 5)
- dev_priv->cg_funcs.init_clock_gating = ilk_init_clock_gating;
+ dev_priv->cg_funcs = &ilk_cg_funcs;
else if (IS_G4X(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = g4x_init_clock_gating;
+ dev_priv->cg_funcs = &g4x_cg_funcs;
else if (IS_I965GM(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = i965gm_init_clock_gating;
+ dev_priv->cg_funcs = &i965gm_cg_funcs;
else if (IS_I965G(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = i965g_init_clock_gating;
+ dev_priv->cg_funcs = &i965g_cg_funcs;
else if (GRAPHICS_VER(dev_priv) == 3)
- dev_priv->cg_funcs.init_clock_gating = gen3_init_clock_gating;
+ dev_priv->cg_funcs = &gen3_cg_funcs;
else if (IS_I85X(dev_priv) || IS_I865G(dev_priv))
- dev_priv->cg_funcs.init_clock_gating = i85x_init_clock_gating;
+ dev_priv->cg_funcs = &i85x_cg_funcs;
else if (GRAPHICS_VER(dev_priv) == 2)
- dev_priv->cg_funcs.init_clock_gating = i830_init_clock_gating;
+ dev_priv->cg_funcs = &i830_cg_funcs;
else {
MISSING_CASE(INTEL_DEVID(dev_priv));
- dev_priv->cg_funcs.init_clock_gating = nop_init_clock_gating;
+ dev_priv->cg_funcs = &nop_cg_funcs;
}
}
--
2.31.1
next prev parent reply other threads:[~2021-09-08 0:40 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 0:39 [Intel-gfx] [PATCH 00/21] i915/display: split and constify vtable Dave Airlie
2021-09-08 0:39 ` [Intel-gfx] [PATCH 01/21] drm/i915/pm: drop get_fifo_size vfunc Dave Airlie
2021-09-08 11:30 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 02/21] drm/i915: make update_wm take a dev_priv Dave Airlie
2021-09-08 1:17 ` David Airlie
2021-09-08 11:31 ` Jani Nikula
2021-09-08 11:32 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 03/21] drm/i915/wm: move the update watermark wrapper to display side Dave Airlie
2021-09-08 9:33 ` Jani Nikula
2021-09-08 20:40 ` Dave Airlie
2021-09-09 14:26 ` Ville Syrjälä
2021-09-08 0:39 ` [Intel-gfx] [PATCH 04/21] drm/i915: split clock gating init from display vtable Dave Airlie
2021-09-08 11:34 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 05/21] drm/i915: split watermark vfuncs " Dave Airlie
2021-09-08 9:40 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 06/21] drm/i915: split color functions " Dave Airlie
2021-09-08 9:46 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 07/21] drm/i915: split audio " Dave Airlie
2021-09-08 9:48 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 08/21] drm/i915: split cdclk " Dave Airlie
2021-09-08 9:52 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 09/21] drm/i915: split irq hotplug function " Dave Airlie
2021-09-08 10:00 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 10/21] drm/i915: split fdi link training " Dave Airlie
2021-09-08 10:02 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 11/21] drm/i915: split the dpll clock compute out " Dave Airlie
2021-09-08 10:09 ` Jani Nikula
2021-09-09 0:34 ` Dave Airlie
2021-09-08 0:39 ` [Intel-gfx] [PATCH 12/21] drm/i915: constify fdi link training vtable Dave Airlie
2021-09-08 10:10 ` Jani Nikula
2021-09-08 12:03 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 13/21] drm/i915: constify irq function vtable Dave Airlie
2021-09-08 10:12 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 14/21] drm/i915: constify color " Dave Airlie
2021-09-08 10:30 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 15/21] drm/i915: constify the audio " Dave Airlie
2021-09-08 10:37 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 16/21] drm/i915: constify the dpll clock vtable Dave Airlie
2021-09-08 10:38 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 17/21] drm/i915: constify the cdclk vtable Dave Airlie
2021-09-08 11:56 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 18/21] drm/i915: drop unused function ptr and comments Dave Airlie
2021-09-08 11:36 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 19/21] drm/i915: constify display function vtable Dave Airlie
2021-09-08 11:58 ` Jani Nikula
2021-09-08 0:39 ` Dave Airlie [this message]
2021-09-08 12:00 ` [Intel-gfx] [PATCH 20/21] drm/i915: constify clock gating init vtable Jani Nikula
2021-09-08 12:00 ` Jani Nikula
2021-09-08 0:39 ` [Intel-gfx] [PATCH 21/21] drm/i915: constify display wm vtable Dave Airlie
2021-09-08 12:13 ` Jani Nikula
2021-09-08 1:19 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for i915/display: split and constify vtable Patchwork
2021-09-08 1:24 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2021-09-08 12:04 ` Jani Nikula
2021-09-08 1:50 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-09-08 7:07 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-09-08 12:19 ` [Intel-gfx] [PATCH 00/21] " Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210908003944.2972024-21-airlied@gmail.com \
--to=airlied@gmail.com \
--cc=airlied@redhat.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox