summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_hdmi.c
diff options
context:
space:
mode:
authorVille Syrjälä2017-10-27 21:31:23 +0200
committerVille Syrjälä2017-10-30 18:53:22 +0100
commite1214b95ed83c0bb903fe368c9a408dffd80491d (patch)
tree9d4537c4f6b52e0dce628458bbd70a192f48db27 /drivers/gpu/drm/i915/intel_hdmi.c
parentdrm/i915: Parse max HDMI TMDS clock from VBT (diff)
downloadkernel-qcow2-linux-e1214b95ed83c0bb903fe368c9a408dffd80491d.tar.gz
kernel-qcow2-linux-e1214b95ed83c0bb903fe368c9a408dffd80491d.tar.xz
kernel-qcow2-linux-e1214b95ed83c0bb903fe368c9a408dffd80491d.zip
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_hdmi.c')
-rw-r--r--drivers/gpu/drm/i915/intel_hdmi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 38fe24565b4d..0ec30b4a7dce 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -957,6 +957,8 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
u32 tmp, flags = 0;
int dotclock;
+ pipe_config->output_types |= BIT(INTEL_OUTPUT_HDMI);
+
tmp = I915_READ(intel_hdmi->hdmi_reg);
if (tmp & SDVO_HSYNC_ACTIVE_HIGH)