aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/intel_hdmi.c
diff options
context:
space:
mode:
authorGravatar Ville Syrjälä <ville.syrjala@linux.intel.com> 2014-03-03 16:15:28 +0200
committerGravatar Daniel Vetter <daniel.vetter@ffwll.ch> 2014-03-10 21:33:26 +0100
commitbc079e8b1684e1de505ec06f8c2339ae60a329e8 (patch)
treebcdd88e98b1e4126350a2abc929267e425ad21b1 /drivers/gpu/drm/i915/intel_hdmi.c
parentdrm/i915: move dev_priv->suspend around (diff)
downloadlinux-bc079e8b1684e1de505ec06f8c2339ae60a329e8.tar.gz
linux-bc079e8b1684e1de505ec06f8c2339ae60a329e8.tar.bz2
linux-bc079e8b1684e1de505ec06f8c2339ae60a329e8.zip
drm/i915: Make encoder cloning more flexible
Currently we allow encoders to indicate whether they can be part of a cloned set with just one flag. That's not flexible enough to describe the actual hardware capabilities. Instead make it a bitmask of encoder types with which the current encoder can be cloned. For now we set the bitmask to allow DVO+DVO and DVO+VGA, which should match what the old boolean flag allowed. We will add some more cloning options in the future. Note that this patch also removes the encoder.possible_clones setting from encoder setup code - we compute this dynamically. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> [danvet: Add Ville's explanation why removing the encoder possible_clones is save.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
-rw-r--r--drivers/gpu/drm/i915/intel_hdmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index f410cc03e08a..4575a91d035b 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1318,7 +1318,7 @@ void intel_hdmi_init(struct drm_device *dev, int hdmi_reg, enum port port)
intel_encoder->type = INTEL_OUTPUT_HDMI;
intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
- intel_encoder->cloneable = false;
+ intel_encoder->cloneable = 0;
intel_dig_port->port = port;
intel_dig_port->hdmi.hdmi_reg = hdmi_reg;