diff options
| author | Ville Syrjälä | 2015-04-10 17:21:31 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-05-08 17:26:02 +0200 |
| commit | 9b6de0a1552175620ced3a7a7a552d4e7a379538 (patch) | |
| tree | 914a975fa7fa87632f045b0250702a9c4946479c /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | drm/i915: Fix possible security hole in command parsing (diff) | |
| download | kernel-qcow2-linux-9b6de0a1552175620ced3a7a7a552d4e7a379538.tar.gz kernel-qcow2-linux-9b6de0a1552175620ced3a7a7a552d4e7a379538.tar.xz kernel-qcow2-linux-9b6de0a1552175620ced3a7a7a552d4e7a379538.zip | |
drm/i915: Only wait for required lanes in vlv_wait_port_ready()
Currently vlv_wait_port_ready() waits for all four lanes on the
appropriate channel. This no longer works on CHV when the unused
lanes may be power gated. So pass in a mask of lanes that the
caller is expecting to be ready.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Deepak S<deepak.s@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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 86355f1c6f21..d04e6dc97fe5 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -1324,7 +1324,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder) intel_enable_hdmi(encoder); - vlv_wait_port_ready(dev_priv, dport); + vlv_wait_port_ready(dev_priv, dport, 0x0); } static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder) @@ -1641,7 +1641,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder) intel_enable_hdmi(encoder); - vlv_wait_port_ready(dev_priv, dport); + vlv_wait_port_ready(dev_priv, dport, 0x0); } static void intel_hdmi_destroy(struct drm_connector *connector) |