diff options
| author |  Ville Syrjälä <ville.syrjala@linux.intel.com>
| 2014-04-09 13:28:55 +0300 |
|---|---|---|
| committer |  Daniel Vetter <daniel.vetter@ffwll.ch>
| 2014-05-20 15:33:00 +0200 |
| commit | 71485e0aa8bec98fd41b2e916574d1798c4b38e1 (patch) | |
| tree | 99a1ea9919f635b215e195344847af3a00155d32 /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | drm/i915/chv: Bump num_pipes to 3 (diff) | |
| download | linux-71485e0aa8bec98fd41b2e916574d1798c4b38e1.tar.gz linux-71485e0aa8bec98fd41b2e916574d1798c4b38e1.tar.bz2 linux-71485e0aa8bec98fd41b2e916574d1798c4b38e1.zip | |
drm/i915/chv: Fix PORT_TO_PIPE for CHV
Fix the encoder .get_config hooks to report the correct active pipe for
CHV.
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 | 2 |
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 166785d597ce..6b635f7a86d8 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -697,6 +697,8 @@ static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder, if (HAS_PCH_CPT(dev)) *pipe = PORT_TO_PIPE_CPT(tmp); + else if (IS_CHERRYVIEW(dev)) + *pipe = SDVO_PORT_TO_PIPE_CHV(tmp); else *pipe = PORT_TO_PIPE(tmp); |