Skip to content

Commit

Permalink
drm/i915: Move encoder->get_config to a new function
Browse files Browse the repository at this point in the history
No functional changes, create a separate intel_encoder_get_config()
function that calls encoder->get_config hook.
This is needed so that later we can add beigjoienr related
readout here.

Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
[vsyrjala: Move the code around for the future]
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-2-ville.syrjala@linux.intel.com
  • Loading branch information
Manasi Navare committed Nov 13, 2020
1 parent 6ec29d2 commit 65c1ed3
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions drivers/gpu/drm/i915/display/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -8141,6 +8141,12 @@ static void intel_crtc_compute_pixel_rate(struct intel_crtc_state *crtc_state)
ilk_pipe_pixel_rate(crtc_state);
}

static void intel_encoder_get_config(struct intel_encoder *encoder,
struct intel_crtc_state *crtc_state)
{
encoder->get_config(encoder, crtc_state);
}

static int intel_crtc_compute_config(struct intel_crtc *crtc,
struct intel_crtc_state *pipe_config)
{
Expand Down Expand Up @@ -12403,7 +12409,7 @@ intel_encoder_current_mode(struct intel_encoder *encoder)
return NULL;
}

encoder->get_config(encoder, crtc_state);
intel_encoder_get_config(encoder, crtc_state);

intel_mode_from_pipe_config(mode, crtc_state);

Expand Down Expand Up @@ -14448,7 +14454,7 @@ verify_crtc_state(struct intel_crtc *crtc,
pipe_name(pipe));

if (active)
encoder->get_config(encoder, pipe_config);
intel_encoder_get_config(encoder, pipe_config);
}

intel_crtc_compute_pixel_rate(pipe_config);
Expand Down Expand Up @@ -18761,7 +18767,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
crtc_state = to_intel_crtc_state(crtc->base.state);

encoder->base.crtc = &crtc->base;
encoder->get_config(encoder, crtc_state);
intel_encoder_get_config(encoder, crtc_state);
if (encoder->sync_state)
encoder->sync_state(encoder, crtc_state);
} else {
Expand Down

0 comments on commit 65c1ed3

Please sign in to comment.