diff options
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_dac.c | 16 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_dfp.c | 14 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_tv.c | 9 |
3 files changed, 19 insertions, 20 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c index 347a3bd78d04..64f7020fb605 100644 --- a/drivers/gpu/drm/nouveau/nv04_dac.c +++ b/drivers/gpu/drm/nouveau/nv04_dac.c | |||
| @@ -220,7 +220,7 @@ out: | |||
| 220 | NVWriteVgaCrtc(dev, 0, NV_CIO_CR_MODE_INDEX, saved_cr_mode); | 220 | NVWriteVgaCrtc(dev, 0, NV_CIO_CR_MODE_INDEX, saved_cr_mode); |
| 221 | 221 | ||
| 222 | if (blue == 0x18) { | 222 | if (blue == 0x18) { |
| 223 | NV_INFO(drm, "Load detected on head A\n"); | 223 | NV_DEBUG(drm, "Load detected on head A\n"); |
| 224 | return connector_status_connected; | 224 | return connector_status_connected; |
| 225 | } | 225 | } |
| 226 | 226 | ||
| @@ -338,8 +338,8 @@ nv17_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector) | |||
| 338 | 338 | ||
| 339 | if (nv17_dac_sample_load(encoder) & | 339 | if (nv17_dac_sample_load(encoder) & |
| 340 | NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI) { | 340 | NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI) { |
| 341 | NV_INFO(drm, "Load detected on output %c\n", | 341 | NV_DEBUG(drm, "Load detected on output %c\n", |
| 342 | '@' + ffs(dcb->or)); | 342 | '@' + ffs(dcb->or)); |
| 343 | return connector_status_connected; | 343 | return connector_status_connected; |
| 344 | } else { | 344 | } else { |
| 345 | return connector_status_disconnected; | 345 | return connector_status_disconnected; |
| @@ -413,9 +413,9 @@ static void nv04_dac_commit(struct drm_encoder *encoder) | |||
| 413 | 413 | ||
| 414 | helper->dpms(encoder, DRM_MODE_DPMS_ON); | 414 | helper->dpms(encoder, DRM_MODE_DPMS_ON); |
| 415 | 415 | ||
| 416 | NV_INFO(drm, "Output %s is running on CRTC %d using output %c\n", | 416 | NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n", |
| 417 | drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), | 417 | drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), |
| 418 | nv_crtc->index, '@' + ffs(nv_encoder->dcb->or)); | 418 | nv_crtc->index, '@' + ffs(nv_encoder->dcb->or)); |
| 419 | } | 419 | } |
| 420 | 420 | ||
| 421 | void nv04_dac_update_dacclk(struct drm_encoder *encoder, bool enable) | 421 | void nv04_dac_update_dacclk(struct drm_encoder *encoder, bool enable) |
| @@ -461,8 +461,8 @@ static void nv04_dac_dpms(struct drm_encoder *encoder, int mode) | |||
| 461 | return; | 461 | return; |
| 462 | nv_encoder->last_dpms = mode; | 462 | nv_encoder->last_dpms = mode; |
| 463 | 463 | ||
| 464 | NV_INFO(drm, "Setting dpms mode %d on vga encoder (output %d)\n", | 464 | NV_DEBUG(drm, "Setting dpms mode %d on vga encoder (output %d)\n", |
| 465 | mode, nv_encoder->dcb->index); | 465 | mode, nv_encoder->dcb->index); |
| 466 | 466 | ||
| 467 | nv04_dac_update_dacclk(encoder, mode == DRM_MODE_DPMS_ON); | 467 | nv04_dac_update_dacclk(encoder, mode == DRM_MODE_DPMS_ON); |
| 468 | } | 468 | } |
diff --git a/drivers/gpu/drm/nouveau/nv04_dfp.c b/drivers/gpu/drm/nouveau/nv04_dfp.c index da55d7642c8c..184cdf806761 100644 --- a/drivers/gpu/drm/nouveau/nv04_dfp.c +++ b/drivers/gpu/drm/nouveau/nv04_dfp.c | |||
| @@ -476,9 +476,9 @@ static void nv04_dfp_commit(struct drm_encoder *encoder) | |||
| 476 | 476 | ||
| 477 | helper->dpms(encoder, DRM_MODE_DPMS_ON); | 477 | helper->dpms(encoder, DRM_MODE_DPMS_ON); |
| 478 | 478 | ||
| 479 | NV_INFO(drm, "Output %s is running on CRTC %d using output %c\n", | 479 | NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n", |
| 480 | drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), | 480 | drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), |
| 481 | nv_crtc->index, '@' + ffs(nv_encoder->dcb->or)); | 481 | nv_crtc->index, '@' + ffs(nv_encoder->dcb->or)); |
| 482 | } | 482 | } |
| 483 | 483 | ||
| 484 | static void nv04_dfp_update_backlight(struct drm_encoder *encoder, int mode) | 484 | static void nv04_dfp_update_backlight(struct drm_encoder *encoder, int mode) |
| @@ -520,8 +520,8 @@ static void nv04_lvds_dpms(struct drm_encoder *encoder, int mode) | |||
| 520 | return; | 520 | return; |
| 521 | nv_encoder->last_dpms = mode; | 521 | nv_encoder->last_dpms = mode; |
| 522 | 522 | ||
| 523 | NV_INFO(drm, "Setting dpms mode %d on lvds encoder (output %d)\n", | 523 | NV_DEBUG(drm, "Setting dpms mode %d on lvds encoder (output %d)\n", |
| 524 | mode, nv_encoder->dcb->index); | 524 | mode, nv_encoder->dcb->index); |
| 525 | 525 | ||
| 526 | if (was_powersaving && is_powersaving_dpms(mode)) | 526 | if (was_powersaving && is_powersaving_dpms(mode)) |
| 527 | return; | 527 | return; |
| @@ -565,8 +565,8 @@ static void nv04_tmds_dpms(struct drm_encoder *encoder, int mode) | |||
| 565 | return; | 565 | return; |
| 566 | nv_encoder->last_dpms = mode; | 566 | nv_encoder->last_dpms = mode; |
| 567 | 567 | ||
| 568 | NV_INFO(drm, "Setting dpms mode %d on tmds encoder (output %d)\n", | 568 | NV_DEBUG(drm, "Setting dpms mode %d on tmds encoder (output %d)\n", |
| 569 | mode, nv_encoder->dcb->index); | 569 | mode, nv_encoder->dcb->index); |
| 570 | 570 | ||
| 571 | nv04_dfp_update_backlight(encoder, mode); | 571 | nv04_dfp_update_backlight(encoder, mode); |
| 572 | nv04_dfp_update_fp_control(encoder, mode); | 572 | nv04_dfp_update_fp_control(encoder, mode); |
diff --git a/drivers/gpu/drm/nouveau/nv04_tv.c b/drivers/gpu/drm/nouveau/nv04_tv.c index 099fbeda6e2e..62e826a139b3 100644 --- a/drivers/gpu/drm/nouveau/nv04_tv.c +++ b/drivers/gpu/drm/nouveau/nv04_tv.c | |||
| @@ -75,8 +75,8 @@ static void nv04_tv_dpms(struct drm_encoder *encoder, int mode) | |||
| 75 | struct nv04_mode_state *state = &nv04_display(dev)->mode_reg; | 75 | struct nv04_mode_state *state = &nv04_display(dev)->mode_reg; |
| 76 | uint8_t crtc1A; | 76 | uint8_t crtc1A; |
| 77 | 77 | ||
| 78 | NV_INFO(drm, "Setting dpms mode %d on TV encoder (output %d)\n", | 78 | NV_DEBUG(drm, "Setting dpms mode %d on TV encoder (output %d)\n", |
| 79 | mode, nv_encoder->dcb->index); | 79 | mode, nv_encoder->dcb->index); |
| 80 | 80 | ||
| 81 | state->pllsel &= ~(PLLSEL_TV_CRTC1_MASK | PLLSEL_TV_CRTC2_MASK); | 81 | state->pllsel &= ~(PLLSEL_TV_CRTC1_MASK | PLLSEL_TV_CRTC2_MASK); |
| 82 | 82 | ||
| @@ -167,9 +167,8 @@ static void nv04_tv_commit(struct drm_encoder *encoder) | |||
| 167 | 167 | ||
| 168 | helper->dpms(encoder, DRM_MODE_DPMS_ON); | 168 | helper->dpms(encoder, DRM_MODE_DPMS_ON); |
| 169 | 169 | ||
| 170 | NV_INFO(drm, "Output %s is running on CRTC %d using output %c\n", | 170 | NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n", |
| 171 | drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), nv_crtc->index, | 171 | drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), nv_crtc->index, '@' + ffs(nv_encoder->dcb->or)); |
| 172 | '@' + ffs(nv_encoder->dcb->or)); | ||
| 173 | } | 172 | } |
| 174 | 173 | ||
| 175 | static void nv04_tv_destroy(struct drm_encoder *encoder) | 174 | static void nv04_tv_destroy(struct drm_encoder *encoder) |
