diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-03-03 09:15:28 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-10 16:33:26 -0400 |
commit | bc079e8b1684e1de505ec06f8c2339ae60a329e8 (patch) | |
tree | bcdd88e98b1e4126350a2abc929267e425ad21b1 /drivers/gpu/drm/i915/intel_sdvo.c | |
parent | 842f1c8b7649f92b25e91f75e3bcdcf94daa77e8 (diff) |
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_sdvo.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 825853d82a4d..9a0b71f6aed6 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
@@ -3032,7 +3032,7 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) | |||
3032 | * simplistic anyway to express such constraints, so just give up on | 3032 | * simplistic anyway to express such constraints, so just give up on |
3033 | * cloning for SDVO encoders. | 3033 | * cloning for SDVO encoders. |
3034 | */ | 3034 | */ |
3035 | intel_sdvo->base.cloneable = false; | 3035 | intel_sdvo->base.cloneable = 0; |
3036 | 3036 | ||
3037 | intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo, sdvo_reg); | 3037 | intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo, sdvo_reg); |
3038 | 3038 | ||