diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-20 00:10:48 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-20 00:10:48 +0400 |
| commit | c19ae9c2483f0253bb58d3d3c28ac20386df6066 (patch) | |
| tree | 9e3339fd0c9ac3285839626b25bb8d30bea60abd /drivers/gpu/drm/nouveau/nv04_dfp.c | |
| parent | 836f44a71d886bc81551597612e3b1797133985f (diff) | |
| parent | b2824f4e0990716407b0c0e7acee75bb6353febf (diff) | |
| download | linux-linaro-tracking-with-fixes-linux-linaro-core-3.6.tar.gz | |
Automatically merging tracking-linux-3.6.y into merge-linux-linaro-core-3.6linux-linaro-core-3.6-20121220.0linux-linaro-core-3.6
Conflicting files:
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_dfp.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_dfp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_dfp.c b/drivers/gpu/drm/nouveau/nv04_dfp.c index c2675623b7c..89640f21140 100644 --- a/drivers/gpu/drm/nouveau/nv04_dfp.c +++ b/drivers/gpu/drm/nouveau/nv04_dfp.c @@ -476,7 +476,7 @@ static void nv04_dfp_commit(struct drm_encoder *encoder) helper->dpms(encoder, DRM_MODE_DPMS_ON); - NV_INFO(dev, "Output %s is running on CRTC %d using output %c\n", + NV_DEBUG(dev, "Output %s is running on CRTC %d using output %c\n", drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), nv_crtc->index, '@' + ffs(nv_encoder->dcb->or)); } @@ -519,7 +519,7 @@ static void nv04_lvds_dpms(struct drm_encoder *encoder, int mode) return; nv_encoder->last_dpms = mode; - NV_INFO(dev, "Setting dpms mode %d on lvds encoder (output %d)\n", + NV_DEBUG(dev, "Setting dpms mode %d on lvds encoder (output %d)\n", mode, nv_encoder->dcb->index); if (was_powersaving && is_powersaving_dpms(mode)) @@ -564,7 +564,7 @@ static void nv04_tmds_dpms(struct drm_encoder *encoder, int mode) return; nv_encoder->last_dpms = mode; - NV_INFO(dev, "Setting dpms mode %d on tmds encoder (output %d)\n", + NV_DEBUG(dev, "Setting dpms mode %d on tmds encoder (output %d)\n", mode, nv_encoder->dcb->index); nv04_dfp_update_backlight(encoder, mode); |