Skip to content

Commit

Permalink
drm/nouveau: silence modesetting spam on pre-gf8 chipsets
Browse files Browse the repository at this point in the history
commit cee59f1 upstream.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ben Skeggs authored and Greg Kroah-Hartman committed Nov 5, 2012
1 parent e418b3b commit a8a0b23
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions drivers/gpu/drm/nouveau/nv04_dac.c
Original file line number Diff line number Diff line change
@@ -209,7 +209,7 @@ static enum drm_connector_status nv04_dac_detect(struct drm_encoder *encoder,
NVWriteVgaCrtc(dev, 0, NV_CIO_CR_MODE_INDEX, saved_cr_mode);

if (blue == 0x18) {
NV_INFO(dev, "Load detected on head A\n");
NV_DEBUG(dev, "Load detected on head A\n");
return connector_status_connected;
}

@@ -323,7 +323,7 @@ nv17_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)

if (nv17_dac_sample_load(encoder) &
NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI) {
NV_INFO(dev, "Load detected on output %c\n",
NV_DEBUG(dev, "Load detected on output %c\n",
'@' + ffs(dcb->or));
return connector_status_connected;
} else {
@@ -398,7 +398,7 @@ static void nv04_dac_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));
}
@@ -447,7 +447,7 @@ static void nv04_dac_dpms(struct drm_encoder *encoder, int mode)
return;
nv_encoder->last_dpms = mode;

NV_INFO(dev, "Setting dpms mode %d on vga encoder (output %d)\n",
NV_DEBUG(dev, "Setting dpms mode %d on vga encoder (output %d)\n",
mode, nv_encoder->dcb->index);

nv04_dac_update_dacclk(encoder, mode == DRM_MODE_DPMS_ON);
6 changes: 3 additions & 3 deletions drivers/gpu/drm/nouveau/nv04_dfp.c
Original file line number Diff line number Diff line change
@@ -468,7 +468,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));
}
@@ -511,7 +511,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))
@@ -556,7 +556,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);
4 changes: 2 additions & 2 deletions drivers/gpu/drm/nouveau/nv04_tv.c
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ static void nv04_tv_dpms(struct drm_encoder *encoder, int mode)
struct nv04_mode_state *state = &dev_priv->mode_reg;
uint8_t crtc1A;

NV_INFO(dev, "Setting dpms mode %d on TV encoder (output %d)\n",
NV_DEBUG(dev, "Setting dpms mode %d on TV encoder (output %d)\n",
mode, nv_encoder->dcb->index);

state->pllsel &= ~(PLLSEL_TV_CRTC1_MASK | PLLSEL_TV_CRTC2_MASK);
@@ -162,7 +162,7 @@ static void nv04_tv_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));
}

0 comments on commit a8a0b23

Please sign in to comment.