3.0-stable patches

added patches:
	drm-nouveau-silence-modesetting-spam-on-pre-gf8-chipsets.patch

diff --git a/queue-3.0/drm-nouveau-silence-modesetting-spam-on-pre-gf8-chipsets.patch b/queue-3.0/drm-nouveau-silence-modesetting-spam-on-pre-gf8-chipsets.patch
new file mode 100644 (file)
index 0000000..0f21c51
--- /dev/null
+++ b/queue-3.0/drm-nouveau-silence-modesetting-spam-on-pre-gf8-chipsets.patch
@@ -0,0 +1,105 @@
+From cee59f15a60cc6269a25e3f6fbf1a577d6ab8115 Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs@redhat.com>
+Date: Mon, 29 Oct 2012 09:03:07 +1000
+Subject: drm/nouveau: silence modesetting spam on pre-gf8 chipsets
+
+From: Ben Skeggs <bskeggs@redhat.com>
+
+commit cee59f15a60cc6269a25e3f6fbf1a577d6ab8115 upstream.
+
+Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/nouveau/nv04_dac.c |    8 ++++----
+ drivers/gpu/drm/nouveau/nv04_dfp.c |    6 +++---
+ drivers/gpu/drm/nouveau/nv04_tv.c  |    4 ++--
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+--- a/drivers/gpu/drm/nouveau/nv04_dac.c
++++ b/drivers/gpu/drm/nouveau/nv04_dac.c
+@@ -209,7 +209,7 @@ out:
+       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 *enco
+ 
+       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_e
+ 
+       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_enc
+               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);
+--- a/drivers/gpu/drm/nouveau/nv04_dfp.c
++++ b/drivers/gpu/drm/nouveau/nv04_dfp.c
+@@ -468,7 +468,7 @@ static void nv04_dfp_commit(struct drm_e
+ 
+       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_en
+               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_en
+               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);
+--- a/drivers/gpu/drm/nouveau/nv04_tv.c
++++ b/drivers/gpu/drm/nouveau/nv04_tv.c
+@@ -69,7 +69,7 @@ static void nv04_tv_dpms(struct drm_enco
+       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_en
+ 
+       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));
+ }

diff --git a/queue-3.0/series b/queue-3.0/series
index 08d8651800c60587e5bb94df08efb46aff2ce1c3..98a93ead98e1a9c54e46b725d9db846734e7adb6 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -1,3 +1,4 @@
 floppy-do-put_disk-on-current-dr-if-blk_init_queue-fails.patch
 x86-remove-the-ancient-and-deprecated-disable_hlt-and-enable_hlt-facility.patch
 mm-fix-xfs-oops-due-to-dirty-pages-without-buffers-on-s390.patch
+drm-nouveau-silence-modesetting-spam-on-pre-gf8-chipsets.patch