diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2017-10-27 15:31:23 -0400 |
---|---|---|
committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2017-10-30 13:53:22 -0400 |
commit | e1214b95ed83c0bb903fe368c9a408dffd80491d (patch) | |
tree | 9d4537c4f6b52e0dce628458bbd70a192f48db27 /drivers/gpu/drm/i915/intel_dp_mst.c | |
parent | d6038611aa3d7d8080a8ae7f3122779fb4779a13 (diff) |
drm/i915: Populate output_types from .get_config()
Rather than having the caller of .get_config() set output_types based on
encoder->type, let's just have .get_config() itself populate
output_types. This way we are isolated from encoder->type, which won't
be useable for this purpose anyway soon (at least for DDI encoders).
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171027193128.14483-2-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp_mst.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp_mst.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index c34ffa959e90..210ad0580a66 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c | |||
@@ -291,6 +291,8 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder, | |||
291 | enum transcoder cpu_transcoder = pipe_config->cpu_transcoder; | 291 | enum transcoder cpu_transcoder = pipe_config->cpu_transcoder; |
292 | u32 temp, flags = 0; | 292 | u32 temp, flags = 0; |
293 | 293 | ||
294 | pipe_config->output_types |= BIT(INTEL_OUTPUT_DP_MST); | ||
295 | |||
294 | pipe_config->has_audio = | 296 | pipe_config->has_audio = |
295 | intel_ddi_is_audio_enabled(dev_priv, crtc); | 297 | intel_ddi_is_audio_enabled(dev_priv, crtc); |
296 | 298 | ||