diff options
author | Jonathan Gray <jsg@jsg.id.au> | 2013-03-13 10:20:00 +1100 |
---|---|---|
committer | Jonathan Gray <jsg@jsg.id.au> | 2013-03-13 10:20:00 +1100 |
commit | e2b7d4eff27d706c4da9cfadc8ff124cc0c52451 (patch) | |
tree | 09e1b840608405c69a9cde6da51961e156f6a682 /sys | |
parent | 9fe2bcdfae73fb4a0de630af40eb67f5a0bd429c (diff) |
make this compile with debug disabled
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/pci/drm/intel_ddi.c | 6 | ||||
-rw-r--r-- | sys/dev/pci/drm/intel_dp.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/intel_ddi.c b/sys/dev/pci/drm/intel_ddi.c index 4be53565ac5..1ef9654cb45 100644 --- a/sys/dev/pci/drm/intel_ddi.c +++ b/sys/dev/pci/drm/intel_ddi.c @@ -690,11 +690,13 @@ intel_ddi_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { + struct intel_encoder *intel_encoder = to_intel_encoder(encoder); +#ifdef DRMDEBUG struct drm_crtc *crtc = encoder->crtc; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - struct intel_encoder *intel_encoder = to_intel_encoder(encoder); int port = intel_ddi_get_encoder_port(intel_encoder); int pipe = intel_crtc->pipe; +#endif int type = intel_encoder->type; DRM_DEBUG_KMS("Preparing DDI mode for Haswell on port %c, pipe %c\n", @@ -857,7 +859,9 @@ intel_ddi_pll_mode_set(struct drm_crtc *crtc, int clock) struct inteldrm_softc *dev_priv = crtc->dev->dev_private; struct intel_ddi_plls *plls = &dev_priv->ddi_plls; int type = intel_encoder->type; +#ifdef DRMDEBUG enum pipe pipe = intel_crtc->pipe; +#endif uint32_t reg, val; /* TODO: reuse PLLs when possible (compare values) */ diff --git a/sys/dev/pci/drm/intel_dp.c b/sys/dev/pci/drm/intel_dp.c index 8251857f0c7..433bf977cd8 100644 --- a/sys/dev/pci/drm/intel_dp.c +++ b/sys/dev/pci/drm/intel_dp.c @@ -437,8 +437,10 @@ ironlake_edp_have_panel_vdd(struct intel_dp *intel_dp) void intel_dp_check_edp(struct intel_dp *intel_dp) { +#ifdef DRMDEBUG struct drm_device *dev = intel_dp_to_dev(intel_dp); struct inteldrm_softc *dev_priv = dev->dev_private; +#endif if (!is_edp(intel_dp)) return; |