Skip to content

Commit

Permalink
drm/i915: Add a wrapper function around get_pipe_config
Browse files Browse the repository at this point in the history
Create a new function intel_crtc_get_pipe_config()
that calls platform specific hooks for get_pipe_config()
No functional change here.

Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
[vsyrjala: Conform to modern i915 coding style, fix patch subject]
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Reviewed-by: Animesh Manna <animesh.manna@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201112191718.16683-3-ville.syrjala@linux.intel.com
  • Loading branch information
Manasi Navare committed Nov 13, 2020
1 parent 65c1ed3 commit 11f9af1
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions drivers/gpu/drm/i915/display/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -11407,6 +11407,14 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
return active;
}

static bool intel_crtc_get_pipe_config(struct intel_crtc_state *crtc_state)
{
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
struct drm_i915_private *i915 = to_i915(crtc->base.dev);

return i915->display.get_pipe_config(crtc, crtc_state);
}

static u32 intel_cursor_base(const struct intel_plane_state *plane_state)
{
struct drm_i915_private *dev_priv =
Expand Down Expand Up @@ -12403,7 +12411,7 @@ intel_encoder_current_mode(struct intel_encoder *encoder)
return NULL;
}

if (!dev_priv->display.get_pipe_config(crtc, crtc_state)) {
if (!intel_crtc_get_pipe_config(crtc_state)) {
kfree(crtc_state);
kfree(mode);
return NULL;
Expand Down Expand Up @@ -14422,8 +14430,7 @@ verify_crtc_state(struct intel_crtc *crtc,

pipe_config->hw.enable = new_crtc_state->hw.enable;

pipe_config->hw.active =
dev_priv->display.get_pipe_config(crtc, pipe_config);
pipe_config->hw.active = intel_crtc_get_pipe_config(pipe_config);

/* we keep both pipes enabled on 830 */
if (IS_I830(dev_priv) && pipe_config->hw.active)
Expand Down Expand Up @@ -18736,7 +18743,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
intel_crtc_state_reset(crtc_state, crtc);

crtc_state->hw.active = crtc_state->hw.enable =
dev_priv->display.get_pipe_config(crtc, crtc_state);
intel_crtc_get_pipe_config(crtc_state);

crtc->base.enabled = crtc_state->hw.enable;
crtc->active = crtc_state->hw.active;
Expand Down

0 comments on commit 11f9af1

Please sign in to comment.