Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cee59f15 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: silence modesetting spam on pre-gf8 chipsets 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 8f0d8163

drivers/gpu/drm/nouveau/nv04_dac.c

+8 −8
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ out: 
	NVWriteVgaCrtc(dev, 0, NV_CIO_CR_MODE_INDEX, saved_cr_mode);



	if (blue == 0x18) {

		NV_INFO(drm, "Load detected on head A\n");

		NV_DEBUG(drm, "Load detected on head A\n");

		return connector_status_connected;

	}
@@ -338,7 +338,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(drm, "Load detected on output %c\n",

		NV_DEBUG(drm, "Load detected on output %c\n",

			 '@' + ffs(dcb->or));

		return connector_status_connected;

	} else {
@@ -413,7 +413,7 @@ static void nv04_dac_commit(struct drm_encoder *encoder) 


	helper->dpms(encoder, DRM_MODE_DPMS_ON);



	NV_INFO(drm, "Output %s is running on CRTC %d using output %c\n",

	NV_DEBUG(drm, "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));

}
@@ -461,7 +461,7 @@ static void nv04_dac_dpms(struct drm_encoder *encoder, int mode) 
		return;

	nv_encoder->last_dpms = mode;



	NV_INFO(drm, "Setting dpms mode %d on vga encoder (output %d)\n",

	NV_DEBUG(drm, "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);

drivers/gpu/drm/nouveau/nv04_dfp.c

+7 −7
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static void nv04_dfp_commit(struct drm_encoder *encoder) 


	helper->dpms(encoder, DRM_MODE_DPMS_ON);



	NV_INFO(drm, "Output %s is running on CRTC %d using output %c\n",

	NV_DEBUG(drm, "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));

}
@@ -520,7 +520,7 @@ static void nv04_lvds_dpms(struct drm_encoder *encoder, int mode) 
		return;

	nv_encoder->last_dpms = mode;



	NV_INFO(drm, "Setting dpms mode %d on lvds encoder (output %d)\n",

	NV_DEBUG(drm, "Setting dpms mode %d on lvds encoder (output %d)\n",

		 mode, nv_encoder->dcb->index);



	if (was_powersaving && is_powersaving_dpms(mode))
@@ -565,7 +565,7 @@ static void nv04_tmds_dpms(struct drm_encoder *encoder, int mode) 
		return;

	nv_encoder->last_dpms = mode;



	NV_INFO(drm, "Setting dpms mode %d on tmds encoder (output %d)\n",

	NV_DEBUG(drm, "Setting dpms mode %d on tmds encoder (output %d)\n",

		 mode, nv_encoder->dcb->index);



	nv04_dfp_update_backlight(encoder, mode);

drivers/gpu/drm/nouveau/nv04_tv.c

+4 −5
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static void nv04_tv_dpms(struct drm_encoder *encoder, int mode) 
	struct nv04_mode_state *state = &nv04_display(dev)->mode_reg;

	uint8_t crtc1A;



	NV_INFO(drm, "Setting dpms mode %d on TV encoder (output %d)\n",

	NV_DEBUG(drm, "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);
@@ -167,9 +167,8 @@ static void nv04_tv_commit(struct drm_encoder *encoder) 


	helper->dpms(encoder, DRM_MODE_DPMS_ON);



	NV_INFO(drm, "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));

	NV_DEBUG(drm, "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));

}



static void nv04_tv_destroy(struct drm_encoder *encoder)