drm/i915/display: move display funcs under modeset sub-struct

Move generic crtc-ish modeset related functions under a new modeset
sub-struct of struct intel_display. Rename struct intel_display_funcs to
intel_modeset_funcs to make it a little bit more specific. Remove the
funcs sub-struct.

The funcs sub-struct of struct intel_display seems unnecessary. Instead
of display->funcs.FEATURE, prefer display->FEATURE.funcs.

Reviewed-by: Nemesa Garg <nemesa.garg@intel.com>
Link: https://patch.msgid.link/7849de3a5c9755639c179917c6a298de9ac832c0.1777537663.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 7280c414610a2e7808f8780ac4fbc2a09396f2c4..2fa10f8582794e1881034242f2a92dddf088013d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4051,7 +4051,7 @@ bool intel_crtc_get_pipe_config(struct intel_crtc_state *crtc_state)
        struct intel_display *display = to_intel_display(crtc_state);
        struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
 
-       if (!display->funcs.display->get_pipe_config(crtc, crtc_state))
+       if (!display->modeset.funcs->get_pipe_config(crtc, crtc_state))
                return false;
 
        crtc_state->hw.active = true;
@@ -6739,7 +6739,7 @@ static void intel_enable_crtc(struct intel_atomic_state *state,
 
        intel_psr_notify_pipe_change(state, crtc, true);
 
-       display->funcs.display->crtc_enable(state, crtc);
+       display->modeset.funcs->crtc_enable(state, crtc);
 
        intel_crtc_wait_for_next_vblank(crtc);
 
@@ -6872,7 +6872,7 @@ static void intel_old_crtc_state_disables(struct intel_atomic_state *state,
 
        intel_psr_notify_pipe_change(state, crtc, false);
 
-       display->funcs.display->crtc_disable(state, crtc);
+       display->modeset.funcs->crtc_disable(state, crtc);
 
        for_each_intel_crtc_in_pipe_mask(display->drm, pipe_crtc,
                                         intel_crtc_joined_pipe_mask(old_crtc_state)) {
@@ -7524,7 +7524,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
        }
 
        /* Now enable the clocks, plane, pipe, and connectors that we set up. */
-       display->funcs.display->commit_modeset_enables(state);
+       display->modeset.funcs->commit_modeset_enables(state);
 
        /* FIXME probably need to sequence this properly */
        intel_program_dpkgc_latency(state);
@@ -8197,7 +8197,7 @@ intel_mode_valid_max_plane_size(struct intel_display *display,
        return MODE_OK;
 }
 
-static const struct intel_display_funcs skl_display_funcs = {
+static const struct intel_modeset_funcs skl_display_funcs = {
        .get_pipe_config = hsw_get_pipe_config,
        .crtc_enable = hsw_crtc_enable,
        .crtc_disable = hsw_crtc_disable,
@@ -8206,7 +8206,7 @@ static const struct intel_display_funcs skl_display_funcs = {
        .fixup_initial_plane_config = skl_fixup_initial_plane_config,
 };
 
-static const struct intel_display_funcs ddi_display_funcs = {
+static const struct intel_modeset_funcs ddi_display_funcs = {
        .get_pipe_config = hsw_get_pipe_config,
        .crtc_enable = hsw_crtc_enable,
        .crtc_disable = hsw_crtc_disable,
@@ -8215,7 +8215,7 @@ static const struct intel_display_funcs ddi_display_funcs = {
        .fixup_initial_plane_config = i9xx_fixup_initial_plane_config,
 };
 
-static const struct intel_display_funcs pch_split_display_funcs = {
+static const struct intel_modeset_funcs pch_split_display_funcs = {
        .get_pipe_config = ilk_get_pipe_config,
        .crtc_enable = ilk_crtc_enable,
        .crtc_disable = ilk_crtc_disable,
@@ -8224,7 +8224,7 @@ static const struct intel_display_funcs pch_split_display_funcs = {
        .fixup_initial_plane_config = i9xx_fixup_initial_plane_config,
 };
 
-static const struct intel_display_funcs vlv_display_funcs = {
+static const struct intel_modeset_funcs vlv_display_funcs = {
        .get_pipe_config = i9xx_get_pipe_config,
        .crtc_enable = valleyview_crtc_enable,
        .crtc_disable = i9xx_crtc_disable,
@@ -8233,7 +8233,7 @@ static const struct intel_display_funcs vlv_display_funcs = {
        .fixup_initial_plane_config = i9xx_fixup_initial_plane_config,
 };
 
-static const struct intel_display_funcs i9xx_display_funcs = {
+static const struct intel_modeset_funcs i9xx_display_funcs = {
        .get_pipe_config = i9xx_get_pipe_config,
        .crtc_enable = i9xx_crtc_enable,
        .crtc_disable = i9xx_crtc_disable,
@@ -8249,16 +8249,16 @@ static const struct intel_display_funcs i9xx_display_funcs = {
 void intel_init_display_hooks(struct intel_display *display)
 {
        if (DISPLAY_VER(display) >= 9) {
-               display->funcs.display = &skl_display_funcs;
+               display->modeset.funcs = &skl_display_funcs;
        } else if (HAS_DDI(display)) {
-               display->funcs.display = &ddi_display_funcs;
+               display->modeset.funcs = &ddi_display_funcs;
        } else if (HAS_PCH_SPLIT(display)) {
-               display->funcs.display = &pch_split_display_funcs;
+               display->modeset.funcs = &pch_split_display_funcs;
        } else if (display->platform.cherryview ||
                   display->platform.valleyview) {
-               display->funcs.display = &vlv_display_funcs;
+               display->modeset.funcs = &vlv_display_funcs;
        } else {
-               display->funcs.display = &i9xx_display_funcs;
+               display->modeset.funcs = &i9xx_display_funcs;
        }
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index a319fb97dafaed67bfced82467c1c7d602af4e06..796517e7bc6c261570cb3b5d1127b83ed70307d7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -59,7 +59,7 @@ struct task_struct;
 /* Amount of PSF GV points, BSpec precisely defines this */
 #define I915_NUM_PSF_GV_POINTS 3
 
-struct intel_display_funcs {
+struct intel_modeset_funcs {
        /*
         * Returns the active state of the crtc, and if the crtc is active,
         * fills out the pipe-config with the hw state.
@@ -309,12 +309,6 @@ struct intel_display {
        /* list of all intel_crtcs sorted by pipe */
        struct list_head pipe_list;
 
-       /* Display functions */
-       struct {
-               /* Top level crtc-ish functions */
-               const struct intel_display_funcs *display;
-       } funcs;
-
        struct {
                bool any_task_allowed;
                struct task_struct *allowed_task;
@@ -518,6 +512,11 @@ struct intel_display {
                u32 pipestat_irq_mask[I915_MAX_PIPES];
        } irq;
 
+       struct {
+               /* Top level crtc-ish functions */
+               const struct intel_modeset_funcs *funcs;
+       } modeset;
+
        struct {
                /* protected by wm.wm_mutex */
                u16 linetime[I915_MAX_PIPES];

diff --git a/drivers/gpu/drm/i915/display/intel_initial_plane.c b/drivers/gpu/drm/i915/display/intel_initial_plane.c
index 0e5cd45f01cc40d70343bd254711cb42d0e7d012..034fe199c2a156d9e7d0d388af6fba41dcf8f40f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_initial_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_initial_plane.c
@@ -224,7 +224,7 @@ void intel_initial_plane_config(struct intel_display *display)
                 * can even allow for smooth boot transitions if the BIOS
                 * fb is large enough for the active pipe configuration.
                 */
-               display->funcs.display->get_initial_plane_config(crtc, plane_config);
+               display->modeset.funcs->get_initial_plane_config(crtc, plane_config);
 
                /*
                 * If the fb is shared between multiple heads, we'll
@@ -232,7 +232,7 @@ void intel_initial_plane_config(struct intel_display *display)
                 */
                intel_find_initial_plane_obj(crtc, &all_plane_configs);
 
-               if (display->funcs.display->fixup_initial_plane_config(crtc, plane_config))
+               if (display->modeset.funcs->fixup_initial_plane_config(crtc, plane_config))
                        intel_initial_plane_vblank_wait(crtc);
 
                plane_config_fini(display, plane_config);

diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
index 40a65a0d7ec722e1a36722df581f5ee3e4260459..4c646b1bd0ee098bfa348068c32a5caeecc93069 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c
+++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
@@ -83,7 +83,7 @@ static void intel_crtc_disable_noatomic_begin(struct intel_crtc *crtc,
                drm_WARN_ON(display->drm, IS_ERR(temp_crtc_state) || ret);
        }
 
-       display->funcs.display->crtc_disable(to_intel_atomic_state(state), crtc);
+       display->modeset.funcs->crtc_disable(to_intel_atomic_state(state), crtc);
 
        drm_atomic_state_put(state);