From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [PATCH 3/8] drm/i915/display: move fdi funcs under fdi sub-struct
Date: Thu, 30 Apr 2026 11:28:47 +0300 [thread overview]
Message-ID: <c48bad63ec94259773d05ef056268b02e119d635.1777537663.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1777537663.git.jani.nikula@intel.com>
Move fdi related functions under fdi sub-struct of struct intel_display.
The funcs sub-struct of struct intel_display seems unnecessary. Instead
of display->funcs.FEATURE, prefer display->FEATURE.funcs.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_display_core.h | 6 +++---
drivers/gpu/drm/i915/display/intel_fdi.c | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index db07e332af5a..0fdda5339e81 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -316,9 +316,6 @@ struct intel_display {
/* pm display functions */
const struct intel_wm_funcs *wm;
-
- /* fdi display functions */
- const struct intel_fdi_funcs *fdi;
} funcs;
struct {
@@ -418,6 +415,9 @@ struct intel_display {
} fbdev;
struct {
+ /* internal fdi functions */
+ const struct intel_fdi_funcs *funcs;
+
unsigned int pll_freq;
u32 rx_config;
} fdi;
diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c b/drivers/gpu/drm/i915/display/intel_fdi.c
index 917f020650af..f5094655a63b 100644
--- a/drivers/gpu/drm/i915/display/intel_fdi.c
+++ b/drivers/gpu/drm/i915/display/intel_fdi.c
@@ -123,7 +123,7 @@ void intel_fdi_link_train(struct intel_crtc *crtc,
{
struct intel_display *display = to_intel_display(crtc);
- display->funcs.fdi->fdi_link_train(crtc, crtc_state);
+ display->fdi.funcs->fdi_link_train(crtc, crtc_state);
}
/**
@@ -1109,11 +1109,11 @@ void
intel_fdi_init_hook(struct intel_display *display)
{
if (display->platform.ironlake) {
- display->funcs.fdi = &ilk_funcs;
+ display->fdi.funcs = &ilk_funcs;
} else if (display->platform.sandybridge) {
- display->funcs.fdi = &gen6_funcs;
+ display->fdi.funcs = &gen6_funcs;
} else if (display->platform.ivybridge) {
/* FIXME: detect B0+ stepping and use auto training */
- display->funcs.fdi = &ivb_funcs;
+ display->fdi.funcs = &ivb_funcs;
}
}
--
2.47.3
next prev parent reply other threads:[~2026-04-30 8:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-30 8:28 [PATCH 0/8] drm/i915/display: refactor display funcs Jani Nikula
2026-04-30 8:28 ` [PATCH 1/8] drm/i915/display: move audio funcs under audio sub-struct Jani Nikula
2026-04-30 8:28 ` [PATCH 2/8] drm/i915/display: move color funcs under color sub-struct Jani Nikula
2026-04-30 8:28 ` Jani Nikula [this message]
2026-04-30 8:28 ` [PATCH 4/8] drm/i915/display: move watermark funcs under wm sub-struct Jani Nikula
2026-04-30 8:28 ` [PATCH 5/8] drm/i915/display: move hotplug irq funcs under hotplug sub-struct Jani Nikula
2026-04-30 8:28 ` [PATCH 6/8] drm/i915/display: move dpll funcs under dpll sub-struct Jani Nikula
2026-04-30 8:28 ` [PATCH 7/8] drm/i915/display: move cdclk funcs under cdclk sub-struct Jani Nikula
2026-04-30 8:28 ` [PATCH 8/8] drm/i915/display: move display funcs under modeset sub-struct Jani Nikula
2026-04-30 8:36 ` ✓ CI.KUnit: success for drm/i915/display: refactor display funcs Patchwork
2026-04-30 9:34 ` ✓ Xe.CI.BAT: " Patchwork
2026-04-30 19:38 ` ✗ Xe.CI.FULL: failure " Patchwork
2026-05-04 6:43 ` [PATCH 0/8] " Garg, Nemesa
2026-05-04 12:34 ` 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=c48bad63ec94259773d05ef056268b02e119d635.1777537663.git.jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).