iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: move fdi_funcs to display.funcs

Browse Source 
Move display fdi functions under drm_i915_private display sub-struct.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/16ff8df6c08411c0e5aac3356dffe7f5120fcfeb.1661346845.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2022-08-24 16:15:32 +03:00
parent 103472c13f
commit 06a50913d9
3 changed files with 8 additions and 8 deletions

4
drivers/gpu/drm/i915/display/intel_display_core.h

@ -14,6 +14,7 @@ struct intel_cdclk_funcs;
struct intel_crtc;
struct intel_crtc_state;
struct intel_dpll_funcs;
struct intel_fdi_funcs;
struct intel_hotplug_funcs;
struct intel_initial_plane_config;
@ -67,6 +68,9 @@ struct intel_display {
/* pm display functions */
const struct intel_wm_funcs *wm;
/* fdi display functions */
const struct intel_fdi_funcs *fdi;
} funcs;
};

8
drivers/gpu/drm/i915/display/intel_fdi.c

@ -113,7 +113,7 @@ void intel_fdi_link_train(struct intel_crtc *crtc,
{
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
dev_priv->fdi_funcs->fdi_link_train(crtc, crtc_state);
dev_priv->display.funcs.fdi->fdi_link_train(crtc, crtc_state);
}
/* units of 100MHz */
@ -1066,11 +1066,11 @@ void
intel_fdi_init_hook(struct drm_i915_private *dev_priv)
{
if (IS_IRONLAKE(dev_priv)) {
dev_priv->fdi_funcs = &ilk_funcs;
dev_priv->display.funcs.fdi = &ilk_funcs;
} else if (IS_SANDYBRIDGE(dev_priv)) {
dev_priv->fdi_funcs = &gen6_funcs;
dev_priv->display.funcs.fdi = &gen6_funcs;
} else if (IS_IVYBRIDGE(dev_priv)) {
/* FIXME: detect B0+ stepping and use auto training */
dev_priv->fdi_funcs = &ivb_funcs;
dev_priv->display.funcs.fdi = &ivb_funcs;
}
}

4
drivers/gpu/drm/i915/i915_drv.h

@ -90,7 +90,6 @@ struct intel_connector;
struct intel_dp;
struct intel_encoder;
struct intel_fbdev;
struct intel_fdi_funcs;
struct intel_gmbus;
struct intel_limit;
struct intel_overlay;
@ -486,9 +485,6 @@ struct drm_i915_private {
/* pm private clock gating functions */
const struct drm_i915_clock_gating_funcs *clock_gating_funcs;
/* fdi display functions */
const struct intel_fdi_funcs *fdi_funcs;
/* Display internal color functions */
const struct intel_color_funcs *color_funcs;