summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorVille Syrjälä2015-04-10 17:21:31 +0200
committerDaniel Vetter2015-05-08 17:26:02 +0200
commit9b6de0a1552175620ced3a7a7a552d4e7a379538 (patch)
tree914a975fa7fa87632f045b0250702a9c4946479c /drivers/gpu/drm/i915/intel_drv.h
parentdrm/i915: Fix possible security hole in command parsing (diff)
downloadkernel-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_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 930ea6916d9f..ea3368e83626 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1013,7 +1013,8 @@ intel_wait_for_vblank(struct drm_device *dev, int pipe)
}
int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp);
void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
- struct intel_digital_port *dport);
+ struct intel_digital_port *dport,
+ unsigned int expected_mask);
bool intel_get_load_detect_pipe(struct drm_connector *connector,
struct drm_display_mode *mode,
struct intel_load_detect_pipe *old,