summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm/i915/intel_ddi.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/pci/drm/i915/intel_ddi.c')
-rw-r--r--sys/dev/pci/drm/i915/intel_ddi.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/i915/intel_ddi.c b/sys/dev/pci/drm/i915/intel_ddi.c
index 98393624e3e..ce1dda6100c 100644
--- a/sys/dev/pci/drm/i915/intel_ddi.c
+++ b/sys/dev/pci/drm/i915/intel_ddi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intel_ddi.c,v 1.13 2015/02/12 04:56:03 kettenis Exp $ */
+/* $OpenBSD: intel_ddi.c,v 1.14 2015/04/18 14:47:34 jsg Exp $ */
/*
* Copyright © 2012 Intel Corporation
*
@@ -76,7 +76,8 @@ static enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder)
return PORT_E;
} else {
- panic("Invalid DDI encoder type %d\n", type);
+ DRM_ERROR("Invalid DDI encoder type %d\n", type);
+ BUG();
}
}
@@ -1375,8 +1376,8 @@ void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder)
struct intel_dp *intel_dp = &intel_dig_port->dp;
struct drm_i915_private *dev_priv = encoder->dev->dev_private;
enum port port = intel_dig_port->port;
- uint32_t val;
bool wait = false;
+ uint32_t val;
if (I915_READ(DP_TP_CTL(port)) & DP_TP_CTL_ENABLE) {
val = I915_READ(DDI_BUF_CTL(port));