diff options
| author | Ville Syrjälä | 2014-04-28 13:07:43 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-05-20 15:30:29 +0200 |
| commit | 882ec3846e1f88b2893bea5e5920576f1d79bbee (patch) | |
| tree | fb3c7e7fc222fc253ae74e52c0d7cc71c4627ecc /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | drm/i915/chv: Make CHV irq handler loop until all interrupts are consumed (diff) | |
| download | kernel-qcow2-linux-882ec3846e1f88b2893bea5e5920576f1d79bbee.tar.gz kernel-qcow2-linux-882ec3846e1f88b2893bea5e5920576f1d79bbee.tar.xz kernel-qcow2-linux-882ec3846e1f88b2893bea5e5920576f1d79bbee.zip | |
drm/i915/chv: Configure crtc_mask correctly for CHV
On CHV pipe C can driver only port D, and pipes A and B can drivbe only
ports B and C. Configure the crtc_mask appropriately to reflect that.
v2: Moar braces (Jani)
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Antti Koskipää <antti.koskipaa@linux.intel.com>
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.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index e978c12bde1d..5976693927e6 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -1469,7 +1469,14 @@ 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); + if (IS_CHERRYVIEW(dev)) { + if (port == PORT_D) + intel_encoder->crtc_mask = 1 << 2; + else + intel_encoder->crtc_mask = (1 << 0) | (1 << 1); + } else { + intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2); + } intel_encoder->cloneable = 1 << INTEL_OUTPUT_ANALOG; /* * BSpec is unclear about HDMI+HDMI cloning on g4x, but it seems |